From: Junio C Hamano <gitster@pobox•com>
To: Fabian Ruch <bafain@gmail•com>
Cc: git@vger•kernel.org, Phil Hord <hordp@cisco•com>
Subject: Re: [RFC 3/3] tests: Add 'rebase -i commits that overwrite untracked files'
Date: Tue, 27 May 2014 11:47:23 -0700 [thread overview]
Message-ID: <xmqqr43ff490.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <5383BDF0.2040904@gmail.com> (Fabian Ruch's message of "Tue, 27 May 2014 00:19:28 +0200")
Fabian Ruch <bafain@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 <hordp@cisco•com>
> Signed-off-by: Fabian Ruch <bafain@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.
prev parent reply other threads:[~2014-05-27 18:47 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-02 22:37 git-rebase-todo gets popped prematurely Phil Hord
2014-05-26 22:19 ` [RFC 1/3] sequencer: Signal failed ff as an aborted, not a conflicted merge Fabian Ruch
2014-05-27 18:42 ` Junio C Hamano
2014-06-09 15:04 ` Fabian Ruch
2014-06-10 17:56 ` Junio C Hamano
2014-06-10 18:51 ` Phil Hord
2014-06-10 19:17 ` Junio C Hamano
2014-05-26 22:19 ` [RFC 2/3] rebase -i: Reschedule tasks that failed before the index was touched Fabian Ruch
2014-05-27 11:56 ` Michael Haggerty
2014-05-27 18:26 ` Phil Hord
2014-05-26 22:19 ` [RFC 3/3] tests: Add 'rebase -i commits that overwrite untracked files' Fabian Ruch
2014-05-27 13:15 ` Michael Haggerty
2014-05-27 18:47 ` Junio C Hamano [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqr43ff490.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=bafain@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=hordp@cisco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox