diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-04-08 14:29:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-08 14:29:11 -0700 |
| commit | d04aa7ec4738f90220b9e205326f17938b8f89d4 (patch) | |
| tree | 7be435da616d58dec183f8c6c8f1517819a2a626 /t/t6101-rev-parse-parents.sh | |
| parent | Second batch for post 2.8 cycle (diff) | |
| parent | merge: refuse to create too cool a merge by default (diff) | |
| download | tgif-d04aa7ec4738f90220b9e205326f17938b8f89d4.tar.xz | |
Merge branch 'jc/merge-refuse-new-root'
"git merge" used to allow merging two branches that have no common
base by default, which led to a brand new history of an existing
project created and then get pulled by an unsuspecting maintainer,
which allowed an unnecessary parallel history merged into the
existing project. The command has been taught not to allow this by
default, with an escape hatch "--allow-unrelated-histories" option
to be used in a rare event that merges histories of two projects
that started their lives independently.
* jc/merge-refuse-new-root:
merge: refuse to create too cool a merge by default
Diffstat (limited to 't/t6101-rev-parse-parents.sh')
| -rwxr-xr-x | t/t6101-rev-parse-parents.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh index 10b1452766..1c6952d049 100755 --- a/t/t6101-rev-parse-parents.sh +++ b/t/t6101-rev-parse-parents.sh @@ -19,7 +19,7 @@ test_expect_success 'setup' ' git checkout --orphan tmp && test_commit start2 && git checkout master && - git merge -m next start2 && + git merge -m next --allow-unrelated-histories start2 && test_commit final && test_seq 40 | |