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>
Jeff King committed
May 19, 2017 at 08:55 UTC
101dd4de16eea300a59e432452fd4fc06e1ac7f2
2 files changed
+7
-5
revision.c
+6
-4
@@ -1448,9 +1448,11 @@ static int handle_dotdot_1(const char *arg, char *dotdot,
1448
const char *a_name, *b_name;
1449
struct object_id a_oid, b_oid;
1450
struct object *a_obj, *b_obj;
1451
+ struct object_context a_oc, b_oc;
1452
unsigned int a_flags, b_flags;
1453
int symmetric = 0;
1454
unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
1455
+ unsigned int oc_flags = GET_SHA1_COMMITTISH;
1456
1457
a_name = arg;
1458
if (!*a_name)
@@ -1464,8 +1466,8 @@ static int handle_dotdot_1(const char *arg, char *dotdot,
1466
if (!*b_name)
1467
b_name = "HEAD";
1468
1467
- if (get_sha1_committish(a_name, a_oid.hash) ||
1468
- get_sha1_committish(b_name, b_oid.hash))
1469
+ if (get_sha1_with_context(a_name, oc_flags, a_oid.hash, &a_oc) ||
1470
+ get_sha1_with_context(b_name, oc_flags, b_oid.hash, &b_oc))
1471
return -1;
1472
1473
if (!cant_be_filename) {
@@ -1507,8 +1509,8 @@ static int handle_dotdot_1(const char *arg, char *dotdot,
1509
b_obj->flags |= b_flags;
1510
add_rev_cmdline(revs, a_obj, a_name, REV_CMD_LEFT, a_flags);
1511
add_rev_cmdline(revs, b_obj, b_name, REV_CMD_RIGHT, b_flags);
1510
- add_pending_object(revs, a_obj, a_name);
1511
- add_pending_object(revs, b_obj, b_name);
1512
+ add_pending_object_with_mode(revs, a_obj, a_name, a_oc.mode);
1513
+ add_pending_object_with_mode(revs, b_obj, b_name, b_oc.mode);
1514
return 0;
1515
}
1516
t/t4063-diff-blobs.sh
+1
-1
@@ -71,7 +71,7 @@ test_expect_success 'index of ranged tree:path diff' '
71
test_expect_failure 'ranged tree:path diff uses filenames as paths' '
72
check_paths one two
73
'
74
-test_expect_failure 'ranged tree:path diff shows mode change' '
74
+test_expect_success 'ranged tree:path diff shows mode change' '
75
check_mode 100644 100755
76
'
77