Re: [PATCH 1/3] mergetool--lib: fix startup options for gvimdiff tool
- From
Alexey Shumkin <alex.crezoff@gmail.com>
- Date
- Jan 25, 2013, 08:44 UTC
- Message-ID
- <20130125124440.40fc60e0@ashu.dyn1.rarus.ru>
- In-Reply-To
- <CAJDDKr4Zi-pVVtX4LxRv9K7ocjdpLS_5NH5P_wrx0+ZRSwmfFA@mail.gmail.com>
Maybe, some time ;) Actually, I'm not TCL-programmer. With one of these patches I just have solved one my problem (to run tortoisemerge with git-gui) when I was showing to my collegue how to work with Git, and on the side I fixed another two bugs. So, I decided to sumbit these patches, to avoid applying them every time after each Git update as I did last 1.5 years with other patches which still are not submitted, because I'm too lazy to follow Git development workflow in my free time )
Show 55 quoted lines
> On Wed, Jan 23, 2013 at 11:16 PM, Alexey Shumkin
> <alex.crezoff@gmail.com> wrote:
> > Options are taken from <Git source>/mergetools/vim
> >
> > Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com>
> > ---
> > git-gui/lib/mergetool.tcl | 8 +++++++-
> > 1 file changed, 7 insertions(+), 1 deletion(-)
>
> A better long-term solution might be to teach git gui to use "git
> difftool".
>
> Would it be better to teach git-gui (and gitk) about
> mergetool/difftool? That would allow us to possibly eliminate this
> duplication.
>
> We did start towards that path when difftool learned the --extcmd
> option (for use by gitk) but I have not followed through.
>
> What do you think about trying that approach?
>
>
> > diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl
> > index 3c8e73b..4fc1cab 100644
> > --- a/git-gui/lib/mergetool.tcl
> > +++ b/git-gui/lib/mergetool.tcl
> > @@ -211,7 +211,13 @@ proc merge_resolve_tool2 {} {
> > }
> > }
> > gvimdiff {
> > - set cmdline [list "$merge_tool_path" -f "$LOCAL"
> > "$MERGED" "$REMOTE"]
> > + if {$base_stage ne {}} {
> > + set cmdline [list "$merge_tool_path" -f -d
> > -c "wincmd J" \
> > + "$MERGED" "$LOCAL" "$BASE"
> > "$REMOTE"]
> > + } else {
> > + set cmdline [list "$merge_tool_path" -f -d
> > -c "wincmd l" \
> > + "$LOCAL" "$MERGED" "$REMOTE"]
> > + }
> > }
> > kdiff3 {
> > if {$base_stage ne {}} {
> > --
> > 1.8.1.1.10.g9255f3f
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe git" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
>