diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-27 19:24:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-27 19:24:00 -0800 |
| commit | 496db64202b11e66a080873ca9e32f1354dcfd3e (patch) | |
| tree | d15f31e62f019aee02af3a99a7e4c453ee31857a /t | |
| parent | 455d0f5c23a600ff8c94642ca5123f1bd2f1ec0d (diff) | |
| parent | beece9dab8e26c98062351536ce0d871a066790e (diff) | |
| download | git-496db64202b11e66a080873ca9e32f1354dcfd3e.tar.gz git-496db64202b11e66a080873ca9e32f1354dcfd3e.tar.xz | |
Merge branch 'ph/send-email'
* ph/send-email:
git send-email: ask less questions when --compose is used.
git send-email: add --annotate option
git send-email: interpret unknown files as revision lists
git send-email: make the message file name more specific.
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9001-send-email.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 561ae7d0a..617e97d96 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -292,4 +292,12 @@ test_expect_success '--compose adds MIME for utf8 subject' ' grep "^Subject: =?utf-8?q?utf8-s=C3=BCbj=C3=ABct?=" msgtxt1 ' +test_expect_success 'detects ambiguous reference/file conflict' ' + echo master > master && + git add master && + git commit -m"add master" && + test_must_fail git send-email --dry-run master 2>errors && + grep disambiguate errors +' + test_done |