diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-16 00:48:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-16 00:48:59 -0800 |
| commit | 47a792539a48327e62c594f2befb5c5d1e58c0f2 (patch) | |
| tree | 2a4cc395a0686640abea8b3fe75ff3667b7e0475 /sha1_file.c | |
| parent | 8c4021abfd170278d1a3431e2777bedd0c01fbb1 (diff) | |
| parent | 1324fb6f161ee516eb4c597880847003a42c0c5d (diff) | |
| download | git-47a792539a48327e62c594f2befb5c5d1e58c0f2.tar.gz git-47a792539a48327e62c594f2befb5c5d1e58c0f2.tar.xz | |
Merge branch 'jk/commit-v-strip'
* jk/commit-v-strip:
status: show "-v" diff even for initial commit
wt-status: refactor initial commit printing
define empty tree sha1 as a macro
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sha1_file.c b/sha1_file.c index 0fa65baa5..75a748a64 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2055,9 +2055,7 @@ static struct cached_object { static int cached_object_nr, cached_object_alloc; static struct cached_object empty_tree = { - /* empty tree sha1: 4b825dc642cb6eb9a060e54bf8d69288fbee4904 */ - "\x4b\x82\x5d\xc6\x42\xcb\x6e\xb9\xa0\x60" - "\xe5\x4b\xf8\xd6\x92\x88\xfb\xee\x49\x04", + EMPTY_TREE_SHA1_BIN, OBJ_TREE, "", 0 |