From: Michael Haggerty Date: Thu, 14 Jan 2010 05:54:44 GMT Subject: [PATCH 05/18] rebase -i: Use symbolic constant $MSG consistently Message-ID: <1dc77ab5f378ce6fc41b01541fbf15c5ae037aa8.1263447037.git.mhagger@alum.mit.edu> In-Reply-To: The filename constant $MSG was previously used in some places and written out literally in others. Signed-off-by: Michael Haggerty --- git-rebase--interactive.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 6dbc64e..b7e8189 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -131,8 +131,8 @@ make_patch () { echo "Root commit" ;; esac > "$DOTEST"/patch - test -f "$DOTEST"/message || - git cat-file commit "$1" | sed "1,/^$/d" > "$DOTEST"/message + test -f "$MSG" || + git cat-file commit "$1" | sed "1,/^$/d" > "$MSG" test -f "$DOTEST"/author-script || get_author_ident_from_commit "$1" > "$DOTEST"/author-script } @@ -343,7 +343,7 @@ peek_next_command () { } do_next () { - rm -f "$DOTEST"/message "$DOTEST"/author-script \ + rm -f "$MSG" "$DOTEST"/author-script \ "$DOTEST"/amend || exit read command sha1 rest < "$TODO" case "$command" in @@ -611,7 +611,7 @@ first and then run 'git rebase --continue' again." die "Cannot rewind the HEAD" fi export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE && - git commit --no-verify -F "$DOTEST"/message -e || { + git commit --no-verify -F "$MSG" -e || { test -n "$amend" && git reset --soft $amend die "Could not commit staged changes." } -- 1.6.6