mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
rebase -i: Handle the author script all in one place in do_next
This change has no practical effect but makes the code easier to follow. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
ee0a4afbe2
commit
5c5d059a0d
|
@ -447,6 +447,8 @@ do_next () {
|
|||
make_squash_message $squash_style $sha1 > "$MSG"
|
||||
failed=f
|
||||
author_script=$(get_author_ident_from_commit HEAD)
|
||||
echo "$author_script" > "$AUTHOR_SCRIPT"
|
||||
eval "$author_script"
|
||||
output git reset --soft HEAD^
|
||||
pick_one -n $sha1 || failed=t
|
||||
case "$(peek_next_command)" in
|
||||
|
@ -465,11 +467,9 @@ do_next () {
|
|||
rm -f "$GIT_DIR"/MERGE_MSG || exit
|
||||
;;
|
||||
esac
|
||||
echo "$author_script" > "$AUTHOR_SCRIPT"
|
||||
if test $failed = f
|
||||
then
|
||||
# This is like --amend, but with a different message
|
||||
eval "$author_script"
|
||||
GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \
|
||||
GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \
|
||||
GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \
|
||||
|
|
Loading…
Reference in a new issue