diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-07 15:14:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-07 15:14:02 -0800 |
| commit | 053a6b18074e12876d60da952d8a668631b21a64 (patch) | |
| tree | d211cc6a40f5b4c916c34a7d187a7c90e398dd37 /t/t2200-add-update.sh | |
| parent | 009055f3ecd8d9b4eb140429cb5ce5d2088174c7 (diff) | |
| parent | 808d3d717e86be597aa94d4a26f82a0ba5a53c22 (diff) | |
| download | git-053a6b18074e12876d60da952d8a668631b21a64.tar.gz | |
Merge branch 'jn/add-2.0-u-A-sans-pathspec'
"git add -u" and "git add -A" without any pathspec is a tree-wide
operation now, even when they are run in a subdirectory of the
working tree.
Diffstat (limited to 't/t2200-add-update.sh')
| -rwxr-xr-x | t/t2200-add-update.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh index 9bf2bdffd2..e16b15d3e5 100755 --- a/t/t2200-add-update.sh +++ b/t/t2200-add-update.sh @@ -80,18 +80,13 @@ test_expect_success 'change gets noticed' ' ' -# Note that this is scheduled to change in Git 2.0, when -# "git add -u" will become full-tree by default. -test_expect_success 'non-limited update in subdir leaves root alone' ' +test_expect_success 'non-qualified update in subdir updates from the root' ' ( cd dir1 && echo even more >>sub2 && git add -u ) && - cat >expect <<-\EOF && - check - top - EOF + : >expect && git diff-files --name-only >actual && test_cmp expect actual ' |