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

Re: [PATCH] Update the tracking references only if they were succesfully updated on remote

From
Jeff King <peff@peff.net>
Date
Nov 13, 2007, 07:52 UTC
Message-ID
<20071113075240.GA21799@sigill.intra.peff.net>
In-Reply-To
<20071112213938.GC2918@steel.home>
On Mon, Nov 12, 2007 at 10:39:38PM +0100, Alex Riesen wrote:
Show 9 quoted lines
> It fixes the bug where local tracing branches were filled with zeroed SHA-1
> if the remote branch was not updated because, for instance, it was not
> an ancestor of the local (i.e. had other changes).
> 
> Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
> ---
> 
> Jeff, I think your change (334f4831e5a77) was either not complete or
> got broken some time later.

Yes, some of the error information placed in 'ret' was getting lost. Daniel and I discussed some fixes, but haven't done a final patch yet. Your patch doesn't work because the assumption that is_null_sha1(refs->new_sha1) signals error is not correct. This is also the case for deleted refs, which means that we are failing to update tracking branches for successfully deleted refs.

I'd like to have a patch that accurately tracks per-ref errors, including ones from the remote. That not only will give us more accurate status reporting, but fixes like this will be much easier. Let me see if I can put something together.

-Peff
Previous: Alex RiesenNext: Alex Riesen
Message 3 of 22 in “Add a test checking if send-pack updated local tracking branches correctly”
  1. Add a test checking if send-pack updated local tracking branches correctlyAlex Riesen, Nov 12, 2007
  2. Update the tracking references only if they were succesfully updated on remoteAlex Riesen, Nov 12, 2007
  3. Jeff KingNov 13, 2007
  4. Alex RiesenNov 13, 2007
  5. Add a test for deleting remote branchesAlex Riesen, Nov 13, 2007
  6. Improved and extended t5404Alex Riesen, Nov 13, 2007
  7. Jeff KingNov 13, 2007
  8. Jeff KingNov 15, 2007
  9. Add test that checks diverse aspects of updating remote and tracking branchesAlex Riesen, Nov 15, 2007
  10. Junio C HamanoNov 14, 2007
  11. Alex RiesenNov 14, 2007
  12. Junio C HamanoNov 14, 2007
  13. Johannes SchindelinNov 14, 2007
  14. Alex RiesenNov 14, 2007
  15. Alex RiesenNov 14, 2007
  16. Johannes SchindelinNov 14, 2007
  17. Jeff KingNov 15, 2007
  18. Jeff KingNov 15, 2007
  19. Junio C HamanoNov 15, 2007
  20. Junio C HamanoNov 14, 2007
  21. Add test that checks diverse aspects of updating remote and tracking branchesAlex Riesen, Nov 14, 2007
  22. Junio C HamanoNov 14, 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.