If the user called "rebase -i", marked a commit as "edit", "rebase
--continue" would automatically amend the commit when there were
staged changes.
However, this is actively wrong when the current commit is not the
one marked with "edit". So guard against this.
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
---
git-rebase--interactive.sh | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index e63a864..444f393 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -276,7 +276,7 @@ do_next () {
pick_one $sha1 ||
die_with_patch $sha1 "Could not apply $sha1... $rest"
make_patch $sha1
- : > "$DOTEST"/amend
+ git rev-parse HEAD > "$DOTEST"/amend
warn
warn "You can amend the commit now, with"
warn
@@ -419,7 +419,9 @@ do
else
. "$DOTEST"/author-script ||
die "Cannot find the author identity"
- if test -f "$DOTEST"/amend
+ if test -f "$DOTEST"/amend &&
+ test $(git rev-parse HEAD) = \
+ $(cat "$DOTEST"/amend)
then
git reset --soft HEAD^ ||
die "Cannot rewind the HEAD"
--
1.6.0.rc0.22.gf2096d.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
