[PATCH] diff: handle --no-abbrev outside of repository
From: Jack Bates <hidden>
Date: 2016-11-28 19:02:42
Subsystem:
the rest · Maintainer:
Linus Torvalds
The "git diff --no-index" codepath doesn't handle the --no-abbrev option. Signed-off-by: Jack Bates <redacted> --- diff.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/diff.c b/diff.c
index ec87283..0447eff 100644
--- a/diff.c
+++ b/diff.c@@ -3106,7 +3106,8 @@ static const char *diff_abbrev_oid(const struct object_id *oid, int abbrev) abbrev = FALLBACK_DEFAULT_ABBREV; if (abbrev > GIT_SHA1_HEXSZ) die("BUG: oid abbreviation out of range: %d", abbrev); - hex[abbrev] = '\0'; + if (abbrev) + hex[abbrev] = '\0'; return hex; } }
@@ -4024,6 +4025,8 @@ int diff_opt_parse(struct diff_options *options, offending, optarg); return argcount; } + else if (!strcmp(arg, "--no-abbrev")) + options->abbrev = 0; else if (!strcmp(arg, "--abbrev")) options->abbrev = DEFAULT_ABBREV; else if (skip_prefix(arg, "--abbrev=", &arg)) {
--
2.10.2