From: "ZheNing Hu via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Denton Liu <liu.denton@gmail.com>,
Junio C Hamano <gitster@pobox.com>, Taylor Blau <me@ttaylorr.com>,
Taylor Blau <ttaylorr@github.com>,
Eric Sunshine <sunshine@sunshineco.com>,
ZheNing Hu <adlternative@gmail.com>,
ZheNing Hu <adlternative@gmail.com>
Subject: [PATCH v3] [GSOC][RFC] format-patch: pass --left-only to range-diff
Date: Tue, 09 Mar 2021 10:28:46 +0000 [thread overview]
Message-ID: <pull.898.v3.git.1615285726482.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.898.v2.git.1615278830804.gitgitgadget@gmail.com>
From: ZheNing Hu <adlternative@gmail.com>
In https://lore.kernel.org/git/YBx5rmVsg1LJhSKN@nand.local/,
Taylor Blau proposing `git format-patch --cover-letter
--range-diff` may mistakenly place upstream commit in the
range-diff output. Teach `format-patch` pass `--left-only`
to range-diff,can avoid this kind of mistake.
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
---
[GSOC][RFC] format-patch: pass --left-only to range-diff
With the help of Taylor Blau, I understood why the upstream commit
appeared in the range-diff, and completed the writing of the test.
this want to fix #876 Thanks.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-898%2Fadlternative%2Fformat-patch-range-diff-right-only-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-898/adlternative/format-patch-range-diff-right-only-v3
Pull-Request: https://github.com/gitgitgadget/git/pull/898
Range-diff vs v2:
1: 8daffd4f7546 ! 1: 5c58eb186d41 [GSOC][RFC] format-patch: pass --left-only to range-diff
@@ builtin/log.c: int cmd_format_patch(int argc, const char **argv, const char *pre
N_("percentage by which creation is weighted")),
OPT_END()
@@ builtin/log.c: int cmd_format_patch(int argc, const char **argv, const char *prefix)
+ _("Interdiff against v%d:"));
+ }
- if (creation_factor < 0)
- creation_factor = RANGE_DIFF_CREATION_FACTOR_DEFAULT;
-- else if (!rdiff_prev)
-- die(_("--creation-factor requires --range-diff"));
--
-+ else if (!rdiff_prev) {
++ if (!rdiff_prev) {
+ if (creation_factor >= 0)
+ die(_("--creation-factor requires --range-diff"));
+ if (left_only)
+ die(_("--left-only requires --range-diff"));
+ }
++
+ if (creation_factor < 0)
+ creation_factor = RANGE_DIFF_CREATION_FACTOR_DEFAULT;
+- else if (!rdiff_prev)
+- die(_("--creation-factor requires --range-diff"));
+
if (rdiff_prev) {
if (!cover_letter && total != 1)
- die(_("--range-diff requires --cover-letter or single patch"));
@@ builtin/log.c: int cmd_format_patch(int argc, const char **argv, const char *prefix)
if (thread)
gen_message_id(&rev, "cover");
make_cover_letter(&rev, !!output_directory,
- origin, nr, list, branch_name, quiet);
+ origin, nr, list, branch_name, quiet,
-+ left_only);
++ left_only);
print_bases(&bases, rev.diffopt.file);
print_signature(rev.diffopt.file);
total++;
@@ t/t3206-range-diff.sh: test_expect_success '--left-only/--right-only' '
+ git rebase $base --onto main &&
+ tip="$(git rev-parse my-feature)" &&
+ git format-patch --range-diff $base $old $tip --cover-letter &&
-+ grep "> 1: .* feature$" 0000-cover-letter.patch &&
++ grep "> 1: .* feature$" 0000-cover-letter.patch &&
+ git format-patch --range-diff $base $old $tip --left-only --cover-letter &&
-+ ! grep "> 1: .* feature$" 0000-cover-letter.patch
++ ! grep "> 1: .* feature$" 0000-cover-letter.patch
+'
-+
+
test_done
Documentation/git-format-patch.txt | 5 ++++-
builtin/log.c | 20 +++++++++++++++-----
t/t3206-range-diff.sh | 27 +++++++++++++++++++++++++++
3 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 3e49bf221087..8c5eca0ba1e3 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -27,7 +27,7 @@ SYNOPSIS
[--[no-]encode-email-headers]
[--no-notes | --notes[=<ref>]]
[--interdiff=<previous>]
- [--range-diff=<previous> [--creation-factor=<percent>]]
+ [--range-diff=<previous> [--creation-factor=<percent>] [--left-only]]
[--filename-max-length=<n>]
[--progress]
[<common diff options>]
@@ -301,6 +301,9 @@ material (this may change in the future).
creation/deletion cost fudge factor. See linkgit:git-range-diff[1])
for details.
+--left-only:
+ Used with `--range-diff`, only emit output related to the first range.
+
--notes[=<ref>]::
--no-notes::
Append the notes (see linkgit:git-notes[1]) for the commit
diff --git a/builtin/log.c b/builtin/log.c
index f67b67d80ed1..21fed9db82d6 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1153,7 +1153,7 @@ static void make_cover_letter(struct rev_info *rev, int use_separate_file,
struct commit *origin,
int nr, struct commit **list,
const char *branch_name,
- int quiet)
+ int quiet, int left_only)
{
const char *committer;
struct shortlog log;
@@ -1228,7 +1228,8 @@ static void make_cover_letter(struct rev_info *rev, int use_separate_file,
.creation_factor = rev->creation_factor,
.dual_color = 1,
.diffopt = &opts,
- .other_arg = &other_arg
+ .other_arg = &other_arg,
+ .left_only = left_only
};
diff_setup(&opts);
@@ -1732,6 +1733,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
struct strbuf rdiff2 = STRBUF_INIT;
struct strbuf rdiff_title = STRBUF_INIT;
int creation_factor = -1;
+ int left_only = 0;
const struct option builtin_format_patch_options[] = {
OPT_CALLBACK_F('n', "numbered", &numbered, NULL,
@@ -1814,6 +1816,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
parse_opt_object_name),
OPT_STRING(0, "range-diff", &rdiff_prev, N_("refspec"),
N_("show changes against <refspec> in cover letter or single patch")),
+ OPT_BOOL(0, "left-only", &left_only,
+ N_("only emit output related to the first range")),
OPT_INTEGER(0, "creation-factor", &creation_factor,
N_("percentage by which creation is weighted")),
OPT_END()
@@ -2083,10 +2087,15 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
_("Interdiff against v%d:"));
}
+ if (!rdiff_prev) {
+ if (creation_factor >= 0)
+ die(_("--creation-factor requires --range-diff"));
+ if (left_only)
+ die(_("--left-only requires --range-diff"));
+ }
+
if (creation_factor < 0)
creation_factor = RANGE_DIFF_CREATION_FACTOR_DEFAULT;
- else if (!rdiff_prev)
- die(_("--creation-factor requires --range-diff"));
if (rdiff_prev) {
if (!cover_letter && total != 1)
@@ -2134,7 +2143,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
if (thread)
gen_message_id(&rev, "cover");
make_cover_letter(&rev, !!output_directory,
- origin, nr, list, branch_name, quiet);
+ origin, nr, list, branch_name, quiet,
+ left_only);
print_bases(&bases, rev.diffopt.file);
print_signature(rev.diffopt.file);
total++;
diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh
index 1b26c4c2ef91..6178a12dd4b1 100755
--- a/t/t3206-range-diff.sh
+++ b/t/t3206-range-diff.sh
@@ -748,4 +748,31 @@ test_expect_success '--left-only/--right-only' '
test_cmp expect actual
'
+test_expect_success 'format-patch --range-diff --left-only' '
+ rm -fr repo &&
+ git init repo &&
+ cd repo &&
+ git branch -M main &&
+ echo "base" >base &&
+ git add base &&
+ git commit -m "base" &&
+ git checkout -b my-feature &&
+ echo "feature" >feature &&
+ git add feature &&
+ git commit -m "feature" &&
+ base="$(git rev-parse main)" &&
+ old="$(git rev-parse my-feature)" &&
+ git checkout main &&
+ echo "other" >>base &&
+ git add base &&
+ git commit -m "new" &&
+ git checkout my-feature &&
+ git rebase $base --onto main &&
+ tip="$(git rev-parse my-feature)" &&
+ git format-patch --range-diff $base $old $tip --cover-letter &&
+ grep "> 1: .* feature$" 0000-cover-letter.patch &&
+ git format-patch --range-diff $base $old $tip --left-only --cover-letter &&
+ ! grep "> 1: .* feature$" 0000-cover-letter.patch
+'
+
test_done
base-commit: be7935ed8bff19f481b033d0d242c5d5f239ed50
--
gitgitgadget
next prev parent reply other threads:[~2021-03-09 10:29 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-07 6:57 [PATCH] [GSOC][RFC] format-patch: pass --right-only to range-diff ZheNing Hu via GitGitGadget
2021-03-08 20:18 ` Taylor Blau
2021-03-09 7:28 ` ZheNing Hu
2021-03-12 21:55 ` Junio C Hamano
2021-03-12 22:09 ` Junio C Hamano
2021-03-09 8:33 ` [PATCH v2] [GSOC][RFC] format-patch: pass --left-only " ZheNing Hu via GitGitGadget
2021-03-09 9:00 ` Eric Sunshine
2021-03-09 9:35 ` ZheNing Hu
2021-03-09 10:28 ` ZheNing Hu via GitGitGadget [this message]
2021-03-12 22:50 ` [PATCH v3] " Junio C Hamano
2021-03-13 4:01 ` ZheNing Hu
2021-03-13 23:23 ` Junio C Hamano
2021-03-14 2:16 ` ZheNing Hu
2021-03-14 2:37 ` ZheNing Hu
2021-03-14 2:41 ` ZheNing Hu
2021-03-14 8:10 ` [PATCH v4] [GSOC] " ZheNing Hu via GitGitGadget
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=pull.898.v3.git.1615285726482.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=adlternative@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=liu.denton@gmail.com \
--cc=me@ttaylorr.com \
--cc=sunshine@sunshineco.com \
--cc=ttaylorr@github.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).