projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c28b3d6) | patch
unpack-trees(): carry skip-worktree bit over in merged_entry()
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Thu, 20 Aug 2009 13:47:02 +0000 (20:47 +0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Aug 2009 00:13:33 +0000 (17:13 -0700)
commit32f54ca31747c47f56abb7ae87a6da0f5b8d97c3
tree1cdcb7ffe0bc59df1f236f0e7dec5bfc9fee7ee2tree | snapshot
parentc28b3d6e7b0471a02f81324a90b26effae0f4bdecommit | diff
unpack-trees(): carry skip-worktree bit over in merged_entry()

In this code path, we would remove "old" and replace it with "merge".
"old" may have skip-worktree bit, so re-add it to "merge".

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
unpack-trees.c diff | blob | history
Git—the stupid content tracker