summaryrefslogtreecommitdiff
path: root/sha1_name.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-03 12:38:11 -0700
committerJunio C Hamano <gitster@pobox.com>2014-04-03 12:38:11 -0700
commitb407d40933f9c37af16ca3dc275e615ab4fdd8c5 (patch)
treea22498a4d0d7d253f43cb2bde8b032b2374b12b2 /sha1_name.c
parent2b06c1e57eecde25ff762cc12939d8a6d8f143cc (diff)
parent1b32decefd840e0ca5d18eefd6472fd8624dd849 (diff)
downloadgit-b407d40933f9c37af16ca3dc275e615ab4fdd8c5.tar.gz
Merge branch 'nd/log-show-linear-break'
Attempts to show where a single-strand-of-pearls break in "git log" output. * nd/log-show-linear-break: log: add --show-linear-break to help see non-linear history object.h: centralize object flag allocation
Diffstat (limited to 'sha1_name.c')
-rw-r--r--sha1_name.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sha1_name.c b/sha1_name.c
index 6fca8692d2..2b6322fad0 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -819,6 +819,8 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned l
* For future extension, ':/!' is reserved. If you want to match a message
* beginning with a '!', you have to repeat the exclamation mark.
*/
+
+/* Remember to update object flag allocation in object.h */
#define ONELINE_SEEN (1u<<20)
static int handle_one_ref(const char *path,