On Fri, Mar 18, 2016 at 4:21 PM, Junio C Hamano <gits...@pobox.com> wrote: > While it makes sense to allow merging unrelated histories of two > projects that started independently into one, in the way "gitk" was > merged to "git" itself aka "the coolest merge ever", such a merge is > still an unusual event. Worse, if somebody creates an independent > history by starting from a tarball of an established project and > sends a pull request to the original project, "git merge" however > happily creates such a merge without any sign of something unusual > is happening. > > Teach "git merge" to refuse to create such a merge by default, > unless the user passes a new "--allow-unrelated-histories" option to > tell it that the user is aware that two unrelated projects are > merged. > [...] > Signed-off-by: Junio C Hamano <gits...@pobox.com> > --- > diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh > @@ -279,9 +280,10 @@ test_expect_success 'clone shallow depth count' ' > test_expect_success 'clone shallow object count' ' > ( > cd shallow && > + git prune && > git count-objects -v > ) > count.shallow && > - grep "^count: 55" count.shallow > + grep "^count: 54" count.shallow > '
Um, wasn't this change the subject of a separate patch[1]? [1]: http://article.gmane.org/gmane.comp.version-control.git/289246 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
