On Wed, Dec 28, 2016 at 10:35 AM, Eduardo Habkost <ehabkost@xxxxxxxxxx> wrote:
> git-am has options to enable --message-id and --3way by default,
> but no option to enable --signoff by default. Add a "am.signoff"
> config option.
>
> Signed-off-by: Eduardo Habkost <ehabkost@xxxxxxxxxx>
> ---
> Changes v1 -> v2:
> * Added documentation to Documentation/git-am.txt and
> Documentation/config.txt
> * Added test cases to t4150-am.sh
Thanks!
Documentation and code looks good to me, for the test a small nit below.
> +test_expect_success '--no-signoff overrides am.signoff' '
> + rm -fr .git/rebase-apply &&
> + git reset --hard first &&
> + test_config am.signoff true &&
> + git am --no-signoff <patch2 &&
> + printf "%s\n" "$signoff" >expected &&
"expected" is never read in this test, so we can omit this line?
> + git cat-file commit HEAD^ | grep "Signed-off-by:" >actual &&
So we check if the previous commit is not tampered with,
> + test $(git cat-file commit HEAD | grep -c "Signed-off-by:") -eq 0
and then we check if the top most commit has zero occurrences
for lines grepped for sign off. That certainly works, but took me a
while to understand (TIL about -c in grep :).
Another way that to write this check, that Git regulars may be more used to is:
git cat-file commit HEAD | grep "Signed-off-by:" >actual
test_must_be_empty actual
I would have suggested to grep for $signoff instead of "Signed-off-by:",
but it turns out being fuzzy here is better and would also catch e.g.
a broken sign off.
> +test_expect_success 'am.signoff adds Signed-off-by: line' '
> + rm -fr .git/rebase-apply &&
> + git reset --hard first &&
> + test_config am.signoff true &&
> + git am <patch2 &&
> + printf "%s\n" "$signoff" >expected &&
> + echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" >>expected &&
> + git cat-file commit HEAD^ | grep "Signed-off-by:" >actual &&
> + test_cmp expected actual &&
> + echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" >expected &&
> + git cat-file commit HEAD | grep "Signed-off-by:" >actual &&
> + test_cmp expected actual
> +'
This test looks good to me,
Thanks,
Stefan