| commit | 18668f5319b079cce29e19817bc352b1413e0908 | |
| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Thu, 28 Aug 2008 13:43:00 +0000 (28 15:43 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 31 Aug 2008 03:47:11 +0000 (30 20:47 -0700) | ||
| tree | b71abfdfc239e04742cfb277b744d43419f730aa | treesnapshot (tar.gz zip) |
| parent | 8a2fce1895c058945d8e2dbd8cb7456cc7450ad8 | commitdiff |
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>
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>
| builtin-merge.c | diffblobblamehistory |