[PATCH 2/4] Rework redo_merge
From: Jörg Sommer <hidden>
Date: 2016-06-15 22:44:25
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Jörg Sommer <redacted> --- git-rebase--interactive.sh | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 1b2381e..ffd4823 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh@@ -114,14 +114,16 @@ has_action () { } redo_merge() { - author_script=$(get_author_ident_from_commit $sha1) - eval "$author_script" + sha1=$1 + shift + + eval "$(get_author_ident_from_commit $sha1)" msg="$(git cat-file commit $sha1 | sed -e '1,/^$/d')" + if ! GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \ GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \ GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \ - output git merge $STRATEGY -m "$msg" \ - $new_parents + output git merge $STRATEGY -m "$msg" "$@" then git rerere printf "%s\n" "$msg" > "$GIT_DIR"/MERGE_MSG
@@ -197,8 +199,7 @@ pick_one_preserving_merges () { case "$new_parents" in ' '*' '*) # No point in merging the first parent, that's HEAD - new_parents=${new_parents# $first_parent} - redo_merge + redo_merge $sha1 ${new_parents# $first_parent} ;; *) output git cherry-pick "$@" ||
--
1.5.4.4