[PATCH 2/2] mergetools: Make tortoisemerge work with
- From
- Sven Strickroth <sven.strickroth@tu-clausthal.de>
- Date
- Jan 26, 2013, 01:17 UTC
- Message-ID
- <51032E96.2040209@tu-clausthal.de>
- In-Reply-To
- <7v622l5d87.fsf@alter.siamese.dyndns.org>
tortoisegitmerge and filesnames with space
The tortoisemerge mergetool does not work with filenames which have a space in it. Fixing this required changes in git and also in TortoiseGitMerge; see https://github.com/msysgit/msysgit/issues/57.
TortoiseGitMerge now separates cli parameter key-values by space instead of colons as TortoiseSVN TortoiseMerge does and supports filesnames with spaces in it this way now.
Signed-off-by: Sven Strickroth <email@cs-ware.de> Reported-by: Sebastian Schuberth <sschuberth@gmail.com> --- mergetools/tortoisemerge | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge index 8476afa..2f98829 100644 --- a/mergetools/tortoisemerge +++ b/mergetools/tortoisemerge @@ -6,9 +6,17 @@ merge_cmd () { if $base_present then touch "$BACKUP" - "$merge_tool_path" \ - -base:"$BASE" -mine:"$LOCAL" \ - -theirs:"$REMOTE" -merged:"$MERGED" + basename="$(basename "$merge_tool_path" .exe)" + if test "$basename" = "tortoisegitmerge" + then + "$merge_tool_path" \ + -base "$BASE" -mine "$LOCAL" \ + -theirs "$REMOTE" -merged "$MERGED" + else + "$merge_tool_path" \ + -base:"$BASE" -mine:"$LOCAL" \ + -theirs:"$REMOTE" -merged:"$MERGED" + fi check_unchanged else echo "$merge_tool_path cannot be used without a base" 1>&2
-- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-server