summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-12-21 10:59:07 -0800
committerJunio C Hamano <gitster@pobox.com>2015-12-21 10:59:08 -0800
commitfbe959dde7eafcdae859e21cd734c07c7890c0a4 (patch)
tree3a84214d3b1ca16b4e45a01c9e2270803a128f55 /sha1_file.c
parent5498c57cdd637eb4f42ce8e296ce9ca4ab66e289 (diff)
parent06dfc9ebaa154d5074b7afadc2f792a80fba7d0c (diff)
downloadgit-fbe959dde7eafcdae859e21cd734c07c7890c0a4.tar.gz
Merge branch 'bc/format-patch-null-from-line'
"format-patch" has learned a new option to zero-out the commit object name on the mbox "From " line. * bc/format-patch-null-from-line: format-patch: check that header line has expected format format-patch: add an option to suppress commit hash sha1_file.c: introduce a null_oid constant
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 2c68766ebf..73ccd49a46 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -36,6 +36,7 @@
static inline uintmax_t sz_fmt(size_t s) { return s; }
const unsigned char null_sha1[20];
+const struct object_id null_oid;
/*
* This is meant to hold a *small* number of objects that you would