git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] Fix git rebase --continue to work with touched files

From
David D. Kilzer <ddkilzer@kilzer.net>
Date
Jul 27, 2010, 21:29 UTC
Message-ID
<783007.41425.qm@web30007.mail.mud.yahoo.com>
In-Reply-To
<201007272153.36646.j6t@kdbg.org>
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
Previous: Johannes Sixt
Message 5 of 5 in “Fix git rebase --continue to work with touched files”
  1. Fix git rebase --continue to work with touched filesDavid D. Kilzer, Jul 27, 2010
  2. Johannes SchindelinJul 27, 2010
  3. Ævar Arnfjörð BjarmasonJul 27, 2010
  4. Johannes SixtJul 27, 2010
  5. David D. KilzerJul 27, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.