undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase -i: Handle the author script all in one place in do_next

Browse Source 
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:
Michael Haggerty 2010-01-14 06:54:52 +01:00 committed by Junio C Hamano
parent ee0a4afbe2
commit 5c5d059a0d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-rebase--interactive.sh
View File

@ -447,6 +447,8 @@ do_next () {
make_squash_message $squash_style $sha1 > "$MSG" make_squash_message $squash_style $sha1 > "$MSG"
failed=f failed=f
author_script=$(get_author_ident_from_commit HEAD) author_script=$(get_author_ident_from_commit HEAD)
echo "$author_script" > "$AUTHOR_SCRIPT"
eval "$author_script"
output git reset --soft HEAD^ output git reset --soft HEAD^
pick_one -n $sha1 || failed=t pick_one -n $sha1 || failed=t
case "$(peek_next_command)" in case "$(peek_next_command)" in
@ -465,11 +467,9 @@ do_next () {
rm -f "$GIT_DIR"/MERGE_MSG || exit rm -f "$GIT_DIR"/MERGE_MSG || exit
;; ;;
esac esac
echo "$author_script" > "$AUTHOR_SCRIPT"
if test $failed = f if test $failed = f
then then
# This is like --amend, but with a different message # This is like --amend, but with a different message
eval "$author_script"
GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \ GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \
GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \ GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \
GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \ GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \