Skip to content

Commit

Permalink
rebase -i: Use symbolic constant $MSG consistently
Browse files Browse the repository at this point in the history
The filename constant $MSG was previously used in some places and
written out literally in others.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Michael Haggerty authored and Junio C Hamano committed Jan 14, 2010
1 parent 699f13c commit bdb011a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions git-rebase--interactive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,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
}
Expand Down Expand Up @@ -341,7 +341,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
Expand Down Expand Up @@ -559,7 +559,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."
}
Expand Down

0 comments on commit bdb011a

Please sign in to comment.