Following is a series to track push errors for individual refs. This
should have three immediate advantages (the first two of which I
implement in the series):
- updating tracking refs only for non-error refs
- incorporating remote rejection into the printed status
- printing errors in a different order than we processed
(e.g., consolidating non-ff errors near the end with
a special message)
The patches are:
1. send-pack: track errors for each ref
This is the groundwork for the other 2. I also think it makes the
code a bit more readable by splitting out the print formatting from
the push logic, and by explicitly naming the different states that
we were previously deducing from the states of other variables.
2. send-pack: check ref->status before updating tracking refs
This should fix the bugs that people are seeing from 334f483
3. send-pack: assign remote errors to each ref
This may have some problems, as I will explain below.
I have a few concerns which make this an RFC and not a real patch
submission:
- I have done pretty minimal testing, and there are no automated tests
(at least 2, which fixes a real bug, should get a test).
Unfortunately, I am out of time to work on this and am leaving the
country for a week. Between that and Thanksgiving travel, I'm not
sure when I'll have time to finish up, so I thought it best to have
comments waiting (and others should feel free to pick up the work if
they want -- Alex, I think your error consolidation should go nicely
on top of this).
- It looks like the push mirror code just made it into next, which
is going to require a conflict-heavy rebase on my part.
- There is a potential performance bottleneck in patch 3. See the
commit message.
- In patch 3, the 'ng' message sent by the remote are not
unambiguously parseable. See the commit message.
-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
