On Mon, Nov 12, 2007 at 10:39:38PM +0100, Alex Riesen wrote: > 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@xxxxxxxxx> > --- > > 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
