projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 592ee97) | patch
git-show-branch: tighten merge-base computation.
authorJunio C Hamano <junkio@cox.net>
Thu, 10 Nov 2005 07:36:15 +0000 (23:36 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 11 Nov 2005 18:52:38 +0000 (10:52 -0800)
commit9ce7028531fd7ce1ca8d75a5c4f9a941ef79c9d4
tree92d355f00fca724483afc0053f156fd8f3e794d4tree | snapshot
parent592ee97d8fffa2318960074057e044709163abf7commit | diff
git-show-branch: tighten merge-base computation.

This makes the merge-base computation resistant to the pathological
case discussed on the list earlier, by doing the same logic as
git-merge-base.  As a side effect, it breaks the command's primary
function to list non-merge commit sequences, which needs to be fixed
separately.

Signed-off-by: Junio C Hamano <junkio@cox.net>
show-branch.c diff | blob | history
The core git plumbing