From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Andreas Schwab" <schwab@suse.de>,
"Taylor Blau" <me@ttaylorr.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Christian Couder" <chriscool@tuxfamily.org>
Subject: [PATCH v2 0/4] fix `git replace --graft` tag related issues
Date: Sun, 31 Mar 2019 15:46:55 +0200 [thread overview]
Message-ID: <20190331134659.28808-1-chriscool@tuxfamily.org> (raw)
This is version 2 of a small patch series to fix tag related issues in
`git replace --graft` that Andreas Schwab reported in:
https://public-inbox.org/git/mvmd0mcsjkf.fsf@suse.de/
The first version of this patch series was:
https://public-inbox.org/git/20190328171722.9753-1-chriscool@tuxfamily.org/
Changes compared to the previous version are the following:
- patch 4/4 has been added to fix issues when a tag is passed first
- in patch 2/4 the error message is redirected to a file instead of
/dev/null as suggested by Ævar after a comment by Eric
- title of patch 3/4 has been extended with "as parent" to make it
different from title of patch 4/4
I saw that t6050 has existing 4-space-instead-of-tabs issues, but it
can perhaps be dealt with if some bigger changes are made to this test
script.
Thanks Taylor for the review, and Eric and Ævar for the
comments/suggestions!
Christian Couder (4):
t6050: use test_line_count instead of wc -l
t6050: redirect expected error output to a file
replace: fix --graft when passing a tag as parent
replace: fix --graft when passing a tag first
builtin/replace.c | 20 +++++++++++++-------
t/t6050-replace.sh | 31 ++++++++++++++++++++++++++++---
2 files changed, 41 insertions(+), 10 deletions(-)
--
2.21.0.69.g2d86a08d09
next reply other threads:[~2019-03-31 13:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-31 13:46 Christian Couder [this message]
2019-03-31 13:46 ` [PATCH v2 1/4] t6050: use test_line_count instead of wc -l Christian Couder
2019-03-31 13:46 ` [PATCH v2 2/4] t6050: redirect expected error output to a file Christian Couder
2019-03-31 13:46 ` [PATCH v2 3/4] replace: fix --graft when passing a tag as parent Christian Couder
2019-03-31 13:46 ` [PATCH v2 4/4] replace: fix --graft when passing a tag first Christian Couder
2019-04-01 8:48 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190331134659.28808-1-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=avarab@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=schwab@suse.de \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).