diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-09-14 08:52:03 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-14 10:04:29 -0700 |
| commit | 5ed75e2a3fb30f93fea7772e481ec6091e9a2c5f (patch) | |
| tree | ea0dc3f146a6a31dcb166dc3310376a1c8ddecc9 /t/t3507-cherry-pick-conflict.sh | |
| parent | ce5cf6ffc6feb9fb4f9a50cdfa2f527fa119c94f (diff) | |
| download | git-5ed75e2a3fb30f93fea7772e481ec6091e9a2c5f.tar.gz git-5ed75e2a3fb30f93fea7772e481ec6091e9a2c5f.tar.xz | |
cherry-pick: don't forget -s on failure
In case 'git cherry-pick -s <commit>' failed, the user had to use 'git
commit -s' (i.e. state the -s option again), which is easy to forget
about. Instead, write the signed-off-by line early, so plain 'git
commit' will have the same result.
Also update 'git commit -s', so that in case there is already a relevant
Signed-off-by line before the Conflicts: line, it won't add one more at
the end of the message. If there is no such line, then add it before the
the Conflicts: line.
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
| -rwxr-xr-x | t/t3507-cherry-pick-conflict.sh | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index 0c81b3c42..c82f7210c 100755 --- a/t/t3507-cherry-pick-conflict.sh +++ b/t/t3507-cherry-pick-conflict.sh @@ -30,6 +30,7 @@ test_expect_success setup ' test_commit initial foo a && test_commit base foo b && test_commit picked foo c && + test_commit --signoff picked-signed foo d && git config advice.detachedhead false ' @@ -340,4 +341,35 @@ test_expect_success 'revert conflict, diff3 -m style' ' test_cmp expected actual ' +test_expect_success 'failed cherry-pick does not forget -s' ' + pristine_detach initial && + test_must_fail git cherry-pick -s picked && + test_i18ngrep -e "Signed-off-by" .git/MERGE_MSG +' + +test_expect_success 'commit after failed cherry-pick does not add duplicated -s' ' + pristine_detach initial && + test_must_fail git cherry-pick -s picked-signed && + git commit -a -s && + test $(git show -s |grep -c "Signed-off-by") = 1 +' + +test_expect_success 'commit after failed cherry-pick adds -s at the right place' ' + pristine_detach initial && + test_must_fail git cherry-pick picked && + git commit -a -s && + pwd && + cat <<EOF > expected && +picked + +Signed-off-by: C O Mitter <committer@example.com> + +Conflicts: + foo +EOF + + git show -s --pretty=format:%B > actual && + test_cmp expected actual +' + test_done |