diff options
author | Michał Kiedrowicz <michal.kiedrowicz@gmail.com> | 2012-02-13 12:48:56 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-04-17 17:13:45 -0700 |
commit | 833abdc9327f60dff771273095074ae734513ab6 (patch) | |
tree | 57de52156afb16ed091d5cc933d9b3e08f8456aa /t/t1013/objects/7a/37b887a73791d12d26c0d3e39568a8fb0fa6e8 | |
parent | Merge branch 'maint-1.7.8' into maint-1.7.9 (diff) | |
download | tgif-833abdc9327f60dff771273095074ae734513ab6.tar.xz |
merge tests: octopus with redundant parents
This happens when git merge is run to merge multiple commits that are
descendants of current HEAD (or are HEAD). We've hit this while updating
master to origin/master but accidentaly we called (while being on master):
$ git merge master origin/master
Here is a minimal testcase:
$ git init a && cd a
$ echo a >a && git add a
$ git commit -minitial
$ echo b >a && git add a
$ git commit -msecond
$ git checkout master^
$ git merge master master
Fast-forwarding to: master
Already up-to-date with master
Merge made by the 'octopus' strategy.
a | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
$ git cat-file commit HEAD
tree eebfed94e75e7760540d1485c740902590a00332
parent bd679e85202280b263e20a57639a142fa14c2c64
author Michał Kiedrowicz <michal.kiedrowicz@gmail.com> 1329132996 +0100
committer Michał Kiedrowicz <michal.kiedrowicz@gmail.com> 1329132996 +0100
Merge branches 'master' and 'master' into HEAD
Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1013/objects/7a/37b887a73791d12d26c0d3e39568a8fb0fa6e8')
0 files changed, 0 insertions, 0 deletions