diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-08-28 15:43:00 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-30 20:47:11 -0700 |
| commit | 18668f5319b079cce29e19817bc352b1413e0908 (patch) | |
| tree | b71abfdfc239e04742cfb277b744d43419f730aa /merge-recursive.h | |
| parent | merge-recursive: introduce merge_options (diff) | |
| download | git-18668f5319b079cce29e19817bc352b1413e0908.tar.gz git-18668f5319b079cce29e19817bc352b1413e0908.zip | |
builtin-merge: avoid run_command_v_opt() for recursive and subtree
The try_merge_strategy() function always ran the strategy in a separate
process, though this is not always necessary. The recursive and subtree
strategy can be called without a fork(). This patch adds a check, and
calls recursive in the same process without wasting resources.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions