Re: [PATCH v1 0/3] Add --graft option to git replace

From: Junio C Hamano <gitster@pobox.com>
Date: May 23, 2014, 16:59 UTC
Message-ID: <xmqq7g5cl9d2.fsf@gitster.dls.corp.google.com>
In-Reply-To: <20140522211836.27162.80311.chriscool@tuxfamily.org>

Christian Couder <chriscool@tuxfamily.org> writes:

Show 15 quoted lines

> Here is a small patch series to implement:
>
> 	git replace [-f] --graft <commit> [<parent>...]
>
> The changes since the RFC/PATCH are the following:
>
> - in patch 1/3, parse_commit_buffer() is now used to
>   make sure <commit> is not corrupt
> - patch 2/3 add some tests
> - patch 3/3 add some documentation
>
> About the documentation, maybe we should add that --graft
> can now be used instead of grafts in .git/info/grafts,
> and maybe we could add an example that shows how it can
> be done.

Or a procedure that reads .git/info/grafts, converts it to a set of replacements and drops .git/info/grafts. A sample script could be thrown in to contrib/ somewhere as "convert-graft-to-replace.sh".

Show 9 quoted lines

> Christian Couder (3):
>   replace: add --graft option
>   replace: add test for --graft
>   Documentation: replace: add --graft option
>
>  Documentation/git-replace.txt |  8 +++++
>  builtin/replace.c             | 84 ++++++++++++++++++++++++++++++++++++++++++-
>  t/t6050-replace.sh            | 12 +++++++
>  3 files changed, 103 insertions(+), 1 deletion(-)