summaryrefslogtreecommitdiff
path: root/t/t4202-log.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-02 06:06:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-02 06:06:05 (GMT)
commit7ef0d047386a1932dc4a8b1008d851b0fe47f978 (patch)
tree164f1bd89b45be7337b44b0252a09bf7d4deffb5 /t/t4202-log.sh
parentf4fd99bf6e5c27265ee2a9ccb9c2495854f67acb (diff)
parent30d005c02014680403b5d35ef274047ab91fa5bd (diff)
downloadgit-7ef0d047386a1932dc4a8b1008d851b0fe47f978.zip
git-7ef0d047386a1932dc4a8b1008d851b0fe47f978.tar.gz
git-7ef0d047386a1932dc4a8b1008d851b0fe47f978.tar.bz2
Merge branch 'jk/diff-blob'
The result from "git diff" that compares two blobs, e.g. "git diff $commit1:$path $commit2:$path", used to be shown with the full object name as given on the command line, but it is more natural to use the $path in the output and use it to look up .gitattributes. * jk/diff-blob: diff: use blob path for blob/file diffs diff: use pending "path" if it is available diff: use the word "path" instead of "name" for blobs diff: pass whole pending entry in blobinfo handle_revision_arg: record paths for pending objects handle_revision_arg: record modes for "a..b" endpoints t4063: add tests of direct blob diffs get_sha1_with_context: dynamically allocate oc->path get_sha1_with_context: always initialize oc->symlink_path sha1_name: consistently refer to object_context as "oc" handle_revision_arg: add handle_dotdot() helper handle_revision_arg: hoist ".." check out of range parsing handle_revision_arg: stop using "dotdot" as a generic pointer handle_revision_arg: simplify commit reference lookups handle_revision_arg: reset "dotdot" consistently
Diffstat (limited to 't/t4202-log.sh')
-rwxr-xr-xt/t4202-log.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 6499cdf..e444195 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -1392,4 +1392,13 @@ test_expect_success 'log --source paints tag names' '
test_cmp expect actual
'
+test_expect_success 'log --source paints symmetric ranges' '
+ cat >expect <<-\EOF &&
+ 09e12a9 source-b three
+ 8e393e1 source-a two
+ EOF
+ git log --oneline --source source-a...source-b >actual &&
+ test_cmp expect actual
+'
+
test_done