Michael J Gruber <g...@drmicha.warpmail.net> writes: > Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> > --- > For the record, the tests would need to change like this, and it makes > a lot of sense. After the change, "i-t-a" is not a "change staged in > the index" any more - and in fact in never was, as "git commit" shows.
Perhaps another follow-up patch can illustrate how these entries should show "git status", both in the longform and -s output? > > t/t2203-add-intent.sh | 7 ++++--- > t/t4011-diff-symlink.sh | 10 ++++++---- > 2 files changed, 10 insertions(+), 7 deletions(-) > > diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh > index 2a4a749..1a9b3c4 100755 > --- a/t/t2203-add-intent.sh > +++ b/t/t2203-add-intent.sh > @@ -43,7 +43,8 @@ test_expect_success 'i-t-a entry is simply ignored' ' > git add -N nitfol && > git commit -m second && > test $(git ls-tree HEAD -- nitfol | wc -l) = 0 && > - test $(git diff --name-only HEAD -- nitfol | wc -l) = 1 > + test $(git diff --name-only HEAD -- nitfol | wc -l) = 0 && > + test $(git diff --name-only -- nitfol | wc -l) = 1 > ' > > test_expect_success 'can commit with an unrelated i-t-a entry in index' ' > @@ -71,13 +72,13 @@ test_expect_success 'cache-tree invalidates i-t-a paths' ' > > : >dir/bar && > git add -N dir/bar && > - git diff --cached --name-only >actual && > + git diff --name-only >actual && > echo dir/bar >expect && > test_cmp expect actual && > > git write-tree >/dev/null && > > - git diff --cached --name-only >actual && > + git diff --name-only >actual && > echo dir/bar >expect && > test_cmp expect actual > ' > diff --git a/t/t4011-diff-symlink.sh b/t/t4011-diff-symlink.sh > index 13e7f62..7452fce 100755 > --- a/t/t4011-diff-symlink.sh > +++ b/t/t4011-diff-symlink.sh > @@ -139,11 +139,13 @@ test_expect_success SYMLINKS 'setup symlinks with > attributes' ' > test_expect_success SYMLINKS 'symlinks do not respect userdiff config by > path' ' > cat >expect <<-\EOF && > diff --git a/file.bin b/file.bin > - index e69de29..d95f3ad 100644 > - Binary files a/file.bin and b/file.bin differ > + new file mode 100644 > + index 0000000..d95f3ad > + Binary files /dev/null and b/file.bin differ > diff --git a/link.bin b/link.bin > - index e69de29..dce41ec 120000 > - --- a/link.bin > + new file mode 120000 > + index 0000000..dce41ec > + --- /dev/null > +++ b/link.bin > @@ -0,0 +1 @@ > +file.bin -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
