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

Re: use of temporary refs in resolve

From
Junio C Hamano <junkio@cox.net>
Date
Aug 9, 2005, 02:48 UTC
Message-ID
<7v1x53zuyv.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<tnxr7d4vi5v.fsf@arm.com>
Catalin Marinas <catalin.marinas@gmail.com> writes:
> OK, I wasn't that clear. Currently git-fetch-script stores the fetched
> head in the FETCH_HEAD file and git-pull-script uses this file to do
> the merging (by passing its content to git-resolve-script).
Correct.  I was not planning to change that arrangement.
> Anyway, I
> can easily change StGIT to only use git-pull-script directly, without
> the intermediate fetch.

If you are happy then I should not complain ;-), and I am certainly not complaining, but I still have this feeling that I do not get what you are getting at. You can change it to directly use pull without intermediate fetch, in order to cope with what? Could you explain how you currently do things, and what changes I will be making would break the way you currently do things please? I need to know which detail of the current implementation behaviour people rely on to avoid breaking things.

Previous: Catalin MarinasNext: Catalin Marinas
Message 8 of 10 in “use of temporary refs in resolve”
  1. Junio C HamanoAug 7, 2005
  2. Linus TorvaldsAug 7, 2005
  3. Junio C HamanoAug 7, 2005
  4. Linus TorvaldsAug 7, 2005
  5. Catalin MarinasAug 8, 2005
  6. Junio C HamanoAug 8, 2005
  7. Catalin MarinasAug 8, 2005
  8. Junio C HamanoAug 9, 2005
  9. Catalin MarinasAug 9, 2005
  10. Junio C HamanoAug 9, 2005

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.