diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-10-30 15:43:40 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-30 15:43:40 +0900 |
| commit | d450e56423cfb5fbbdc7679e80605afd5b33b18b (patch) | |
| tree | d00ddee882bc4037ea9368e835bc1115aff06e16 /range-diff.c | |
| parent | Merge branch 'ch/subtree-build' (diff) | |
| parent | range-diff: allow to diff files regardless of submodule config (diff) | |
| download | tgif-d450e56423cfb5fbbdc7679e80605afd5b33b18b.tar.xz | |
Merge branch 'lm/range-diff-submodule-fix'
"git range-diff" did not work well when the compared ranges had
changes in submodules and the "--submodule=log" was used.
* lm/range-diff-submodule-fix:
range-diff: allow to diff files regardless of submodule config
Diffstat (limited to 'range-diff.c')
| -rw-r--r-- | range-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |