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

[PATCH] git-applymbox: verify that index is clean

Browse Source 
This makes git-applymbox verify that the index matches the current HEAD
before it starts applying patches.

Otherwise, you might have updated the index with unrelated changes, and
the first patch will commit not just the patch from the mbox, but also any
changes you had in your index.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Linus Torvalds 2005-08-18 15:31:40 -07:00 committed by Junio C Hamano
parent 1bff6490b0
commit d571c2be99
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/git-applymbox
View File

@ -18,6 +18,8 @@
## use a Signoff_file, because applypatch wants to append the sign-off
## message to msg-clean every time it is run.
. git-sh-setup-script || die "Not a git archive"
keep_subject= query_apply= continue= resume=t
while case "$#" in 0) break ;; esac
do
@ -39,6 +41,12 @@ case "$continue" in
shift
esac
files=$(git-diff-cache --cached --name-only HEAD) || exit
if [ "$files" ]; then
echo "Dirty index: cannot apply patches (dirty: $files)" >&2
exit 1
fi
case "$query_apply" in
t) touch .dotest/.query_apply
esac