From: Junio C Hamano Date: Thu, 07 Nov 2019 05:11:38 GMT Subject: Re: [PATCH v2 03/11] Prefer 'up-to-date' spelling Message-ID: In-Reply-To: <466aead9af6516ff94a5d217e58ab894e63088b7.1572973651.git.gitgitgadget@gmail.com> "Elijah Newren via GitGitGadget" writes: > gitk-git/gitk | 2 +- > ... > diff --git a/gitk-git/gitk b/gitk-git/gitk > index abe4805ade..50a5b60c13 100755 > --- a/gitk-git/gitk > +++ b/gitk-git/gitk > @@ -9696,7 +9696,7 @@ proc cherrypick {} { > if {[catch {exec sh -c "git cherry-pick -r $rowmenuid 2>&1"} err]} { > notbusy cherrypick > if {[regexp -line \ > - {Entry '(.*)' (would be overwritten by merge|not uptodate)} \ > + {Entry '(.*)' (would be overwritten by merge|not up-to-date)} \ > $err msg fname]} { > error_popup [mc "Cherry-pick failed because of local changes\ > to file '%s'.\nPlease commit, reset or stash\ Not very satisfactory for two reasons. Procedurally, I'd strongly prefer to see any patch that touches "gitk" (and similarly "git-gui" and "po") to be separated from the rest, and not directly sent to me. Further, "gitk" is merged one-way into my tree with -Xsubtree=gitk (similarly for "git-gui"), so a patch to it would be to change "a/gitk" to "b/gitk". Content-wise, because "gitk" (and similarly "git-gui") is a project that stands on its own, we (at least this is a wish by its primary author and maintainer the last time I checked with him) want to make sure that slightly older/newer gitk is interoperable with slightly newer/older git. Preparing to also see "uptodate" emitted by the version of git it runs would be a good way to achieve this. We do not promise interoperability between vastly different versions forever, by the way. I see "cherry-pick -r" used in the precontext, but "--replay" has been the default for the command for the past dozen years, and now it is just an unadvertised noop. It probably is OK now to remove "-r" from the invocation here ;-) Thanks.