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

Re: [PATCH v2] Fix fetch/pull when run without --update-head-ok

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Oct 14, 2008, 16:15 UTC
Message-ID
<alpine.DEB.1.00.0810141808020.22125@pacific.mpi-cbg.de.mpi-cbg.de>
In-Reply-To
<20081014150227.GC4856@spearce.org>
Hi,
On Tue, 14 Oct 2008, Shawn O. Pearce wrote:
Show 16 quoted lines
> Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > On Mon, 13 Oct 2008, Daniel Barkalow wrote:
> > 
> > > On Mon, 13 Oct 2008, Johannes Schindelin wrote:
> > > 
> > > > I actually understand now why the tests started failing: the change from 
> > > > resolve_ref() to get_branch() as requested by Daniel are at fault: 
> > > > get_branch() does not check if the branch has an initial commit.
> > 
> > So, my vote is to revert back to resolve_ref(), even if it needs more 
> > lines.
> 
> Yes, I agree, resolve_ref() is the best thing to be using here,
> even if it is more code.  get_branch() validates the commit and we
> don't want that.  We really just want to know if the current branch
> is going to be updated, we don't care to what/why.

Actually, get_branch() does _not_ validate. Which is why it thinks that the current branch is "master" even if there is no commit yet.

OTOH, resolve_ref() reads the SHA-1 of the ref, which fails in the case that there has not been any commit yet.

Still, I think that it would be nice to allow "git pull origin master:master" in a freshly initied non-bare repository, so I like resolve_ref() better.

Ciao, Dscho

Previous: Daniel BarkalowNext: Daniel Barkalow
Message 17 of 24 in “fetch: refuse to fetch into the current branch in a non-bare repository”
  1. fetch: refuse to fetch into the current branch in a non-bare repositoryJohannes Schindelin, Oct 11, 2008
  2. Junio C HamanoOct 11, 2008
  3. Shawn O. PearceOct 12, 2008
  4. Johannes SchindelinOct 13, 2008
  5. Shawn O. PearceOct 12, 2008
  6. Daniel BarkalowOct 12, 2008
  7. Fix fetch/pull when run without --update-head-okJohannes Schindelin, Oct 13, 2008
  8. Shawn O. PearceOct 13, 2008
  9. Johannes SchindelinOct 13, 2008
  10. Junio C HamanoOct 13, 2008
  11. Junio C HamanoOct 13, 2008
  12. Johannes SchindelinOct 13, 2008
  13. Daniel BarkalowOct 13, 2008
  14. Johannes SchindelinOct 14, 2008
  15. Shawn O. PearceOct 14, 2008
  16. Daniel BarkalowOct 14, 2008
  17. Johannes SchindelinOct 14, 2008
  18. Daniel BarkalowOct 14, 2008
  19. Johannes SchindelinOct 14, 2008
  20. Daniel BarkalowOct 14, 2008
  21. Daniel BarkalowOct 14, 2008
  22. Junio C HamanoOct 14, 2008
  23. pull: allow "git pull origin $something:$current_branch" into an unborn branchJunio C Hamano, Oct 14, 2008
  24. Daniel BarkalowOct 13, 2008

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.