Re: [PATCH 0/3] git-gui: Add ability to revert selected hunks and lines

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 20, 2019, 18:47 UTC
Message-ID: <xmqq5zmrvfl1.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20190819214110.26461-1-me@yadavpratyush.com>

Pratyush Yadav <me@yadavpratyush.com> writes:

Show 5 quoted lines

> This series adds the ability to revert selected lines and hunks in
> git-gui. Partially based on the patch by Bert Wesarg [0].
>
> The commits can be found in the topic branch 'py/git-gui-revert-lines'
> at https://github.com/prati0100/git/tree/py/git-gui-revert-lines

Please don't do this.

I would strongly prefer keeping the contination of history from the history in Pat's git-gui repository. If you clone from

    git://repo.or.cz/git-gui.git/

you'll notice everything for git-gui is one level up, and nothing for git-core is duplicated in there. You'll work on top of that, so the patches to the git-gui project should not say things like

    ---
     git-gui/lib/index.tcl | 27 +++++++++++++++++----------
     1 file changed, 17 insertions(+), 10 deletions(-)

    diff --git a/git-gui/lib/index.tcl b/git-gui/lib/index.tcl
    index b588db11d9..cb7f74af45 100644
    ...

The leading "git-gui/" should not appear.

I have a fork of Pat's history with a single topic on top at https://github.com/gitster/git-gui/ so building on top would maintain the continuity of the history as well.

Once you prepared your changes in such a clone of the git-gui project, in order to test them with the rest of Git, you'd make a trial merge with the -Xsubtree=git-gui option. Perhaps you have git-gui's clone in $HOME/git-gui and git's clone in $HOME/git, like so

	$ cd $HOME
	$ git clone https://github.com/gitster/git-gui git-gui
	$ cd git-gui
	... from now on, you'd work on git-gui in this directory  ...
	... do the work of this topic perhaps on 'revert-hunks' branch ...

	$ git clone https://github.com/gitster/git git
	$ cd ../git
	... trial integration ...
	$ git pull -Xsubtree=git-gui ../git-gui/ revert-hunks
	... do whatever testing necessary ...

As an interim (and hopefully evantual) maintainer of the git-gui project, you'd publish from your local git-gui directory to a fork of git-gui project you host somewhere. Your patches for review would also be taken from your local git-gui directory.

Thanks.