On a case insenstive file system x is the same as X. When a file named "X" exist, e.g. ">x && git add x" does not work as expected, use file name "Y" instead. Signed-off-by: Torsten Bögershausen <tboegi@xxxxxx> --- t/t3400-rebase.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index 5ed4012..2eebd22 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -259,11 +259,11 @@ test_expect_success 'rebase duplicated commit with --keep-empty' ' git reset --hard && git checkout master && - >x && git add x && git commit x -mx && - echo x >x && git commit x -mx1 && + >Y && git add Y && git commit Y -mY && + echo Y >Y && git commit Y -mY1 && git checkout -b duplicated HEAD~ && - echo x >x && git commit x -mx2 && + echo Y >Y && git commit Y -mY2 && git rebase --keep-empty master ' -- 2.6.2.403.g6abe3ff.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html