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
