From: Eric Sunshine <sunshine@sunshineco.com>
To: "Galan Rémi" <remi.galan-alfonso@ensimag.grenoble-inp.fr>
Cc: Git List <git@vger.kernel.org>,
Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>,
Guillaume Pages <guillaume.pages@ensimag.grenoble-inp.fr>,
Louis-Alexandre Stuber
<louis--alexandre.stuber@ensimag.grenoble-inp.fr>,
Antoine Delaite <antoine.delaite@ensimag.grenoble-inp.fr>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCHv6 1/3] git-rebase -i: add command "drop" to remove a commit
Date: Tue, 23 Jun 2015 14:24:46 -0400 [thread overview]
Message-ID: <CAPig+cT+idnGkR0V-UfwbHwvjd_U=zbjHx+so7Jz+4o1XU5eHw@mail.gmail.com> (raw)
In-Reply-To: <1435009369-11496-1-git-send-email-remi.galan-alfonso@ensimag.grenoble-inp.fr>
On Mon, Jun 22, 2015 at 5:42 PM, Galan Rémi
<remi.galan-alfonso@ensimag.grenoble-inp.fr> wrote:
> 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émi <remi.galan-alfonso@ensimag.grenoble-inp.fr>
> ---
> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
> index ac429a0..ecd277c 100755
> --- a/t/t3404-rebase-interactive.sh
> +++ b/t/t3404-rebase-interactive.sh
> @@ -1102,4 +1102,20 @@ test_expect_success 'rebase -i commits that overwrite untracked files (no ff)' '
> test $(git cat-file commit HEAD | sed -ne \$p) = I
> '
>
> +test_rebase_end () {
> + test_when_finished "git checkout master &&
> + git branch -D $1 &&
> + test_might_fail git rebase --abort" &&
> + git checkout -b $1 master
> +}
The way this is indented makes it difficult to see that lines 2 and 3
are continuations of 1. Perhaps format it like this instead?
test_rebase_end () {
test_when_finished "git checkout master &&
git branch -D $1 &&
test_might_fail git rebase --abort" &&
git checkout -b $1 master
}
> +
> +test_expect_success 'drop' '
> + test_rebase_end dropTest &&
> + set_fake_editor &&
> + FAKE_LINES="1 drop 2 3 drop 4 5" git rebase -i --root &&
> + test E = $(git cat-file commit HEAD | sed -ne \$p) &&
> + test C = $(git cat-file commit HEAD^ | sed -ne \$p) &&
> + test A = $(git cat-file commit HEAD^^ | sed -ne \$p)
> +'
> +
> test_done
> --
> 2.4.3.371.g8992f2a
next prev parent reply other threads:[~2015-06-23 18:24 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-22 21:42 [PATCHv6 1/3] git-rebase -i: add command "drop" to remove a commit Galan Rémi
2015-06-22 21:42 ` [PATCHv6 2/3] git rebase -i: warn about removed commits Galan Rémi
2015-06-22 21:42 ` [PATCHv6 3/3] git rebase -i: add static check for commands and SHA-1 Galan Rémi
2015-06-23 19:42 ` Junio C Hamano
2015-06-23 20:35 ` Remi Galan Alfonso
2015-06-23 18:24 ` Eric Sunshine [this message]
2015-06-23 19:01 ` [PATCHv6 1/3] git-rebase -i: add command "drop" to remove a commit Remi Galan Alfonso
2015-06-23 19:07 ` Matthieu Moy
2015-06-23 19:18 ` Remi Galan Alfonso
2015-06-23 20:22 ` Matthieu Moy
2015-06-23 20:39 ` Junio C Hamano
2015-06-23 20:47 ` Remi Galan Alfonso
2015-06-23 19:17 ` Eric Sunshine
2015-06-23 19:27 ` Junio C Hamano
2015-06-23 20:08 ` Remi Galan Alfonso
2015-06-23 20:37 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAPig+cT+idnGkR0V-UfwbHwvjd_U=zbjHx+so7Jz+4o1XU5eHw@mail.gmail.com' \
--to=sunshine@sunshineco.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=antoine.delaite@ensimag.grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=guillaume.pages@ensimag.grenoble-inp.fr \
--cc=louis--alexandre.stuber@ensimag.grenoble-inp.fr \
--cc=remi.galan-alfonso@ensimag.grenoble-inp.fr \
--cc=remi.lespinet@ensimag.grenoble-inp.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).