Re: FYI: git-am allows creation of empty commits.
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:20
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · FYI: git-am allows creation of empty commits. · Eric W. Biederman <hidden>
- 2016-06-15 · Re: FYI: git-am allows creation of empty commits. · Eric W. Biederman <hidden>
- 2016-06-15 · Re: FYI: git-am allows creation of empty commits. · Junio C Hamano <hidden>
- 2016-06-15 · Re: FYI: git-am allows creation of empty commits. · Eric Wong <hidden>
- 2016-06-15 · Re: FYI: git-am allows creation of empty commits. · Junio C Hamano <hidden>
ebiederm@xmission.com (Eric W. Biederman) writes:
After fixing it up and doing all of my edits I occasionally forget the git-update-index step, before calling git-am --resolved. This proceeds along it's merry way and creates an empty commit.
Certainly a safty measure is missing here. Thanks for noticing. How about something like this? ---
diff --git a/git-am.sh b/git-am.sh
index 85ecada..6730813 100755
--- a/git-am.sh
+++ b/git-am.sh@@ -300,10 +300,16 @@ do } >"$dotest/final-commit" ;; *) - case "$resolved,$interactive" in - tt) - # This is used only for interactive view option. + case "$resolved" in + t) + # This is used for interactive view option, but + # also we should see if the user really did + # something... git-diff-index -p --cached HEAD >"$dotest/patch" + test -s "$dotest/patch" || { + echo "You said resolved, but there is no change in the index..." + stop_here $this + } ;; esac esac