From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Johannes Schindelin" <johannes.schindelin@gmx.de>,
git@vger.kernel.org, "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 10/15] handle_revision_arg: record modes for "a..b" endpoints
Date: Fri, 19 May 2017 08:55:11 -0400 [thread overview]
Message-ID: <20170519125511.uz7hsdalem57n77d@sigill.intra.peff.net> (raw)
In-Reply-To: <20170519124651.4q7waz75rmzfopgn@sigill.intra.peff.net>
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>
---
revision.c | 10 ++++++----
t/t4063-diff-blobs.sh | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/revision.c b/revision.c
index eb45501fd..96427e3c2 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
'
--
2.13.0.219.g63f6bc368
next prev parent reply other threads:[~2017-05-19 12:55 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-15 15:23 [PATCH 0/2] Demonstrate and partially work around a gitattributes problem Johannes Schindelin
2017-05-15 15:23 ` [PATCH 1/2] gitattributes: demonstrate that Git tries to read a bogus file Johannes Schindelin
2017-05-15 15:24 ` [PATCH 2/2] mingw: Suppress warning that <commit>:.gitattributes does not exist Johannes Schindelin
2017-05-16 7:54 ` [PATCH 0/2] Demonstrate and partially work around a gitattributes problem Jeff King
2017-05-16 8:10 ` Jeff King
2017-05-17 1:38 ` Junio C Hamano
2017-05-17 2:05 ` Jeff King
2017-05-18 19:23 ` Johannes Schindelin
2017-05-19 0:00 ` Jeff King
2017-05-19 12:46 ` [PATCH 0/15] retain blob info for git diff HEAD:foo HEAD:bar Jeff King
2017-05-19 12:48 ` [PATCH 01/15] handle_revision_arg: reset "dotdot" consistently Jeff King
2017-05-20 14:56 ` Philip Oakley
2017-05-23 19:51 ` Jeff King
2017-05-23 23:47 ` Philip Oakley
2017-05-19 12:48 ` [PATCH 02/15] handle_revision_arg: simplify commit reference lookups Jeff King
2017-05-19 12:50 ` [PATCH 03/15] handle_revision_arg: stop using "dotdot" as a generic pointer Jeff King
2017-05-24 2:45 ` Junio C Hamano
2017-05-24 9:55 ` Jeff King
2017-05-19 12:51 ` [PATCH 04/15] handle_revision_arg: hoist ".." check out of range parsing Jeff King
2017-05-19 12:52 ` [PATCH 05/15] handle_revision_arg: add handle_dotdot() helper Jeff King
2017-05-24 2:30 ` Junio C Hamano
2017-05-19 12:52 ` [PATCH 06/15] sha1_name: consistently refer to object_context as "oc" Jeff King
2017-05-19 12:52 ` [PATCH 07/15] get_sha1_with_context: always initialize oc->symlink_path Jeff King
2017-05-19 12:54 ` [PATCH 08/15] get_sha1_with_context: dynamically allocate oc->path Jeff King
2017-05-19 12:54 ` [PATCH 09/15] t4063: add tests of direct blob diffs Jeff King
2017-05-19 12:55 ` Jeff King [this message]
2017-05-19 12:55 ` [PATCH 11/15] handle_revision_arg: record paths for pending objects Jeff King
2017-05-19 12:57 ` [PATCH 12/15] diff: pass whole pending entry in blobinfo Jeff King
2017-05-19 12:58 ` [PATCH 13/15] diff: use the word "path" instead of "name" for blobs Jeff King
2017-05-19 12:59 ` [PATCH 14/15] diff: use pending "path" if it is available Jeff King
2017-05-19 12:59 ` [PATCH 15/15] diff: use blob path for blob/file diffs Jeff King
2017-05-24 2:44 ` [PATCH 0/15] retain blob info for git diff HEAD:foo HEAD:bar Junio C Hamano
2017-05-24 9:57 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170519125511.uz7hsdalem57n77d@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).