mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
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>
This commit is contained in:
parent
699f13ca9a
commit
bdb011ade4
|
@ -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
|
||||
}
|
||||
|
@ -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
|
||||
|
@ -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."
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue