rebase -i: Use symbolic constant $MSG consistently
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>
Michael Haggerty committed
Jan 14, 2010 at 06:54 UTC
bdb011ade4db4a50cde13b5ec870c3dccff7e093
1 file changed
+4
-4
git-rebase--interactive.sh
+4
-4
@@ -129,8 +129,8 @@ make_patch () {
129
echo "Root commit"
130
;;
131
esac > "$DOTEST"/patch
132
- test -f "$DOTEST"/message ||
133
- git cat-file commit "$1" | sed "1,/^$/d" > "$DOTEST"/message
132
+ test -f "$MSG" ||
133
+ git cat-file commit "$1" | sed "1,/^$/d" > "$MSG"
134
test -f "$DOTEST"/author-script ||
135
get_author_ident_from_commit "$1" > "$DOTEST"/author-script
136
}
@@ -341,7 +341,7 @@ peek_next_command () {
341
}
342
343
do_next () {
344
- rm -f "$DOTEST"/message "$DOTEST"/author-script \
344
+ rm -f "$MSG" "$DOTEST"/author-script \
345
"$DOTEST"/amend || exit
346
read command sha1 rest < "$TODO"
347
case "$command" in
@@ -559,7 +559,7 @@ first and then run 'git rebase --continue' again."
559
die "Cannot rewind the HEAD"
560
fi
561
export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE &&
562
- git commit --no-verify -F "$DOTEST"/message -e || {
562
+ git commit --no-verify -F "$MSG" -e || {
563
test -n "$amend" && git reset --soft $amend
564
die "Could not commit staged changes."
565
}