Seth House de8dafbada
mergetool: break setup_tool out into separate initialization function ...
This is preparation for the following commit where we need to source the
mergetool shell script to look for overrides before `run_merge_tool` is
called. Previously `run_merge_tool` both sourced that script and invoked
the mergetool.
In the case of the following commit, we need the result of the
`hide_resolved` override, if present, before we actually run
`run_merge_tool`.
The new `initialize_merge_tool` wrapper is exposed and documented as
a public interface for consistency with the existing `run_merge_tool`
which is also public. Although `setup_tool` could instead be exposed
directly, the related `setup_user_tool` would probably also want to be
elevated to match and this felt the cleanest to me.
Signed-off-by: Seth House <seth@eseth.com >
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2021-02-09 14:09:16 -08:00
2021-02-09 14:09:16 -08:00
2020-07-06 22:09:16 -07:00
2020-12-18 15:15:18 -08:00
2020-12-17 15:06:42 -08:00
2019-05-09 00:37:27 +09:00
2020-03-29 09:25:38 -07:00
2019-10-06 12:25:16 +09:00
2020-11-01 15:54:14 -08:00
2020-08-04 18:34:02 -07:00
2020-06-17 21:54:05 -07:00
2020-12-08 15:11:22 -08:00
2020-05-18 13:18:56 -07:00
2019-12-13 12:18:07 -08:00
2020-09-01 12:17:05 -07:00
2020-11-18 13:32:53 -08:00
2020-02-18 13:53:30 -08:00
2020-09-25 15:25:38 -07:00
2019-12-04 10:10:37 -08:00
2020-10-20 11:57:40 -07:00
2020-08-20 16:34:37 -07:00
2020-09-19 15:56:06 -07:00
2020-10-08 14:01:15 -07:00
2020-08-28 14:06:06 -07:00
2020-11-04 14:04:44 -08:00
2020-11-04 14:04:44 -08:00
2020-06-08 18:06:28 -07:00
2020-07-30 09:16:48 -07:00
2020-07-01 15:54:05 -07:00
2019-11-07 13:42:00 +09:00
2020-03-17 15:02:23 -07:00
2019-04-02 13:57:00 +09:00
2020-10-27 15:09:51 -07:00
2020-10-20 11:57:40 -07:00
2019-10-11 14:24:46 +09:00
2020-10-27 15:09:50 -07:00
2020-11-02 13:17:39 -08:00
2020-04-03 11:37:22 -07:00
2020-10-20 11:57:35 -07:00
2020-11-25 15:01:31 -08:00
2020-05-08 14:25:01 -07:00
2020-05-18 13:19:33 -07:00
2019-11-07 13:42:00 +09:00
2019-04-08 17:24:51 +09:00
2020-09-20 21:30:26 -07:00
2020-09-21 13:37:03 -07:00
2020-09-21 13:37:03 -07:00
2019-05-13 23:11:59 +09:00
2020-06-25 14:19:23 -07:00
2020-10-04 12:56:29 -07:00
2020-08-18 13:25:05 -07:00
2020-10-20 12:22:25 -07:00
2020-09-18 15:41:56 -07:00
2020-09-25 10:59:44 -07:00
2020-11-21 15:14:38 -08:00
2019-07-29 10:41:18 -07:00
2019-09-05 13:01:48 -07:00
2020-11-01 15:54:14 -08:00
2019-10-06 09:45:02 +09:00
2019-05-28 10:47:42 -07:00
2020-08-04 18:34:01 -07:00
2020-06-10 18:06:34 -07:00
2020-08-31 11:44:33 -07:00
2020-08-17 10:50:14 -07:00
2020-12-13 15:53:50 -08:00
2019-04-01 15:49:47 +09:00
2020-11-01 15:54:14 -08:00
2020-11-04 14:04:44 -08:00
2020-06-25 09:18:53 -07:00
2020-11-04 14:04:44 -08:00
2020-09-28 16:09:04 -07:00
2020-10-16 08:36:42 -07:00
2019-09-09 11:05:51 -07:00
2019-09-09 11:05:52 -07:00
2020-05-05 16:07:30 -07:00
2021-02-09 14:09:16 -08:00
2019-05-13 23:11:59 +09:00
2020-08-11 14:05:26 -07:00
2020-08-03 12:40:09 -07:00
2020-11-05 12:52:50 -08:00
2020-08-06 13:01:03 -07:00
2020-04-29 16:15:27 -07:00
2020-10-03 09:59:19 -07:00
2019-12-05 12:52:44 -08:00
2020-04-06 13:42:43 -07:00
2020-10-20 11:57:40 -07:00
2019-09-09 11:05:52 -07:00
2019-04-22 11:14:46 +09:00
2020-10-27 11:40:33 -07:00
2019-08-11 17:40:07 -07:00
2019-09-05 13:01:48 -07:00
2019-07-09 15:25:44 -07:00
2020-04-06 13:42:43 -07:00
2020-10-07 09:49:05 -07:00
2020-07-08 22:08:54 -07:00
2020-11-10 13:46:27 -08:00
2020-10-20 11:57:40 -07:00
2020-02-19 10:56:49 -08:00
2020-10-20 11:57:40 -07:00
2020-09-27 12:21:05 -07:00
2019-04-10 12:05:03 +09:00
2020-08-17 10:50:14 -07:00
2020-06-22 15:55:03 -07:00
2020-02-19 10:56:49 -08:00
2019-09-09 11:05:51 -07:00
2020-06-24 09:14:21 -07:00
2020-10-20 11:57:40 -07:00
2020-10-08 09:25:29 -07:00
2020-09-18 15:41:56 -07:00
2020-01-22 12:27:49 -08:00
2020-11-16 13:44:01 -08:00
2019-05-15 14:07:37 +09:00
2020-10-12 12:24:29 -07:00
2020-09-09 12:58:37 -07:00
2020-10-22 10:29:30 -07:00
2020-03-17 15:02:24 -07:00
2020-01-08 08:56:40 -08:00
2020-08-04 18:34:01 -07:00
2020-06-25 09:18:53 -07:00
2020-09-20 21:29:02 -07:00
2020-11-11 13:18:38 -08:00
2019-07-25 14:27:13 -07:00
2020-11-01 15:54:14 -08:00
2020-06-24 09:14:21 -07:00
2020-07-06 22:09:13 -07:00
2019-11-10 18:02:14 +09:00
2020-10-04 12:54:07 -07:00
2019-05-07 13:04:48 +09:00
2019-05-07 13:04:48 +09:00
2019-09-09 11:05:52 -07:00
2019-06-24 12:37:21 -07:00
2020-07-18 13:43:34 -07:00
2020-12-02 14:53:42 -08:00
2020-11-01 15:54:14 -08:00
2020-11-01 15:54:14 -08:00
2020-12-17 15:06:40 -08:00
2020-03-29 09:25:38 -07:00
2020-03-29 09:25:38 -07:00
2019-09-16 12:20:39 -07:00
2020-10-20 11:57:35 -07:00
2019-11-11 11:04:46 +09:00
2020-11-30 14:49:43 -08:00
2020-11-30 13:55:54 -08:00
2020-08-17 10:50:14 -07:00
2020-07-06 22:09:15 -07:00
2020-11-04 14:04:44 -08:00
2020-09-30 14:52:00 -07:00
2020-09-18 15:41:56 -07:00
2020-07-08 22:08:54 -07:00
2020-08-17 17:02:49 -07:00
2020-07-08 22:08:53 -07:00
2019-07-02 12:08:08 -07:00
2020-10-20 11:57:40 -07:00
2020-11-02 13:17:47 -08:00
2019-10-04 09:26:42 +09:00
2019-10-21 12:02:39 +09:00
2020-03-31 16:08:02 -07:00
2020-06-25 09:18:53 -07:00
de8dafbada