summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-10-09 16:33:23 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2008-10-09 16:33:23 (GMT)
commit44c33a5b9603fba7c9556512a72e4e392ba4ae2d (patch)
tree2163f6f2967ac3f6cc222b64ab8d1ea242b0fda6
parentb8ebe08b9a643f432866eb7150c3b20d59b755f2 (diff)
parent943cea901483c95ee7c83b70191bf7cc8f4f7c21 (diff)
downloadgit-44c33a5b9603fba7c9556512a72e4e392ba4ae2d.zip
git-44c33a5b9603fba7c9556512a72e4e392ba4ae2d.tar.gz
git-44c33a5b9603fba7c9556512a72e4e392ba4ae2d.tar.bz2
Merge branch 'sg/maint-intrebase-msghook' into maint
* sg/maint-intrebase-msghook: rebase -i: remove leftover debugging rebase -i: proper prepare-commit-msg hook argument when squashing
-rwxr-xr-xgit-rebase--interactive.sh17
1 files changed, 11 insertions, 6 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 3350f90..bdec43c 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -314,23 +314,28 @@ do_next () {
mark_action_done
make_squash_message $sha1 > "$MSG"
+ failed=f
+ author_script=$(get_author_ident_from_commit HEAD)
+ output git reset --soft HEAD^
+ pick_one -n $sha1 || failed=t
case "$(peek_next_command)" in
squash|s)
EDIT_COMMIT=
USE_OUTPUT=output
+ MSG_OPT=-F
+ MSG_FILE="$MSG"
cp "$MSG" "$SQUASH_MSG"
;;
*)
EDIT_COMMIT=-e
USE_OUTPUT=
+ MSG_OPT=
+ MSG_FILE=
rm -f "$SQUASH_MSG" || exit
+ cp "$MSG" "$GIT_DIR"/SQUASH_MSG
+ rm -f "$GIT_DIR"/MERGE_MSG || exit
;;
esac
-
- failed=f
- author_script=$(get_author_ident_from_commit HEAD)
- output git reset --soft HEAD^
- pick_one -n $sha1 || failed=t
echo "$author_script" > "$DOTEST"/author-script
if test $failed = f
then
@@ -339,7 +344,7 @@ do_next () {
GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \
GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \
GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \
- $USE_OUTPUT git commit --no-verify -F "$MSG" $EDIT_COMMIT || failed=t
+ $USE_OUTPUT git commit --no-verify $MSG_OPT "$MSG_FILE" $EDIT_COMMIT || failed=t
fi
if test $failed = t
then