Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
tag: implicitly supply --list given another list-like option
[gitweb.git]
/
t
/
t6302-for-each-ref-filter.sh
diff --git
a/t/t6302-for-each-ref-filter.sh
b/t/t6302-for-each-ref-filter.sh
index a09a1a46eff5357c3939f5715f4a623effcb6428..d36d5dc12407a8f00896898ee93a9ff0249442d1 100755
(executable)
--- a/
t/t6302-for-each-ref-filter.sh
+++ b/
t/t6302-for-each-ref-filter.sh
@@
-421,4
+421,8
@@
test_expect_success 'check %(if:notequals=<string>)' '
test_cmp expect actual
'
+test_expect_success '--merged is incompatible with --no-merged' '
+ test_must_fail git for-each-ref --merged HEAD --no-merged HEAD
+'
+
test_done