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

[PATCH/WIP] Repair DF conflicts during fetch.

From
TMTom Miller <jackerran@gmail.com>
Date
Nov 29, 2013, 17:57 UTC
Message-ID
<1385747858-29343-1-git-send-email-jackerran@gmail.com>

I encountered a directory/file conflict when running `git fetch --prune origin`. I figured passing --prune would automatically fix DF conflicts. After looking in the code I found that prune is called after fetching. It seemed to be intentional according historical commits. I made this patch to change it, which seems to work as I expected it to. This patch doesn't have any tests and it breaks the output when it does prune branches. I'm looking for guidance to help with fixing the broken output. I tried to figure out a way to do it on my own but I realize that I don't have the expertise with the codebase or C.

Thanks, for any help that I may recieve in advaned this is my first time posting. If I have submitted this wrong I applogize and look forward to any advice that I may recieve in correcting my mistakes.

Tom Miller (1):
  Repair DF conflicts during fetch.
 builtin/fetch.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
-- 
1.8.5.rc3.dirty
Next: Tom Miller
Message 1 of 4 in “Repair DF conflicts during fetch.”
  1. Repair DF conflicts during fetch.Tom Miller, Nov 29, 2013
  2. Repair DF conflicts during fetch.Tom Miller, Nov 29, 2013
  3. Thomas RastNov 29, 2013
  4. Thomas MillerDec 1, 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.