projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.8.0
[platform/upstream/git.git]
/
t
/
t4150-am.sh
diff --git
a/t/t4150-am.sh
b/t/t4150-am.sh
index
ccc0280
..
cdafd7e
100755
(executable)
--- a/
t/t4150-am.sh
+++ b/
t/t4150-am.sh
@@
-525,9
+525,9
@@
test_expect_success 'am empty-file does not infloop' '
git reset --hard &&
touch empty-file &&
test_tick &&
git reset --hard &&
touch empty-file &&
test_tick &&
-
{ git am empty-file > actual 2>&1 && false || :; }
&&
+
test_must_fail git am empty-file 2>actual
&&
echo Patch format detection failed. >expected &&
echo Patch format detection failed. >expected &&
- test_cmp expected actual
+ test_
i18n
cmp expected actual
'
test_done
'
test_done