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

Re: [PATCH v2] pull: merge into unborn by fast-forwarding from empty tree

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 20, 2013, 20:49 UTC
Message-ID
<7vmwqkqzhy.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20130620201957.GC31364@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 5 quoted lines
>> Perhaps making sure the index is empty is sufficient, then?
>
> That would not let you pull when you have "foo" staged, but upstream
> does not have "foo" at all. To be fair, that is quite a corner case, and
> simply rejecting the pull entirely may be OK.
That simplicity was what I was hinting at ;-).
> But read-tree already does
> the hard work for us, so I don't think it is a lot of code either way.

OK, I just got an impression from reading the back-and-forth between you two that read-tree does not want to deal with that case.

But yes, if you say "I have this index, and I am straying away from an empty tree to that commit", with two-tree form "read-tree -m -u", everything should work correctly, including the bit that says "nah, nah, you have added 'foo' but the other guy also adds 'foo', so I'll refuse".

So please scratch that short-cut suggestion.
Previous: Jeff KingNext: Jeff King
Message 12 of 20 in “pull: pull into void by fast-forwarding from empty tree”
  1. pull: pull into void by fast-forwarding from empty treeThomas Rast, Jun 20, 2013
  2. Jeff KingJun 20, 2013
  3. pull: merge into unborn by fast-forwarding from empty treeThomas Rast, Jun 20, 2013
  4. Jeff KingJun 20, 2013
  5. Thomas RastJun 20, 2013
  6. Thomas RastJun 20, 2013
  7. Jeff KingJun 20, 2013
  8. Thomas RastJun 20, 2013
  9. Thomas RastJun 20, 2013
  10. Junio C HamanoJun 20, 2013
  11. Jeff KingJun 20, 2013
  12. Junio C HamanoJun 20, 2013
  13. Jeff KingJun 20, 2013
  14. Junio C HamanoJun 20, 2013
  15. Jeff KingJun 20, 2013
  16. 0/2 pull into unborn branch safety treeJeff King, Jun 20, 2013
  17. 1/2 pull: update unborn branch tip after indexJeff King, Jun 20, 2013
  18. 2/2 pull: merge into unborn by fast-forwarding from empty treeJeff King, Jun 20, 2013
  19. Junio C HamanoJun 20, 2013
  20. Ramkumar RamachandraJun 20, 2013

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.