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

Re: cherry-picking a commit clobbers a file which is a directory in the target commit

From
Elijah Newren <newren@gmail.com>
Date
Sep 6, 2010, 15:20 UTC
Message-ID
<AANLkTimz8qSwefp137-D+vEbsf6soG51u0im9EC911_O@mail.gmail.com>
In-Reply-To
<4C84B948.9040907@letterboxes.org>
On Mon, Sep 6, 2010 at 3:50 AM, Nick <oinksocket@letterboxes.org> wrote:
> I've been Warnocked.  Can anyone point me in the right direction?

It's a bug in the recursive merge strategy (i.e. the default one), and affects current master as well as 1.7.0.4. The resolve strategy (which can be used with cherry-pick since 1.7.2) handles this correctly:

$ git cherry-pick --strategy=resolve branch1
Trying simple merge.
Simple merge failed, trying Automatic merge.
[master e95e377] added falafel
 0 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 falafel
I'll investigate.
Elijah
Previous: NickNext: Elijah Newren
Message 3 of 14 in “cherry-picking a commit clobbers a file which is a directory in the target commit”
  1. NickSep 2, 2010
  2. NickSep 6, 2010
  3. Elijah NewrenSep 6, 2010
  4. 0/3 Fix resolvable rename + D/F conflict testcasesElijah Newren, Sep 6, 2010
  5. Elijah NewrenSep 6, 2010
  6. 1/3 t3509: Add rename + D/F conflict testcases that recursive strategy failsElijah Newren, Sep 6, 2010
  7. 2/3 merge-recursive: Small code cleanupElijah Newren, Sep 6, 2010
  8. Elijah NewrenSep 6, 2010
  9. Junio C HamanoSep 6, 2010
  10. Schalk, KenSep 7, 2010
  11. Elijah NewrenSep 8, 2010
  12. Schalk, KenSep 9, 2010
  13. Camille MoncelierOct 21, 2010
  14. 3/3 merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dirElijah Newren, Sep 6, 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.