Re: [PATCH] mergetools: Add tortoisegitmerge helper
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:55:49
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH] mergetools: Add tortoisegitmerge helper · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] mergetools: Add tortoisegitmerge helper · Sven Strickroth <hidden>
- 2016-06-15 · Re: [PATCH] mergetools: Add tortoisegitmerge helper · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] mergetools: Add tortoisegitmerge helper · David Aguilar <hidden>
- 2016-06-15 · Re: [PATCH] mergetools: Add tortoisegitmerge helper · Junio C Hamano <hidden>
Sven Strickroth [off-list ref] writes:
- The TortoiseGit team renamed TortoiseMerge.exe to TortoiseGitMerge.exe (starting with 1.8.0) in order to make clear that this one has special support for git and prevent confusion with the TortoiseSVN TortoiseMerge version. - 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. The new tortoisegitmerge helper was added so that people can still use TortoiseMerge from TortoiseSVN (and older TortoiseGit versions). Signed-off-by: Sven Strickroth <redacted> Reported-by: Sebastian Schuberth <redacted> ---
Applying: mergetools: Add tortoisegitmerge helper fatal: corrupt patch at line 56 That comes from here:
quoted hunk
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 9bb4956..a047646 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt@@ -55,9 +55,9 @@ merge.tool:: Controls which merge resolution program is used by linkgit:git-mergetool[1]. Valid built-in values are: "araxis", "bc3", "diffuse", "ecmerge", "emerge", "gvimdiff", "kdiff3", "meld", - "opendiff", "p4merge", "tkdiff", "tortoisemerge", "vimdiff" - and "xxdiff". Any other value is treated is custom merge tool - and there must be a corresponding mergetool.<tool>.cmd option. + "opendiff", "p4merge", "tkdiff", "tortoisegitmerge", "tortoisemerge", + "vimdiff" and "xxdiff". Any other value is treated is custom merge + tool and there must be a corresponding mergetool.<tool>.cmd option. merge.verbosity:: Controls the amount of output shown by the recursive mergediff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
Notice that we have three pre-context lines but only two post-context lines for this hunk. There is one context line missing at the end of this hunk. I'd usually try to queue a corrupt patch by manually fixing up when it is a trivial corruption, but a corruption that _loses_ lines is too dangerous to be handled that way. There may be additions in other hunks you wanted to make that were lost for the same reason why the post-context line was lost here, and my fix-up would end up committing a wrong patch. Please investigate how this happened, and re-send after hearing reviews from others. Thanks.