mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-merge-base/git-show-branch --merge-base: Documentation and test

Browse Source 
Currently, the documentation suggests that 'git merge-base -a' and 'git
show-branch --merge-base' are equivalent (in fact it claims that the
former cannot handle more than two revs).

Alas, the handling of more than two revs is very different. Document
this by tests and correct the documentation to reflect this.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael J Gruber
2009-08-05 09:59:20 +02:00
committed by Junio C Hamano
parent 995bdc73fe
commit f621a8454d
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
t/t6010-merge-base.sh
View File

@ -149,6 +149,12 @@ test_expect_success 'merge-base A B C' '
test "$MM1" = "$MB"
'
test_expect_success 'merge-base A B C using show-branch' '
MB=$(git show-branch --merge-base MMA MMB MMC) &&
MMR=$(git rev-parse --verify MMR) &&
test "$MMR" = "$MB"
'
test_expect_success 'criss-cross merge-base for octopus-step (setup)' '
git reset --hard MMR &&
test_tick && git commit --allow-empty -m 1 && git tag CC1 &&