[PATCH 1/2] unpack-trees: preserve the index file version of original
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 27, 2012, 22:58 UTC
- Message-ID
- <xmqqzk9w93zu.fsf@junio.mtv.corp.google.com>
- In-Reply-To
- <1333493596-14202-1-git-send-email-gitster@pobox.com>
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> --- * The first of a two patch series to update the jc/index-v4 series: http://thread.gmane.org/gmane.comp.version-control.git/194660
unpack-trees.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/unpack-trees.c b/unpack-trees.c index 7c9ecf6..2a037d6 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1020,6 +1020,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options o->result.initialized = 1; o->result.timestamp.sec = o->src_index->timestamp.sec; o->result.timestamp.nsec = o->src_index->timestamp.nsec; + o->result.version = o->src_index->version; o->merge_size = len; mark_all_ce_unused(o->src_index);
-- 1.7.10.526.gb0571