unpack-trees(): carry skip-worktree bit over in merged_entry()

pclouds · gitster · commit 32f54ca31747 · 2009-08-23T17:13:33.000-07:00
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 &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/unpack-trees.c b/unpack-trees.c
@@ -680,6 +680,8 @@ static int merged_entry(struct cache_entry *merge, struct cache_entry *old,
 		} else {
 			if (verify_uptodate(old, o))
 				return -1;
+			if (ce_skip_worktree(old))
+				update |= CE_SKIP_WORKTREE;
 			invalidate_ce_path(old, o);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -680,6 +680,8 @@ static int merged_entry(struct cache_entry merge, struct cache_entry old,`
`680`	`680`	`} else {`
`681`	`681`	`if (verify_uptodate(old, o))`
`682`	`682`	`return -1;`
	`683`	`+ if (ce_skip_worktree(old))`
	`684`	`+ update \|= CE_SKIP_WORKTREE;`
`683`	`685`	`invalidate_ce_path(old, o);`
`684`	`686`	`}`
`685`	`687`	`}`