From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Contreras Subject: [PATCH v4 23/45] rebase: split the cherry-pick stuff Date: Sun, 9 Jun 2013 11:40:35 -0500 Message-ID: <1370796057-25312-24-git-send-email-felipe.contreras@gmail.com> References: <1370796057-25312-1-git-send-email-felipe.contreras@gmail.com> Cc: Junio C Hamano , Ramkumar Ramachandra , Jonathan Nieder , Martin von Zweigbergk , Felipe Contreras To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Jun 09 18:44:07 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Uliio-0006ud-6Y for gcvg-git-2@plane.gmane.org; Sun, 09 Jun 2013 18:44:02 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752108Ab3FIQn7 (ORCPT ); Sun, 9 Jun 2013 12:43:59 -0400 Received: from mail-oa0-f41.google.com ([209.85.219.41]:48008 "EHLO mail-oa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751989Ab3FIQn5 (ORCPT ); Sun, 9 Jun 2013 12:43:57 -0400 Received: by mail-oa0-f41.google.com with SMTP id n9so4968425oag.28 for ; Sun, 09 Jun 2013 09:43:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=xwlDW92VQTZqv0BKTXHw7466nEmf9RcGbinrmWbdqpM=; b=zvt5NIDpUP3gNKnEgridZjXPExW4XUMaW9nMFeFrNQ/QUVqdYyITrCw9c5Py2Mimgr TFL9jqensj6TC2CEii5WUY1cpyc+I1Ij6o3g1UOpfS0R42atfLRqtjsG+2l2fpexuezn 3VEHYLN2cDi+0CQGPIqF5FxDycCTqHYkmmKrbx+Yk5FQEDc7mRM2K61evs1G2ZCXxor4 x+8JCu/EtPNMrJrwS8K3C8bLrqP1gQONhOQa53Vcz5oT/ZGBzP4BI+qgHg1HVFnnEcz7 vQ/LawDgm8Uybh4tZAsEdIeJIebcFFEF8kDVtYAZlNq0JHt9fmYMABritgs4KkssX2K7 l8yw== X-Received: by 10.182.230.198 with SMTP id ta6mr5123634obc.98.1370796236635; Sun, 09 Jun 2013 09:43:56 -0700 (PDT) Received: from localhost (187-163-100-70.static.axtel.net. [187.163.100.70]) by mx.google.com with ESMTPSA id b5sm14864613oby.12.2013.06.09.09.43.54 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 09 Jun 2013 09:43:55 -0700 (PDT) X-Mailer: git-send-email 1.8.3.698.g079b096 In-Reply-To: <1370796057-25312-1-git-send-email-felipe.contreras@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: They do something completely different from 'git am', it belongs in a different file. No functional changes. Signed-off-by: Felipe Contreras --- .gitignore | 1 + Makefile | 1 + git-rebase--am.sh | 11 +---------- git-rebase--cherrypick.sh | 30 ++++++++++++++++++++++++++++++ git-rebase.sh | 4 ++++ 5 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 git-rebase--cherrypick.sh diff --git a/.gitignore b/.gitignore index 1640c3a..2a3dbae 100644 --- a/.gitignore +++ b/.gitignore @@ -113,6 +113,7 @@ /git-read-tree /git-rebase /git-rebase--am +/git-rebase--cherrypick /git-rebase--interactive /git-rebase--merge /git-receive-pack diff --git a/Makefile b/Makefile index a167e68..4719979 100644 --- a/Makefile +++ b/Makefile @@ -473,6 +473,7 @@ SCRIPT_SH += git-web--browse.sh SCRIPT_LIB += git-mergetool--lib SCRIPT_LIB += git-parse-remote SCRIPT_LIB += git-rebase--am +SCRIPT_LIB += git-rebase--cherrypick SCRIPT_LIB += git-rebase--interactive SCRIPT_LIB += git-rebase--merge SCRIPT_LIB += git-sh-setup diff --git a/git-rebase--am.sh b/git-rebase--am.sh index 34e3102..6460028 100644 --- a/git-rebase--am.sh +++ b/git-rebase--am.sh @@ -19,15 +19,7 @@ esac test -n "$rebase_root" && root_flag=--root ret=0 -if test -n "$keep_empty" -then - # we have to do this the hard way. git format-patch completely squashes - # empty commits and even if it didn't the format doesn't really lend - # itself well to recording empty patches. fortunately, cherry-pick - # makes this easy - git cherry-pick --allow-empty "$revisions" - ret=$? -else + rm -f "$GIT_DIR/rebased-patches" git format-patch -k --stdout --full-index --ignore-if-in-upstream \ @@ -63,7 +55,6 @@ else ret=$? rm -f "$GIT_DIR/rebased-patches" -fi if test 0 != $ret then diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh new file mode 100644 index 0000000..2c16995 --- /dev/null +++ b/git-rebase--cherrypick.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# +# Copyright (c) 2010 Junio C Hamano. +# + +case "$action" in +continue) + git am --resolved --resolvemsg="$resolvemsg" && + move_to_original_branch + return + ;; +skip) + git am --skip --resolvemsg="$resolvemsg" && + move_to_original_branch + return + ;; +esac + +test -n "$rebase_root" && root_flag=--root + +git cherry-pick --allow-empty "$revisions" +ret=$? + +if test 0 != $ret +then + test -d "$state_dir" && write_basic_state + return $ret +fi + +move_to_original_branch diff --git a/git-rebase.sh b/git-rebase.sh index d0c11a9..70762f1 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -413,6 +413,10 @@ elif test -n "$do_merge" then type=merge state_dir="$merge_dir" +elif test -n "$keep_empty" +then + type=cherrypick + state_dir="$apply_dir" else type=am state_dir="$apply_dir" -- 1.8.3.698.g079b096