On Fri, Sep 20, 2019 at 12:02:58AM +0530, Pratyush Yadav wrote: > Hi Junio, > > On 18/09/19 10:49AM, Junio C Hamano wrote: > > Pratyush Yadav <me@xxxxxxxxxxxxxxxxx> writes: > > You should be able to merge this (and all other git-gui topics > > already in my tree Denton pointed out) to your 'master'. If you > > then make a trial merge of the result back into my tree with "git > > merge -Xsubtree=git-gui", it should result in "already up to date", > > i.e. a noop merge. > > I pulled all the changes into git-gui. I had to manually backport two > commits: > > * 7560f547e6 (treewide: correct several "up-to-date" to "up to date", * 2017-08-23) > * 00ddc9d13c (Fix build with core.autocrlf=true, 2017-05-09) > > because they touched other parts of git, that were not in git-gui. > For the record, you could do a git cherry-pick -Xsubtree=git-gui 00ddc9d13c 7560f547e6 to bring them over instead of manually recreating the changes yourself. Personally, I'd prefer the cherry-picked commits as it'd preserve authorship information but I'm not sure how Junio feels. >From a correctness perspective, however, I compared my results after doing that with yours and it's identical. > I then did a trial merge into your 'master', and running a diff, > git.git's version of git-gui is identical to mine. So everything seems > to be correct. > > Instead of doing this on my master, I did it on a separate branch just > to be sure I don't mess something up. You can find it on > https://github.com/prati0100/git-gui.git on the branch 'trial_merge'. > > These are the new commits introduced: > > 7435f916d3 git-gui: fix build with core.autocrlf=true > 834e3ec31e git-gui: correct "up-to-date" to "up to date" > fecfccf9ff Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into trial_merge > f7a8834ba4 Merge branch 'bp/amend-toggle-bind' > ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit" > 6c8ec8c30a Merge branch 'bw/commit-scrollbuffer' > acfa495519 Merge branch 'bw/amend-checkbutton' > da08d559b7 git-gui: add horizontal scrollbar to commit buffer > ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton > c77abf0460 Merge branch 'py/revert-hunks-lines' > 5a2bb62180 Merge branch 'bp/widget-focus-hotkeys' > e07446ed5f git-gui: add hotkeys to set widget focus > a4fa2f0a4c git-gui: allow undoing last revert > 2ccdfb1c78 git-gui: return early when patch fails to apply > 62bd99934b git-gui: allow reverting selected hunk > 5f0a516de9 git-gui: allow reverting selected lines > > The top 3 commits are of note. The top 2 are the manual backports. The > third is the octopus merge of all the topics not in git-gui yet. The > rest are just other topics that were introduced in my fork recently. > > If it looks all good, I'll put all this on my 'master' and re-send the > pull request. I took a look as well and the end result looks good to me too. > > -- > Regards, > Pratyush Yadav
