summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-10-20 02:19:43 -0400
committerJunio C Hamano <gitster@pobox.com>2016-10-26 13:30:51 -0700
commitd5e3b01e5bd6b06c06dbd5d1e2257d57e6b1deb7 (patch)
tree696f1117d12b676c167fbc459d0937f6f997711e /diff.h
parentef2ed5013c4160284d9de18903bd4f7d0542d810 (diff)
downloadgit-d5e3b01e5bd6b06c06dbd5d1e2257d57e6b1deb7.tar.gz
diff_unique_abbrev: rename to diff_aligned_abbrev
The word "align" describes how the function actually differs from find_unique_abbrev, and will make it less confusing when we add more diff-specific abbrevation functions that do not do this alignment. Since this is a globally available function, let's also move its descriptive comment to the header file, where we typically document function interfaces. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index 25ae60d5ff..f2b04b6d81 100644
--- a/diff.h
+++ b/diff.h
@@ -340,7 +340,11 @@ extern void diff_warn_rename_limit(const char *varname, int needed, int degraded
#define DIFF_STATUS_FILTER_AON '*'
#define DIFF_STATUS_FILTER_BROKEN 'B'
-extern const char *diff_unique_abbrev(const unsigned char *, int);
+/*
+ * This is different from find_unique_abbrev() in that
+ * it stuffs the result with dots for alignment.
+ */
+extern const char *diff_aligned_abbrev(const unsigned char *sha1, int);
/* do not report anything on removed paths */
#define DIFF_SILENT_ON_REMOVED 01