eyecatchu/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-12 13:53:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

Meta/CheckPush: allow jch to lag a bit behind next

Browse Source
This commit is contained in:
Junio C Hamano 2011-10-19 11:12:27 -07:00
parent 138b4c2de6
commit 63462397c6
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CheckPush
View File

@ -29,4 +29,18 @@ do
fi
done
git diff --stat next jch
if next_tree=$(git rev-parse next^{tree}) &&
next_equiv=$(git rev-list jch..pu |
xargs -n1 sh -c '
echo $(git rev-parse $1^{tree}) $1
' - | sed -n -e "s/^$next_tree //p"
) &&
test -n "$next_equiv"
then
jch=$(git rev-list --first-parent master..jch | wc -l) &&
pu=$(git rev-list --first-parent master..pu | wc -l) &&
next=$(git rev-list --first-parent master..$next_equiv | wc -l) &&
echo $jch..$next..$pu
else
git diff --stat next jch
fi