Fabian Ruch <baf...@gmail.com> writes:

> If a todo list will cherry-pick a commit that adds some file and the
> working tree already contains a file with the same name, the rebase
> sequence for that todo list will be interrupted and the cherry-picked
> commit will be lost after the rebasing process is resumed.
>
> This is fixed.
>
> Add as a test case for regression testing to the "rebase-interactive"
> test suite.
>
> Reported-by: Phil Hord <ho...@cisco.com>
> Signed-off-by: Fabian Ruch <baf...@gmail.com>
> ---
>  t/t3404-rebase-interactive.sh | 44 
> +++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 44 insertions(+)
>
> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
> index 50e22b1..7f5ac18 100755
> --- a/t/t3404-rebase-interactive.sh
> +++ b/t/t3404-rebase-interactive.sh
> @@ -1074,4 +1074,48 @@ test_expect_success 'short SHA-1 collide' '
>       )
>  '
>  
> +test_expect_success 'rebase -i commits that overwrite untracked files 
> (pick)' '
> +     git checkout branch2 &&
> +     set_fake_editor &&
> +     FAKE_LINES="edit 1 2" git rebase -i A &&
> +     test_cmp_rev HEAD F &&
> +     test_path_is_missing file6 &&
> +     touch file6 &&

Unless you care deeply about updating the timestamp file6 has, use
of "touch" is misleading.  Use something like this instead:

        >file6 &&

when it is the existence of "file6" that you care about.

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to