diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-02-24 02:21:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-24 02:21:00 -0800 |
| commit | 6d5129ac098e8b9c270efd5fa2695163122a0a46 (patch) | |
| tree | 95e179100ed9877df930637ff244e9edaa462126 | |
| parent | Merge branches 'jc/fix-co-candy', 'jc/fix-rename-leak' and 'ar/fix-win' into ... (diff) | |
| parent | git-am: do not allow empty commits by mistake. (diff) | |
| download | tgif-6d5129ac098e8b9c270efd5fa2695163122a0a46.tar.xz | |
Merge branch 'fix' into maint
* fix:
git-am: do not allow empty commits by mistake.
| -rwxr-xr-x | git-am.sh | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -300,7 +300,7 @@ do } >"$dotest/final-commit" ;; *) - case "$resolved,$interactive" in + case "$resolved$interactive" in tt) # This is used only for interactive view option. git-diff-index -p --cached HEAD >"$dotest/patch" @@ -364,6 +364,12 @@ do # trust what the user has in the index file and the # working tree. resolved= + changed="$(git-diff-index --cached --name-only HEAD)" + if test '' = "$changed" + then + echo "No changes - did you forget update-index?" + stop_here $this + fi apply_status=0 ;; esac @@ -374,7 +380,7 @@ do then # Applying the patch to an earlier tree and merging the # result may have produced the same tree as ours. - changed="$(git-diff-index --cached --name-only -z HEAD)" + changed="$(git-diff-index --cached --name-only HEAD)" if test '' = "$changed" then echo No changes -- Patch already applied. |