summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-19 19:33:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-12-19 19:33:58 (GMT)
commit8d7fefaac4318ac3155368f475e10f97714ebd47 (patch)
tree225f9c262ffa4d1bcd58a2b407df396594a711cb /cache.h
parent66d3f19324ac9eeae8ef0d2ae2067ae7b18f8ac8 (diff)
parent64a5e98032d2462749021136a53d9e1928cd0db0 (diff)
downloadgit-8d7fefaac4318ac3155368f475e10f97714ebd47.zip
git-8d7fefaac4318ac3155368f475e10f97714ebd47.tar.gz
git-8d7fefaac4318ac3155368f475e10f97714ebd47.tar.bz2
Merge branch 'ar/unconfuse-three-dots'
Ancient part of codebase still shows dots after an abbreviated object name just to show that it is not a full object name, but these ellipses are confusing to people who newly discovered Git who are used to seeing abbreviated object names and find them confusing with the range syntax. * ar/unconfuse-three-dots: t2020: test variations that matter t4013: test new output from diff --abbrev --raw diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value t4013: prepare for upcoming "diff --raw --abbrev" output format change checkout: describe_detached_head: remove ellipsis after committish print_sha1_ellipsis: introduce helper Documentation: user-manual: limit usage of ellipsis Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot").
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index d3e2402..3d00d03 100644
--- a/cache.h
+++ b/cache.h
@@ -1972,4 +1972,10 @@ void sleep_millisec(int millisec);
*/
void safe_create_dir(const char *dir, int share);
+/*
+ * Should we print an ellipsis after an abbreviated SHA-1 value
+ * when doing diff-raw output or indicating a detached HEAD?
+ */
+extern int print_sha1_ellipsis(void);
+
#endif /* CACHE_H */