Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
read-cache.c: introduce is_racy_timestamp() helper
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index c292a77a81d137a3ee73111162c9aa515c975d70..bdf03b1f1f7acacafebc0541309be097cc80336c 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-333,7
+333,7
@@
static struct path_list *get_unmerged(void)
item->util = xcalloc(1, sizeof(struct stage_data));
}
e = item->util;
- e->stages[ce_stage(ce)].mode =
ntohl(ce->ce_mode)
;
+ e->stages[ce_stage(ce)].mode =
ce->ce_mode
;
hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1);
}