Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rs/c-auto-resets-attributes'
[gitweb.git]
/
builtin
/
read-tree.c
diff --git
a/builtin/read-tree.c
b/builtin/read-tree.c
index 8c693e756852ef2ec3aac3bfc77d71c6258a8306..9bd1fd755ef03824442f6c751a9603b95bfe66ee 100644
(file)
--- a/
builtin/read-tree.c
+++ b/
builtin/read-tree.c
@@
-78,7
+78,7
@@
static void debug_stage(const char *label, const struct cache_entry *ce,
else
printf("%06o #%d %s %.8s\n",
ce->ce_mode, ce_stage(ce), ce->name,
-
sha1_to_hex(ce->sha1
));
+
oid_to_hex(&ce->oid
));
}
static int debug_merge(const struct cache_entry * const *stages,