t4063: add tests of direct blob diffs
The git-diff command can directly compare two blobs (or a
blob and a file), but we don't test this at all. Let's add
some basic tests that reveal a few problems.
There are basically four interesting inputs:
1. sha1 against sha1 (where diff has no information beyond
the contents)
2. tree:path against tree:path (where it can get
information via get_sha1_with_context)
3. Same as (2), but using the ".." range syntax
4. tree:path against a filename
And beyond generating a sane diff, we care about a few
little bits: which paths they show in the diff header, and
whether they correctly pick up a mode change.
They should all be able to show a mode except for (1),
though note that case (3) is currently broken.
For the headers, we would ideally show the path within the
tree if we have it, making:
git diff a:path b:path
look the same as:
git diff a b -- path
We can't always do that (e.g., in the direct sha1/sha1 diff,
we have no path to show), in which case we should fall back
to the name that resolved to the blob (which is nonsense
from the repository's perspective, but is the best we can
do).
Aside from the fallback case in (1), none of the cases get
this right. Cases (2) and (3) always show the full
tree:path, even though we should be able to know just the
"path" portion.
Case (4) picks up the filename path, but assigns it to
_both_ sides of the diff. So this works for:
git diff tree:path path
but not for:
git diff tree:other_path path
The appropriate tests are marked to expect failure.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-19 15:54:56 +03:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
test_description='test direct comparison of blobs via git-diff'
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
|
|
run_diff () {
|
|
|
|
|
# use full-index to make it easy to match the index line
|
|
|
|
|
git diff --full-index "$@" >diff
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
check_index () {
|
|
|
|
|
grep "^index $1\\.\\.$2" diff
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
check_mode () {
|
|
|
|
|
grep "^old mode $1" diff &&
|
|
|
|
|
grep "^new mode $2" diff
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
check_paths () {
|
|
|
|
|
grep "^diff --git a/$1 b/$2" diff
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
test_expect_success 'create some blobs' '
|
|
|
|
|
echo one >one &&
|
|
|
|
|
echo two >two &&
|
|
|
|
|
chmod +x two &&
|
|
|
|
|
git add . &&
|
|
|
|
|
|
|
|
|
|
# cover systems where modes are ignored
|
|
|
|
|
git update-index --chmod=+x two &&
|
|
|
|
|
|
|
|
|
|
git commit -m base &&
|
|
|
|
|
|
|
|
|
|
sha1_one=$(git rev-parse HEAD:one) &&
|
|
|
|
|
sha1_two=$(git rev-parse HEAD:two)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'diff by sha1' '
|
|
|
|
|
run_diff $sha1_one $sha1_two
|
|
|
|
|
'
|
|
|
|
|
test_expect_success 'index of sha1 diff' '
|
|
|
|
|
check_index $sha1_one $sha1_two
|
|
|
|
|
'
|
|
|
|
|
test_expect_success 'sha1 diff uses arguments as paths' '
|
|
|
|
|
check_paths $sha1_one $sha1_two
|
|
|
|
|
'
|
|
|
|
|
test_expect_success 'sha1 diff has no mode change' '
|
|
|
|
|
! grep mode diff
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'diff by tree:path (run)' '
|
|
|
|
|
run_diff HEAD:one HEAD:two
|
|
|
|
|
'
|
|
|
|
|
test_expect_success 'index of tree:path diff' '
|
|
|
|
|
check_index $sha1_one $sha1_two
|
|
|
|
|
'
|
2017-05-19 15:59:15 +03:00
|
|
|
test_expect_success 'tree:path diff uses filenames as paths' '
|
t4063: add tests of direct blob diffs
The git-diff command can directly compare two blobs (or a
blob and a file), but we don't test this at all. Let's add
some basic tests that reveal a few problems.
There are basically four interesting inputs:
1. sha1 against sha1 (where diff has no information beyond
the contents)
2. tree:path against tree:path (where it can get
information via get_sha1_with_context)
3. Same as (2), but using the ".." range syntax
4. tree:path against a filename
And beyond generating a sane diff, we care about a few
little bits: which paths they show in the diff header, and
whether they correctly pick up a mode change.
They should all be able to show a mode except for (1),
though note that case (3) is currently broken.
For the headers, we would ideally show the path within the
tree if we have it, making:
git diff a:path b:path
look the same as:
git diff a b -- path
We can't always do that (e.g., in the direct sha1/sha1 diff,
we have no path to show), in which case we should fall back
to the name that resolved to the blob (which is nonsense
from the repository's perspective, but is the best we can
do).
Aside from the fallback case in (1), none of the cases get
this right. Cases (2) and (3) always show the full
tree:path, even though we should be able to know just the
"path" portion.
Case (4) picks up the filename path, but assigns it to
_both_ sides of the diff. So this works for:
git diff tree:path path
but not for:
git diff tree:other_path path
The appropriate tests are marked to expect failure.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-19 15:54:56 +03:00
|
|
|
check_paths one two
|
|
|
|
|
'
|
|
|
|
|
test_expect_success 'tree:path diff shows mode change' '
|
|
|
|
|
check_mode 100644 100755
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'diff by ranged tree:path' '
|
|
|
|
|
run_diff HEAD:one..HEAD:two
|
|
|
|
|
'
|
|
|
|
|
test_expect_success 'index of ranged tree:path diff' '
|
|
|
|
|
check_index $sha1_one $sha1_two
|
|
|
|
|
'
|
2017-05-19 15:59:15 +03:00
|
|
|
test_expect_success 'ranged tree:path diff uses filenames as paths' '
|
t4063: add tests of direct blob diffs
The git-diff command can directly compare two blobs (or a
blob and a file), but we don't test this at all. Let's add
some basic tests that reveal a few problems.
There are basically four interesting inputs:
1. sha1 against sha1 (where diff has no information beyond
the contents)
2. tree:path against tree:path (where it can get
information via get_sha1_with_context)
3. Same as (2), but using the ".." range syntax
4. tree:path against a filename
And beyond generating a sane diff, we care about a few
little bits: which paths they show in the diff header, and
whether they correctly pick up a mode change.
They should all be able to show a mode except for (1),
though note that case (3) is currently broken.
For the headers, we would ideally show the path within the
tree if we have it, making:
git diff a:path b:path
look the same as:
git diff a b -- path
We can't always do that (e.g., in the direct sha1/sha1 diff,
we have no path to show), in which case we should fall back
to the name that resolved to the blob (which is nonsense
from the repository's perspective, but is the best we can
do).
Aside from the fallback case in (1), none of the cases get
this right. Cases (2) and (3) always show the full
tree:path, even though we should be able to know just the
"path" portion.
Case (4) picks up the filename path, but assigns it to
_both_ sides of the diff. So this works for:
git diff tree:path path
but not for:
git diff tree:other_path path
The appropriate tests are marked to expect failure.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-19 15:54:56 +03:00
|
|
|
check_paths one two
|
|
|
|
|
'
|
2017-05-19 15:55:11 +03:00
|
|
|
test_expect_success 'ranged tree:path diff shows mode change' '
|
t4063: add tests of direct blob diffs
The git-diff command can directly compare two blobs (or a
blob and a file), but we don't test this at all. Let's add
some basic tests that reveal a few problems.
There are basically four interesting inputs:
1. sha1 against sha1 (where diff has no information beyond
the contents)
2. tree:path against tree:path (where it can get
information via get_sha1_with_context)
3. Same as (2), but using the ".." range syntax
4. tree:path against a filename
And beyond generating a sane diff, we care about a few
little bits: which paths they show in the diff header, and
whether they correctly pick up a mode change.
They should all be able to show a mode except for (1),
though note that case (3) is currently broken.
For the headers, we would ideally show the path within the
tree if we have it, making:
git diff a:path b:path
look the same as:
git diff a b -- path
We can't always do that (e.g., in the direct sha1/sha1 diff,
we have no path to show), in which case we should fall back
to the name that resolved to the blob (which is nonsense
from the repository's perspective, but is the best we can
do).
Aside from the fallback case in (1), none of the cases get
this right. Cases (2) and (3) always show the full
tree:path, even though we should be able to know just the
"path" portion.
Case (4) picks up the filename path, but assigns it to
_both_ sides of the diff. So this works for:
git diff tree:path path
but not for:
git diff tree:other_path path
The appropriate tests are marked to expect failure.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-19 15:54:56 +03:00
|
|
|
check_mode 100644 100755
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'diff blob against file' '
|
|
|
|
|
run_diff HEAD:one two
|
|
|
|
|
'
|
|
|
|
|
test_expect_success 'index of blob-file diff' '
|
|
|
|
|
check_index $sha1_one $sha1_two
|
|
|
|
|
'
|
2017-05-19 15:59:34 +03:00
|
|
|
test_expect_success 'blob-file diff uses filename as paths' '
|
t4063: add tests of direct blob diffs
The git-diff command can directly compare two blobs (or a
blob and a file), but we don't test this at all. Let's add
some basic tests that reveal a few problems.
There are basically four interesting inputs:
1. sha1 against sha1 (where diff has no information beyond
the contents)
2. tree:path against tree:path (where it can get
information via get_sha1_with_context)
3. Same as (2), but using the ".." range syntax
4. tree:path against a filename
And beyond generating a sane diff, we care about a few
little bits: which paths they show in the diff header, and
whether they correctly pick up a mode change.
They should all be able to show a mode except for (1),
though note that case (3) is currently broken.
For the headers, we would ideally show the path within the
tree if we have it, making:
git diff a:path b:path
look the same as:
git diff a b -- path
We can't always do that (e.g., in the direct sha1/sha1 diff,
we have no path to show), in which case we should fall back
to the name that resolved to the blob (which is nonsense
from the repository's perspective, but is the best we can
do).
Aside from the fallback case in (1), none of the cases get
this right. Cases (2) and (3) always show the full
tree:path, even though we should be able to know just the
"path" portion.
Case (4) picks up the filename path, but assigns it to
_both_ sides of the diff. So this works for:
git diff tree:path path
but not for:
git diff tree:other_path path
The appropriate tests are marked to expect failure.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-19 15:54:56 +03:00
|
|
|
check_paths one two
|
|
|
|
|
'
|
|
|
|
|
test_expect_success FILEMODE 'blob-file diff shows mode change' '
|
|
|
|
|
check_mode 100644 100755
|
|
|
|
|
'
|
|
|
|
|
|
2017-05-19 15:59:34 +03:00
|
|
|
test_expect_success 'blob-file diff prefers filename to sha1' '
|
|
|
|
|
run_diff $sha1_one two &&
|
|
|
|
|
check_paths two two
|
|
|
|
|
'
|
|
|
|
|
|
t4063: add tests of direct blob diffs
The git-diff command can directly compare two blobs (or a
blob and a file), but we don't test this at all. Let's add
some basic tests that reveal a few problems.
There are basically four interesting inputs:
1. sha1 against sha1 (where diff has no information beyond
the contents)
2. tree:path against tree:path (where it can get
information via get_sha1_with_context)
3. Same as (2), but using the ".." range syntax
4. tree:path against a filename
And beyond generating a sane diff, we care about a few
little bits: which paths they show in the diff header, and
whether they correctly pick up a mode change.
They should all be able to show a mode except for (1),
though note that case (3) is currently broken.
For the headers, we would ideally show the path within the
tree if we have it, making:
git diff a:path b:path
look the same as:
git diff a b -- path
We can't always do that (e.g., in the direct sha1/sha1 diff,
we have no path to show), in which case we should fall back
to the name that resolved to the blob (which is nonsense
from the repository's perspective, but is the best we can
do).
Aside from the fallback case in (1), none of the cases get
this right. Cases (2) and (3) always show the full
tree:path, even though we should be able to know just the
"path" portion.
Case (4) picks up the filename path, but assigns it to
_both_ sides of the diff. So this works for:
git diff tree:path path
but not for:
git diff tree:other_path path
The appropriate tests are marked to expect failure.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-19 15:54:56 +03:00
|
|
|
test_done
|