On Fri, Apr 13, 2012 at 05:59:01PM -0500, Jonathan Nieder wrote: > When v1.7.5-rc0~19^2~1 (checkout: clear commit marks after detached-orphan > check, 2011-03-20) added a check that the human-readable message > > Your branch is behind 'master' by 1 commit, and can be fast-forwarded. > > is not suppressed by a previous commit walk, it forgot that the > message might be different when git is configured to write output in > another language. Skip the output check in that case. I think it is not "forgot" but "predates" in this case. The commit introducing the problem is 8a5b749 (i18n: format_tracking_info "Your branch is behind" message, 2012-02-02). But obviously your fix is correct either way. > --- > Hi, > > Jeff King wrote: > > > When leaving a detached HEAD, we do a revision walk to make > > sure the commit we are leaving isn't being orphaned. > > However, this leaves crufty marks in the commit objects > > which can confuse later walkers, like the one in > > stat_tracking_info. > > > > Let's clean up after ourselves to prevent this conflict. > > Very nice thing to do. Thanks. A minor complaint, but the format of your email left me confused for several minutes, as I didn't remember writing that or working in this area recently. It turns out that it is because this commit was from over a year ago. -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