Merge branch 'pw/rebase-i-regression-fix'

diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index f9528fa00c4ad382a99460fbf5b2c9b7a96ec34b..2ecb43a61652032862d5a264ede8af473ef345e1 100755 (executable)
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -436,6 +436,28 @@ test_expect_success 'add -p handles globs' '
        test_cmp expect actual
 '
 
+test_expect_success 'add -p handles relative paths' '
+       git reset --hard &&
+
+       echo base >relpath.c &&
+       git add "*.c" &&
+       git commit -m relpath &&
+
+       echo change >relpath.c &&
+       mkdir -p subdir &&
+       git -C subdir add -p .. 2>error <<-\EOF &&
+       y
+       EOF
+
+       test_must_be_empty error &&
+
+       cat >expect <<-\EOF &&
+       relpath.c
+       EOF
+       git diff --cached --name-only >actual &&
+       test_cmp expect actual
+'
+
 test_expect_success 'add -p does not expand argument lists' '
        git reset --hard &&