On Tue, Jul 10, 2018 at 1:39 PM, SZEDER Gábor <szeder....@gmail.com> wrote:
>> diff --git a/t/t6044-merge-unrelated-index-changes.sh
>> b/t/t6044-merge-unrelated-index-changes.sh
>> index f9c2f8179..92ec55255 100755
>> --- a/t/t6044-merge-unrelated-index-changes.sh
>> +++ b/t/t6044-merge-unrelated-index-changes.sh
>> @@ -126,6 +126,17 @@ test_expect_failure 'recursive, when merge branch
>> matches merge base' '
>> test_path_is_missing .git/MERGE_HEAD
>> '
>>
>> +test_expect_failure 'merge-recursive, when index==head but head!=HEAD' '
>> + git reset --hard &&
>> + git checkout C^0 &&
>> +
>> + # Make index match B
>> + git diff C B | git apply --cached &&
>
> Branch 'C' contains the file 'c', which creates ambiguity on
> case-insensitive file systems and makes the test fail:
>
> ++git reset --hard
> HEAD is now at ed5d5a6 B
> ++git checkout 'C^0'
> Previous HEAD position was ed5d5a6 B
> HEAD is now at 4fa59ce C
> ++git diff C B
> ++git apply --cached
> fatal: ambiguous argument 'C': both revision and filename
> Use '--' to separate paths from revisions, like this:
> 'git <command> [<revision>...] -- [<file>...]'
> error: unrecognized input
> error: last command exited with $?=128
> not ok 8 - merge-recursive, when index==head but head!=HEAD
>
Good catch; thanks for pointing it out. Here's a fix:
-- 8< --
Subject: [PATCH] fixup! t6044: add a testcase for index matching head, when
head doesn't match HEAD
Signed-off-by: Elijah Newren <new...@gmail.com>
---
t/t6044-merge-unrelated-index-changes.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t6044-merge-unrelated-index-changes.sh
b/t/t6044-merge-unrelated-index-changes.sh
index 6e0ecab9c..5e3779ebc 100755
--- a/t/t6044-merge-unrelated-index-changes.sh
+++ b/t/t6044-merge-unrelated-index-changes.sh
@@ -131,7 +131,7 @@ test_expect_success 'merge-recursive, when index==head but
head!=HEAD' '
git checkout C^0 &&
# Make index match B
- git diff C B | git apply --cached &&
+ git diff C B -- | git apply --cached &&
# Merge B & F, with B as "head"
git merge-recursive A -- B F > out &&
test_i18ngrep "Already up to date" out
--
2.18.0.132.g6e63b23f4
