From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Michael Haggerty <mhagger@alum.mit.edu>,
Jakub Narebski <jnareb@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH v6 00/10] Add --graft option to git replace
Date: Mon, 07 Jul 2014 08:35:29 +0200 [thread overview]
Message-ID: <20140707063342.3708.83493.chriscool@tuxfamily.org> (raw)
Here is a small series to implement:
git replace [-f] --graft <commit> [<parent>...]
This patch series goes on top of the patch series that
implements --edit.
The changes since v5, thanks to Junio, are:
- new patch 1/10 to clean up redirection style in t6050
- new patches 8/10, 9/10 and 10/10 to check mergetags
- add functions to test parents in patch 3/10 and 7/10
- improve testing signed commits in patch 7/10
- improve warning when removing commit signature in
patch 6/10
Christian Couder (10):
replace: cleanup redirection style in tests
replace: add --graft option
replace: add test for --graft
Documentation: replace: add --graft option
contrib: add convert-grafts-to-replace-refs.sh
replace: remove signature when using --graft
replace: add test for --graft with signed commit
commit: add for_each_mergetag()
replace: check mergetags when using --graft
replace: add test for --graft with a mergetag
Documentation/git-replace.txt | 10 +++
builtin/replace.c | 126 +++++++++++++++++++++++++++-
commit.c | 47 +++++++++++
commit.h | 7 ++
contrib/convert-grafts-to-replace-refs.sh | 28 +++++++
log-tree.c | 15 +---
t/t6050-replace.sh | 135 ++++++++++++++++++++++++------
7 files changed, 332 insertions(+), 36 deletions(-)
create mode 100755 contrib/convert-grafts-to-replace-refs.sh
--
2.0.0.421.g786a89d.dirty
next reply other threads:[~2014-07-07 6:36 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-07 6:35 Christian Couder [this message]
2014-07-07 6:35 ` [PATCH v6 01/10] replace: cleanup redirection style in tests Christian Couder
2014-07-07 6:35 ` [PATCH v6 02/10] replace: add --graft option Christian Couder
2014-07-09 14:59 ` Junio C Hamano
2014-07-10 9:30 ` Christian Couder
2014-07-10 16:51 ` Junio C Hamano
2014-07-10 17:36 ` Junio C Hamano
2014-07-11 8:59 ` Christian Couder
2014-07-11 14:22 ` Junio C Hamano
2014-07-11 16:24 ` Christian Couder
2014-07-11 18:25 ` Junio C Hamano
2014-07-11 18:29 ` Jeff King
2014-07-07 6:35 ` [PATCH v6 03/10] replace: add test for --graft Christian Couder
2014-07-07 22:16 ` Junio C Hamano
2014-07-08 5:36 ` Christian Couder
2014-07-07 6:35 ` [PATCH v6 04/10] Documentation: replace: add --graft option Christian Couder
2014-07-07 6:35 ` [PATCH v6 05/10] contrib: add convert-grafts-to-replace-refs.sh Christian Couder
2014-07-07 6:35 ` [PATCH v6 06/10] replace: remove signature when using --graft Christian Couder
2014-07-07 6:35 ` [PATCH v6 07/10] replace: add test for --graft with signed commit Christian Couder
2014-07-07 6:35 ` [PATCH v6 08/10] commit: add for_each_mergetag() Christian Couder
2014-07-07 22:30 ` Junio C Hamano
2014-07-08 5:53 ` Christian Couder
2014-07-07 6:35 ` [PATCH v6 09/10] replace: check mergetags when using --graft Christian Couder
2014-07-07 22:28 ` Junio C Hamano
2014-07-08 5:35 ` Christian Couder
2014-07-07 6:35 ` [PATCH v6 10/10] replace: add test for --graft with a mergetag Christian Couder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140707063342.3708.83493.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).