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

Re: Reverting the whole index-base series

From
Junio C Hamano <junkio@cox.net>
Date
Apr 16, 2007, 00:11 UTC
Message-ID
<7v8xct18m0.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<Pine.LNX.4.64.0704151652420.5473@woody.linux-foundation.org>
Linus Torvalds <torvalds@linux-foundation.org> writes:
Show 12 quoted lines
> ... That said, maybe we could make it an option. There's really a few 
> different things we could do:
>
>  (a) what we do now - the working tree and index is totally unaffected
>  (b) do a "git-read-tree -m old new" and if that fails, fail the push.
>      This would at least ensure the *index* matches
>  (b') same as (b), but with "-u" to actually check it out
>  (c) do a "git-read-tree --reset new"
>  (c') same as (c), but with "-u"
>
> and we could just keep the *default* the same, but allow the receiving 
> side to say what it wants to happen.
Yeah, throw another one in:
 (d) what we do now, but detach HEAD.
Show 11 quoted lines
> So if somebody does
>
> 	git push remote:my-git-tree/.git/
>
> then we'd *always* do (a), since we pushed into the "bare" part, but if 
> somebody did
>
> 	git push remote:my-git-tree
>
> and the receiver ended up doing a "cd .git", it would remember what the 
> checked-out tree was and update that one (and no other).

I suspect that this would make the pending "GIT_WORK_TREE" series more interesting.

Previous: Linus TorvaldsNext: Linus Torvalds
Message 14 of 15 in “Some index-base bug in "next" branch ("git-applymbox"-related?)..”
  1. Linus TorvaldsApr 12, 2007
  2. Junio C HamanoApr 12, 2007
  3. Junio C HamanoApr 13, 2007
  4. Linus TorvaldsApr 13, 2007
  5. Junio C HamanoApr 13, 2007
  6. Linus TorvaldsApr 13, 2007
  7. Junio C HamanoApr 13, 2007
  8. Reverting the whole index-base seriesJunio C Hamano, Apr 15, 2007
  9. Linus TorvaldsApr 15, 2007
  10. Junio C HamanoApr 15, 2007
  11. Linus TorvaldsApr 15, 2007
  12. Junio C HamanoApr 15, 2007
  13. Linus TorvaldsApr 15, 2007
  14. Junio C HamanoApr 16, 2007
  15. Linus TorvaldsApr 16, 2007

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.