undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am

Browse Source 
Data in rr-cache isn't valid after a patch application is
skipped or and aborted, so our next commit could be misrecorded
as a resolution of that skipped/failed commit, which is wrong.

git-am --skip, git-rebase --skip/--abort will automatically
invoke git-rerere clear to avoid this.

Also, since git-am --resolved indicates a resolution was
succesful, remember to run git-rerere to record the resolution
(and not surprise the user when the next commit is made).

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Eric Wong 2006-12-08 13:29:56 -08:00 committed by Junio C Hamano
parent cda2d3c112
commit f131dd492f
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git-am.sh
View File

@ -246,6 +246,10 @@ last=`cat "$dotest/last"`
this=`cat "$dotest/next"`
if test "$skip" = t
then
if test -d "$GIT_DIR/rr-cache"
then
git-rerere clear
fi
this=`expr "$this" + 1`
resume=
fi
@ -408,6 +412,10 @@ do
stop_here_user_resolve $this
fi
apply_status=0
if test -d "$GIT_DIR/rr-cache"
then
git rerere
fi
;;
esac

8
git-rebase.sh
View File

@ -139,6 +139,10 @@ do
--skip)
if test -d "$dotest"
then
if test -d "$GIT_DIR/rr-cache"
then
git-rerere clear
fi
prev_head="`cat $dotest/prev_head`"
end="`cat $dotest/end`"
msgnum="`cat $dotest/msgnum`"
@ -157,6 +161,10 @@ do
exit
;;
--abort)
if test -d "$GIT_DIR/rr-cache"
then
git-rerere clear
fi
if test -d "$dotest"
then
rm -r "$dotest"