diff options
| author | Jeff King <peff@peff.net> | 2017-05-19 08:55:11 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-24 10:59:27 +0900 |
| commit | 101dd4de16eea300a59e432452fd4fc06e1ac7f2 (patch) | |
| tree | 674c8cc7e712dfa9a458c63e3a14c1df54cec7e2 | |
| parent | 74e89110a38fb52be29615a1468e86fb75077433 (diff) | |
| download | git-101dd4de16eea300a59e432452fd4fc06e1ac7f2.tar.gz git-101dd4de16eea300a59e432452fd4fc06e1ac7f2.tar.xz | |
handle_revision_arg: record modes for "a..b" endpoints
The "a..b" revision syntax was designed to handle commits,
so it doesn't bother to record any mode we find while
traversing a "tree:path" endpoint. These days "git diff" can
diff blobs using either "a:path..b:path" (with dots) or
"a:path b:path" (without), but the two behave
inconsistently, as the with-dots version fails to notice the
mode.
Let's teach the dot-dot range parser to record modes; it
doesn't cost us anything, and it makes this case work.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | revision.c | 10 | ||||
| -rwxr-xr-x | t/t4063-diff-blobs.sh | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/revision.c b/revision.c index 49707695a..5b56f0e92 100644 --- a/revision.c +++ b/revision.c @@ -1448,9 +1448,11 @@ static int handle_dotdot_1(const char *arg, char *dotdot, const char *a_name, *b_name; struct object_id a_oid, b_oid; struct object *a_obj, *b_obj; + struct object_context a_oc, b_oc; unsigned int a_flags, b_flags; int symmetric = 0; unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM); + unsigned int oc_flags = GET_SHA1_COMMITTISH; a_name = arg; if (!*a_name) @@ -1464,8 +1466,8 @@ static int handle_dotdot_1(const char *arg, char *dotdot, if (!*b_name) b_name = "HEAD"; - if (get_sha1_committish(a_name, a_oid.hash) || - get_sha1_committish(b_name, b_oid.hash)) + if (get_sha1_with_context(a_name, oc_flags, a_oid.hash, &a_oc) || + get_sha1_with_context(b_name, oc_flags, b_oid.hash, &b_oc)) return -1; if (!cant_be_filename) { @@ -1507,8 +1509,8 @@ static int handle_dotdot_1(const char *arg, char *dotdot, b_obj->flags |= b_flags; add_rev_cmdline(revs, a_obj, a_name, REV_CMD_LEFT, a_flags); add_rev_cmdline(revs, b_obj, b_name, REV_CMD_RIGHT, b_flags); - add_pending_object(revs, a_obj, a_name); - add_pending_object(revs, b_obj, b_name); + add_pending_object_with_mode(revs, a_obj, a_name, a_oc.mode); + add_pending_object_with_mode(revs, b_obj, b_name, b_oc.mode); return 0; } diff --git a/t/t4063-diff-blobs.sh b/t/t4063-diff-blobs.sh index 90c6f6b85..df9c35b2d 100755 --- a/t/t4063-diff-blobs.sh +++ b/t/t4063-diff-blobs.sh @@ -71,7 +71,7 @@ test_expect_success 'index of ranged tree:path diff' ' test_expect_failure 'ranged tree:path diff uses filenames as paths' ' check_paths one two ' -test_expect_failure 'ranged tree:path diff shows mode change' ' +test_expect_success 'ranged tree:path diff shows mode change' ' check_mode 100644 100755 ' |