From: Johannes Sixt <j6t@kdbg.org>
To: "David D. Kilzer" <ddkilzer@kilzer.net>
Cc: git@vger.kernel.org, Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH] Fix git rebase --continue to work with touched files
Date: Tue, 27 Jul 2010 21:53:36 +0200 [thread overview]
Message-ID: <201007272153.36646.j6t@kdbg.org> (raw)
In-Reply-To: <1280225198-4539-1-git-send-email-ddkilzer@kilzer.net>
On Dienstag, 27. Juli 2010, David D. Kilzer wrote:
> +test_expect_success 'rebase --continue works with touched file' '
> + count=1
> + while test "$count" -le 4
> + do
> + git branch topic$count topic &&
> + test_must_fail git rebase --onto master master topic$count &&
> + echo "Resolved" >F2 &&
> + git add F2 &&
> + touch F1 &&
> + git rebase --continue || exit 1
exit from a test is a big no-no. But I think you can reproduce the issue
reliably and get rid of the entire loop if you use test-chmtime instead of
touch:
test-chmtime =-60 F1 &&
i.e. set the modification time back one minute.
> + count=$(($count + 1))
> + done
> +'
> +
> +test_done
-- Hannes
next prev parent reply other threads:[~2010-07-27 19:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-27 10:06 [PATCH] Fix git rebase --continue to work with touched files David D. Kilzer
2010-07-27 10:16 ` Johannes Schindelin
2010-07-27 10:20 ` Ævar Arnfjörð Bjarmason
2010-07-27 19:53 ` Johannes Sixt [this message]
2010-07-27 21:29 ` David D. Kilzer
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=201007272153.36646.j6t@kdbg.org \
--to=j6t@kdbg.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=ddkilzer@kilzer.net \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).