[PATCH/BUG] Test for git-add -u from the subdirectory

From: Salikh Zakirov <hidden>
Date: 2016-06-15 22:43:29
Subsystem: the rest · Maintainer: Linus Torvalds

---

The following modification to the t2200-add-update.sh
shows that the git-add -u from the subdirectory does not work
with path limiters.

The test modification alone fails on master. I've tried
the revision 93c44d49 'git-add: allow path limiting with -u',
which introduced 'git-add -u', and it fails the test as well.

So technically, this feature never worked.
I use it as

    [alias]
	ci = add -u
	# used to be
	#ci = update-index
	# and worked

and the simplest workaround is to use git-add instead of git-ci.

 t/t2200-add-update.sh |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index 0a703af..93c007d 100755
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -35,4 +35,12 @@ test_expect_success 'update did not touch other tracked files' \
 test_expect_success 'update did not touch untracked files' \
   'test "`git diff-files --name-status dir/other`" = ""'
 
+test_expect_success 'more changes' 'echo modified >> dir/sub'
+
+test_expect_success 'update from subdirectory' \
+  '(cd dir; git add -u sub)'
+
+test_expect_success 'update touched correct path' \
+  'test "`git diff-files --name-status dir/sub`" = ""'
+
 test_done
-- 
1.5.2.rc3.5.g93c44
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help