dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-08 09:02:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Meta/CheckPush: fix the "does not match next" error case

Browse Source 
When an early part of 'jch' does not match 'next', we showed the
whole diff between next and jch, which was not very useful.
This commit is contained in:
Junio C Hamano
2016-06-23 15:19:01 -07:00
parent f10cb137a2
commit 9cda2823fd
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CheckPush
View File

@@ -72,10 +72,7 @@ then
else
echo "master..$next..next..$jch..jch..$pu..pu"
fi
else
echo "git diff --stat next jch"
git diff --stat next jch
elif match_next=$(git rev-parse 'jch^{/^### match next$}' 2>/dev/null)
then
git diff --stat "$match_next" next
fi
match_next=$(git rev-parse 'jch^{/^### match next}') || exit
git diff --stat "$match_next" next