From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Galan=20R=C3=A9mi?= Subject: [PATCH/RFCv2 1/2] git-rebase -i: add command "drop" to remove a commit Date: Mon, 1 Jun 2015 11:57:22 +0200 Message-ID: <1433152643-4292-2-git-send-email-remi.galan-alfonso@ensimag.grenoble-inp.fr> References: <1433152643-4292-1-git-send-email-remi.galan-alfonso@ensimag.grenoble-inp.fr> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Remi Lespinet , Guillaume Pages , Louis-Alexandre Stuber , Antoine Delaite , Matthieu Moy , Junio C Hamano , Johannes Schindelin , Stefan Beller , Philip Oakley , Eric Sunshine , Stephen Kelly , =?UTF-8?q?Galan=20R=C3=A9mi?= To: Git List X-From: git-owner@vger.kernel.org Mon Jun 01 11:57:53 2015 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 1YzMTf-0003JC-5a for gcvg-git-2@plane.gmane.org; Mon, 01 Jun 2015 11:57:51 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932137AbbFAJ5l convert rfc822-to-quoted-printable (ORCPT ); Mon, 1 Jun 2015 05:57:41 -0400 Received: from zm-etu-ensimag-1.grenet.fr ([130.190.244.117]:47389 "EHLO zm-etu-ensimag-1.grenet.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932128AbbFAJ5a (ORCPT ); Mon, 1 Jun 2015 05:57:30 -0400 Received: from localhost (localhost [127.0.0.1]) by zm-smtpout-1.grenet.fr (Postfix) with ESMTP id 206DA48841; Mon, 1 Jun 2015 11:57:26 +0200 (CEST) Received: from zm-smtpout-1.grenet.fr ([127.0.0.1]) by localhost (zm-smtpout-1.grenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6XCXyvPLvj8S; Mon, 1 Jun 2015 11:57:26 +0200 (CEST) Received: from zm-smtpauth-1.grenet.fr (zm-smtpauth-1.grenet.fr [130.190.244.122]) by zm-smtpout-1.grenet.fr (Postfix) with ESMTP id EB0FE48844; Mon, 1 Jun 2015 11:57:25 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by zm-smtpauth-1.grenet.fr (Postfix) with ESMTP id DEEA620D6; Mon, 1 Jun 2015 11:57:25 +0200 (CEST) Received: from zm-smtpauth-1.grenet.fr ([127.0.0.1]) by localhost (zm-smtpauth-1.grenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZRkCF9RakqCA; Mon, 1 Jun 2015 11:57:25 +0200 (CEST) Received: from galanalr-Dell-System-Inspiron-N7110.grenet.fr (eduroam-032176.grenet.fr [130.190.32.176]) by zm-smtpauth-1.grenet.fr (Postfix) with ESMTPSA id BBE2C20D8; Mon, 1 Jun 2015 11:57:25 +0200 (CEST) X-Mailer: git-send-email 2.4.1.363.g9535a9c In-Reply-To: <1433152643-4292-1-git-send-email-remi.galan-alfonso@ensimag.grenoble-inp.fr> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Instead of removing a line to remove the commit, you can use the command "drop" (just like "pick" or "edit"). It has the same effect as deleting the line (removing the commit) except that you keep a visual trace of your actions, allowing a better control and reducing the possibility of removing a commit by mistake. Signed-off-by: Galan R=C3=A9mi --- Documentation/git-rebase.txt | 3 +++ git-rebase--interactive.sh | 3 ++- t/lib-rebase.sh | 4 ++-- t/t3404-rebase-interactive.sh | 11 +++++++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.tx= t index 1d01baa..9cf3760 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -514,6 +514,9 @@ rebasing. If you just want to edit the commit message for a commit, replace the command "pick" with the command "reword". =20 +To drop a commit, replace the command "pick" with "drop", or just +delete its line. + If you want to fold two or more commits into one, replace the command "pick" for the second and subsequent commits with "squash" or "fixup". If the commits had different authors, the folded commit will be diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index bab0dcc..2882276 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -152,6 +152,7 @@ Commands: s, squash =3D use commit, but meld into previous commit f, fixup =3D like "squash", but discard this commit's log message x, exec =3D run command (the rest of the line) using shell + d, drop =3D remove commit =20 These lines can be re-ordered; they are executed from top to bottom. =20 @@ -505,7 +506,7 @@ do_next () { rm -f "$msg" "$author_script" "$amend" || exit read -r command sha1 rest < "$todo" case "$command" in - "$comment_char"*|''|noop) + "$comment_char"*|''|noop|drop|d) mark_action_done ;; pick|p) diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index 6bd2522..fdbc900 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@ -14,7 +14,7 @@ # specified line. # # " " -- add a line with the specified command -# ("squash", "fixup", "edit", or "reword") and the SHA1 taken +# ("squash", "fixup", "edit", "reword" or "drop") and the SHA1 t= aken # from the specified line. # # "exec_cmd_with_args" -- add an "exec cmd with args" line. @@ -46,7 +46,7 @@ set_fake_editor () { action=3Dpick for line in $FAKE_LINES; do case $line in - squash|fixup|edit|reword) + squash|fixup|edit|reword|drop) action=3D"$line";; exec*) echo "$line" | sed 's/_/ /g' >> "$1";; diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive= =2Esh index ac429a0..1bad068 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -1102,4 +1102,15 @@ test_expect_success 'rebase -i commits that over= write untracked files (no ff)' ' test $(git cat-file commit HEAD | sed -ne \$p) =3D I ' =20 +test_expect_success 'drop' ' + git checkout master && + test_when_finished "git checkout master" && + git checkout -b dropBranchTest master && + set_fake_editor && + FAKE_LINES=3D"1 drop 2 3 drop 4 5" git rebase -i --root && + test E =3D $(git cat-file commit HEAD | sed -ne \$p) && + test C =3D $(git cat-file commit HEAD^ | sed -ne \$p) && + test A =3D $(git cat-file commit HEAD^^ | sed -ne \$p) +' + test_done --=20 2.4.1.363.g9535a9c