Re: [PATCH v3 2/8] merge-recursive: internal flag to avoid touching the worktree

2014-09-08 Thread Junio C Hamano
Thomas Rast writes: > From: Thomas Rast > > o->call_depth has a double function: a nonzero call_depth means we > want to construct virtual merge bases, but it also means we want to > avoid touching the worktree. Introduce a new flag o->no_worktree to > trigger only the latter. > > Signed-off-by

[PATCH v3 2/8] merge-recursive: internal flag to avoid touching the worktree

2014-09-06 Thread Thomas Rast
From: Thomas Rast o->call_depth has a double function: a nonzero call_depth means we want to construct virtual merge bases, but it also means we want to avoid touching the worktree. Introduce a new flag o->no_worktree to trigger only the latter. Signed-off-by: Thomas Rast Signed-off-by: Junio