On 6/10/2021 5:24 AM, Johannes Schindelin wrote:> Now, what I failed to realize when reviewing this code (and I _bet_ Stolee > was in the same boat when they contributed the patch) is that this version > of `format_tracking_info()` is different from what is in v2.32.0. It is > the version we have in the `microsoft/git` fork, and it has not yet made > it upstream. To be precise, it is this commit: > https://github.com/microsoft/git/commit/91209e591b0398c8334a78001a245807f7eb348a I _did_ miss that this wasn't necessary in v2.32.0 and only exists in microsoft/git. My cherry-pick applied cleanly, but I should have been more careful. > In light of this, it might make more sense for us to fixup! this commit > thusly: I've approved your PR in microsoft/git. That settles the real problem and this patch can be dropped. Sorry for the noise! -Stolee
