Re: [PATCH] Fix git rebase --continue to work with touched files
On Tue, July 27, 2010 at 12:53:36 PM, Johannes Sixt wrote:
Show 19 quoted lines
> 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.
That works great! Thanks!
Dave