From: Eric Sunshine <sunshine@sunshineco.com>
Date: Tue, 23 Jun 2015 18:24:46 GMT
Subject: Re: [PATCHv6 1/3] git-rebase -i: add command "drop" to remove a commit
Message-ID: <CAPig+cT+idnGkR0V-UfwbHwvjd_U=zbjHx+so7Jz+4o1XU5eHw@mail.gmail.com>
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