From: Bagas Sanjaya <bagasdotme@gmail.com>
To: ZheNing Hu via GitGitGadget <gitgitgadget@gmail.com>
Cc: "Bradley M. Kuhn" <bkuhn@sfconservancy.org>,
"Junio C Hamano" <gitster@pobox.com>,
"Brandon Casey" <drafnel@gmail.com>,
"Shourya Shukla" <periperidip@gmail.com>,
"Christian Couder" <christian.couder@gmail.com>,
"Rafael Silva" <rafaeloliveira.cs@gmail.com>,
"Đoàn Trần Công Danh" <congdanhqx@gmail.com>,
"Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"ZheNing Hu" <adlternative@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH v2 2/2] [GSOC] interpret-trailer: easy parse trailer value
Date: Sun, 21 Mar 2021 16:17:37 +0700 [thread overview]
Message-ID: <1722fbad-6ff3-444f-ad3f-59e37b640fc7@gmail.com> (raw)
In-Reply-To: <8b8b236a4ffb81a8c6be3f320b878cea1d0f9d7a.1616317135.git.gitgitgadget@gmail.com>
On 21/03/21 15.58, ZheNing Hu via GitGitGadget wrote:
> +test_expect_success 'commit --trailer parse @nickname' '
> + echo "I love git" >file1 &&
> + git add file1 &&
> + git commit -m "yly" --author="batman <email1>" &&
> + echo "I love git" >file2 &&
> + git add file2 &&
> + git commit -m "yly" --author="jocker <email2>" &&
> + echo "I love git" >file3 &&
> + git add file3 &&
> + git commit -m "yly" \
> + --trailer "Reviewed-by:@bat" \
> + --trailer "Signed-off-by:@jock" \
> + --trailer "Helped-by:@email1" \
> + --trailer "Mentored-by:@email2" &&
> + git cat-file commit HEAD >commit.msg &&
> + sed -e "1,/^\$/d" commit.msg >actual &&
> + cat >expected <<-\EOF &&
> + yly
> +
> + Reviewed-by: batman <email1>
> + Signed-off-by: jocker <email2>
> + Helped-by: batman <email1>
> + Mentored-by: jocker <email2>
> + EOF
> + test_cmp expected actual
> +'
> +
> test_expect_success 'multiple -m' '
>
> >negative &&
> +test_expect_success 'trailer parse @nickname' '
> + echo "I love git" >file1 &&
> + git add file1 &&
> + git commit -m "yly" --author="batman <email1>" &&
> + echo "I love git" >file2 &&
> + git add file2 &&
> + git commit -m "yly" --author="jocker <email2>" &&
> + git interpret-trailers \
> + --trailer "Reviewed-by:@bat" \
> + --trailer "Signed-off-by:@jock" \
> + --trailer "Helped-by:@email1" \
> + --trailer "Mentored-by:@email2" \
> + empty >actual &&
> + cat >expected <<-\EOF &&
> +
> + Reviewed-by: batman <email1>
> + Signed-off-by: jocker <email2>
> + Helped-by: batman <email1>
> + Mentored-by: jocker <email2>
> + EOF
> + test_cmp expected actual
> +'
> +
> test_expect_success 'without config in another order' '
> sed -e "s/ Z\$/ /" >expected <<-\EOF &&
I think please consider this case: When I add --trailer "Reviewed-by:@bat", and there are two
identity pairs that match (`batman <email1>` and `batman <email2>`), I need to choose one that
will be in the trailer (for example because <email1> is primary email). So a disambiguation
prompt should be added, something like:
```
There are <N> identities that match, please choose one that will be added to the trailer:
1) batman <email1>
2) batman <email2>
...
n) batman <emailn>
```
The prompt can be repeated for each trailer values that are non-unique.
Thanks
--
An old man doll... just what I always wanted! - Clara
next prev parent reply other threads:[~2021-03-21 9:18 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-20 14:41 [PATCH 0/2] [GSOC] interpret-trailer: easy parse trailer value ZheNing Hu via GitGitGadget
2021-03-20 14:41 ` [PATCH 1/2] [GSOC] commit: add --trailer option ZheNing Hu via GitGitGadget
2021-03-20 14:41 ` [PATCH 2/2] [GSOC] interpret-trailer: easy parse trailer value ZheNing Hu via GitGitGadget
2021-03-20 21:06 ` Junio C Hamano
2021-03-21 3:29 ` ZheNing Hu
2021-03-21 13:57 ` Junio C Hamano
2021-03-21 14:12 ` ZheNing Hu
2021-03-21 8:58 ` [PATCH v2 0/2] " ZheNing Hu via GitGitGadget
2021-03-21 8:58 ` [PATCH v2 1/2] [GSOC] commit: add --trailer option ZheNing Hu via GitGitGadget
2021-03-21 8:58 ` [PATCH v2 2/2] [GSOC] interpret-trailer: easy parse trailer value ZheNing Hu via GitGitGadget
2021-03-21 9:17 ` Bagas Sanjaya [this message]
2021-03-21 14:04 ` ZheNing Hu
2021-03-21 16:49 ` Junio C Hamano
2021-03-22 6:01 ` Bagas Sanjaya
2021-03-22 18:45 ` Junio C Hamano
2021-03-21 13:15 ` Christian Couder
2021-03-21 13:49 ` ZheNing Hu
2021-03-21 16:52 ` Junio C Hamano
2021-03-22 0:39 ` ZheNing Hu
2021-03-22 7:26 ` Christian Couder
2021-03-22 8:28 ` ZheNing Hu
2021-03-22 17:07 ` Junio C Hamano
2021-03-23 5:04 ` ZheNing Hu
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=1722fbad-6ff3-444f-ad3f-59e37b640fc7@gmail.com \
--to=bagasdotme@gmail.com \
--cc=adlternative@gmail.com \
--cc=avarab@gmail.com \
--cc=bkuhn@sfconservancy.org \
--cc=christian.couder@gmail.com \
--cc=congdanhqx@gmail.com \
--cc=drafnel@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=periperidip@gmail.com \
--cc=rafaeloliveira.cs@gmail.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).