unpack-trees: preserve the index file version of original
Otherwise "git checkout $other_branch" (or even "git checkout HEAD") would end up writing the index out in the default format. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 27, 2012 at 15:58 UTC
9170c7ab2889a295de49458d7bd37d82f1556cd6
1 file changed
+1
unpack-trees.c
+1
@@ -1020,6 +1020,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
1020
o->result.initialized = 1;
1021
o->result.timestamp.sec = o->src_index->timestamp.sec;
1022
o->result.timestamp.nsec = o->src_index->timestamp.nsec;
1023
+ o->result.version = o->src_index->version;
1024
o->merge_size = len;
1025
mark_all_ce_unused(o->src_index);
1026