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

Re: [PATCH] resolve_gitlink_packed_ref(): fix mismerge

From
Mark Levedahl <mlevedahl@gmail.com>
Date
Oct 17, 2011, 22:12 UTC
Message-ID
<4E9CA853.10107@gmail.com>
In-Reply-To
<7vbotfmpbh.fsf_-_@alter.siamese.dyndns.org>
On 10/17/2011 02:43 PM, Junio C Hamano wrote:
Show 13 quoted lines
> 2c5c66b (Merge branch 'jp/get-ref-dir-unsorted', 2011-10-10) merged a
> topic that forked from the mainline before a new helper function
> get_packed_refs() refactored code to read packed-refs file. The merge made
> the call to the helper function with an incorrect argument. The parameter
> to the function has to be a path to the submodule.
>
> Fix the mismerge.
>
> Helped-by: Mark Levedahl<mlevedahl@gmail.com>
> Helped-by: Michael Haggerty<mhagger@alum.mit.edu>
> Signed-off-by: Junio C Hamano<gitster@pobox.com>
> ---
>
Thank you, this fixes the problem for me.
Mark
Previous: Junio C HamanoNext: Junio C Hamano
Message 10 of 11 in “regression in git-gui since 2c5c66b... Merge branch 'jp/get-ref-dir-unsorted”
  1. Mark LevedahlOct 16, 2011
  2. Junio C HamanoOct 17, 2011
  3. Mark LevedahlOct 17, 2011
  4. Michael HaggertyOct 17, 2011
  5. Mark LevedahlOct 17, 2011
  6. Michael HaggertyOct 17, 2011
  7. Jeff KingOct 17, 2011
  8. Junio C HamanoOct 17, 2011
  9. resolve_gitlink_packed_ref(): fix mismergeJunio C Hamano, Oct 17, 2011
  10. Mark LevedahlOct 17, 2011
  11. Junio C HamanoOct 17, 2011

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.