diff options
| author | Pierre Habouzit <madcoder@debian.org> | 2008-11-11 00:54:00 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-11 20:31:26 -0800 |
| commit | 5df9fcf695a0ba85abfeed68efb3b1c5890068d6 (patch) | |
| tree | 68523b66d4dc2f2edd36be3db546bfdbc50b6eff /t/t9001-send-email.sh | |
| parent | caf0c3d692a5a4639e48499711271cb279ecd0dc (diff) | |
| download | git-5df9fcf695a0ba85abfeed68efb3b1c5890068d6.tar.gz git-5df9fcf695a0ba85abfeed68efb3b1c5890068d6.tar.xz | |
git send-email: interpret unknown files as revision lists
Filter out all the arguments git-send-email doesn't like to a
git format-patch command, that dumps its content to a safe directory.
Barf when a file/revision conflict occurs, allow it to be overriden
--[no-]format-patch.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9001-send-email.sh')
| -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 |