From: Lucas De Marchi <lucas.demarchi@intel.com>
To: lucas.de.marchi@gmail.com
Cc: avarab@gmail.com, git@vger.kernel.org, gitster@pobox.com,
johannes.schindelin@gmx.de, lucas.demarchi@intel.com,
sunshine@sunshineco.com, t.gummerer@gmail.com
Subject: [PATCH v2] range-diff: allow to diff files regardless submodule
Date: Thu, 11 Oct 2018 01:17:50 -0700 [thread overview]
Message-ID: <20181011081750.24240-1-lucas.demarchi@intel.com> (raw)
In-Reply-To: <CAKi4VAL+qSObOABeNHVXGytE9aB3sUJtecE5jYF6_ZfDA+J0ZQ@mail.gmail.com>
Do like it's done in grep so mode doesn't end up as
0160000, which means range-diff doesn't work if one has
"submodule.diff = log" in the configuration. Without this
while using range-diff I only get a
Submodule a 0000000...0000000 (new submodule)
instead of the diff between the revisions.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
range-diff.c | 2 +-
t/t3206-range-diff.sh | 29 +++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/range-diff.c b/range-diff.c
index 60edb2f518..bd8083f2d1 100644
--- a/range-diff.c
+++ b/range-diff.c
@@ -354,7 +354,7 @@ static struct diff_filespec *get_filespec(const char *name, const char *p)
{
struct diff_filespec *spec = alloc_filespec(name);
- fill_filespec(spec, &null_oid, 0, 0644);
+ fill_filespec(spec, &null_oid, 0, 0100644);
spec->data = (char *)p;
spec->size = strlen(p);
spec->should_munmap = 0;
diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh
index 045aca1c18..6aae364171 100755
--- a/t/t3206-range-diff.sh
+++ b/t/t3206-range-diff.sh
@@ -122,6 +122,35 @@ test_expect_success 'changed commit' '
test_cmp expected actual
'
+test_expect_success 'changed commit with sm config' '
+ git range-diff --no-color --submodule=log topic...changed >actual &&
+ cat >expected <<-EOF &&
+ 1: 4de457d = 1: a4b3333 s/5/A/
+ 2: fccce22 = 2: f51d370 s/4/A/
+ 3: 147e64e ! 3: 0559556 s/11/B/
+ @@ -10,7 +10,7 @@
+ 9
+ 10
+ -11
+ -+B
+ ++BB
+ 12
+ 13
+ 14
+ 4: a63e992 ! 4: d966c5c s/12/B/
+ @@ -8,7 +8,7 @@
+ @@
+ 9
+ 10
+ - B
+ + BB
+ -12
+ +B
+ 13
+ EOF
+ test_cmp expected actual
+'
+
test_expect_success 'no commits on one side' '
git commit --amend -m "new message" &&
git range-diff master HEAD@{1} HEAD
--
2.19.1.1.g8c3cf03f71
next prev parent reply other threads:[~2018-10-11 8:18 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-10 15:09 [PATCH] range-diff: allow to diff files regardless submodule Lucas De Marchi
2018-10-11 0:02 ` brian m. carlson
2018-10-11 7:50 ` Lucas De Marchi
2018-10-12 9:24 ` Johannes Schindelin
2018-10-12 23:17 ` brian m. carlson
2018-10-11 7:42 ` Ævar Arnfjörð Bjarmason
2018-10-11 8:14 ` Lucas De Marchi
2018-10-11 8:17 ` Lucas De Marchi [this message]
2018-10-12 9:26 ` [PATCH v2] " Johannes Schindelin
2018-10-11 8:25 ` [PATCH] " Junio C Hamano
2018-10-23 14:07 ` Lucas De Marchi
2018-10-24 2:12 ` Junio C Hamano
2018-10-24 2:43 ` Lucas De Marchi
2018-10-24 5:12 ` Junio C Hamano
2018-10-24 5:18 ` Junio C Hamano
2018-10-24 17:19 ` Lucas De Marchi
2018-10-24 19:46 ` [PATCH v3] range-diff: allow to diff files regardless of submodule config Lucas De Marchi
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=20181011081750.24240-1-lucas.demarchi@intel.com \
--to=lucas.demarchi@intel.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=lucas.de.marchi@gmail.com \
--cc=sunshine@sunshineco.com \
--cc=t.gummerer@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).