From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?q?J=C3=B6rg=20Sommer?= Subject: [PATCH/RFC 04/10] Move redo merge code in a function Date: Thu, 10 Apr 2008 01:58:35 +0200 Message-ID: <1207785521-27742-5-git-send-email-joerg@alea.gnuu.de> References: <7vabkoufzq.fsf@gitster.siamese.dyndns.org> <1207785521-27742-1-git-send-email-joerg@alea.gnuu.de> <1207785521-27742-2-git-send-email-joerg@alea.gnuu.de> <1207785521-27742-3-git-send-email-joerg@alea.gnuu.de> <1207785521-27742-4-git-send-email-joerg@alea.gnuu.de> Cc: gitster@pobox.com, Johannes.Schindelin@gmx.de, =?utf-8?q?J=C3=B6rg=20Sommer?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Apr 10 02:04:19 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1JjkH1-0004V7-EJ for gcvg-git-2@gmane.org; Thu, 10 Apr 2008 02:04:15 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754720AbYDJADT (ORCPT ); Wed, 9 Apr 2008 20:03:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753800AbYDJADS (ORCPT ); Wed, 9 Apr 2008 20:03:18 -0400 Received: from banki.eumelnet.de ([83.246.114.63]:3466 "EHLO uucp.gnuu.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754720AbYDJADG (ORCPT ); Wed, 9 Apr 2008 20:03:06 -0400 Received: by uucp.gnuu.de (Postfix, from userid 10) id 5BADC488064; Thu, 10 Apr 2008 02:03:03 +0200 (CEST) Received: from ibook.localnet ([192.168.0.5] helo=alea.gnuu.de) by alea.gnuu.de with esmtp (Exim 4.63) (envelope-from ) id 1JjkBf-0004mG-3H; Thu, 10 Apr 2008 01:58:43 +0200 Received: from joerg by alea.gnuu.de with local (Exim 4.69) (envelope-from ) id 1JjkBe-0007EL-3N; Thu, 10 Apr 2008 01:58:42 +0200 X-Mailer: git-send-email 1.5.4.5 In-Reply-To: <1207785521-27742-4-git-send-email-joerg@alea.gnuu.de> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: --- git-rebase--interactive.sh | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 18cdf3d..973770e 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -114,6 +114,22 @@ has_action () { grep '^[^#]' "$1" >/dev/null } +redo_merge() { + author_script=$(get_author_ident_from_commit $sha1) + eval "$author_script" + 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 + then + git rerere + printf "%s\n" "$msg" > "$GIT_DIR"/MERGE_MSG + die Error redoing merge $sha1 + fi +} + pick_one () { no_ff= case "$1" in -n) sha1=$2; no_ff=t ;; *) sha1=$1 ;; esac @@ -181,22 +197,9 @@ pick_one_preserving_merges () { echo $sha1 > "$DOTEST"/current-commit case "$new_parents" in ' '*' '*) - # redo merge - author_script=$(get_author_ident_from_commit $sha1) - eval "$author_script" - msg="$(git cat-file commit $sha1 | sed -e '1,/^$/d')" # No point in merging the first parent, that's HEAD new_parents=${new_parents# $first_parent} - 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 - then - git rerere - printf "%s\n" "$msg" > "$GIT_DIR"/MERGE_MSG - die Error redoing merge $sha1 - fi + redo_merge ;; *) output git cherry-pick "$@" || -- 1.5.4.5