mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
Fix contrib/hooks/post-receive-email for new duplicate branch
In the show_new_revisions function, the original code: git rev-parse --not --branches | grep -v $(git rev-parse $refname) | isn't quite right since one can create a new branch and push it without any new commits. In that case, two refs will have the same sha1 but both would get filtered by the 'grep'. In the end, we'll show ALL the history which is not what we want. Instead, we should list the branches by name and remove the branch being updated and THEN pass that list through rev-parse. Revised as suggested by Jakub Narebski and Junio C Hamano to use git-for-each-ref instead of git-branch. (Thanks!) Signed-off-by: Pat Notz <pknotz@sandia.gov> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
7b73d828f0
commit
e5f5050ed1
|
@ -615,7 +615,9 @@ show_new_revisions()
|
|||
revspec=$oldrev..$newrev
|
||||
fi
|
||||
|
||||
git rev-parse --not --branches | grep -v $(git rev-parse $refname) |
|
||||
other_branches=$(git for-each-ref --format='%(refname)' refs/heads/ |
|
||||
grep -F -v $refname)
|
||||
git rev-parse --not $other_branches |
|
||||
if [ -z "$custom_showrev" ]
|
||||
then
|
||||
git rev-list --pretty --stdin $revspec
|
||||
|
|
Loading…
Reference in a new issue