Skip to content
Commits on Apr 25, 2016
  1. @nforro @gitster

    difftool/mergetool: make the form of yes/no questions consistent

    nforro committed with gitster Apr 12, 2016
    Every yes/no question in difftool/mergetool scripts has slightly
    different form, and none of them is consistent with the form git
    itself uses.
    
    Make the form of all the questions consistent with the form used
    by git.
    
    Reviewed-by: John Keeping <john@keeping.me.uk>
    Signed-off-by: Nikola Forró <nforro@redhat.com>
    Acked-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 21, 2014
  1. @davvid @gitster

    difftool--helper: add explicit exit statement

    davvid committed with gitster Nov 20, 2014
    git-difftool--helper returns a zero exit status unless
    --trust-exit-code is in effect.  Add an explicit exit statement
    to make this clearer.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 28, 2014
  1. @davvid @gitster

    difftool: add support for --trust-exit-code

    davvid committed with gitster Oct 26, 2014
    Teach difftool to exit when a diff tool returns a non-zero exit
    code when either --trust-exit-code is specified or
    difftool.trustExitCode is true.
    
    Forward exit codes from invoked diff tools to the caller when
    --trust-exit-code is used.
    
    Suggested-by: Adri Farr <14farresa@gmail.com>
    Helped-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 27, 2014
  1. @j6t @gitster

    difftool--helper: exit when reading a prompt answer fails

    j6t committed with gitster Oct 26, 2014
    An attempt to quit difftool by hitting Ctrl-D (EOF) at its prompt does
    not quit it, but is treated as if 'yes' was answered to the prompt and
    all following prompts, which is contrary to the user's intent. Fix the
    error check.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 6, 2013
  1. @zklinger @gitster

    difftool: display the number of files in the diff queue in the prompt

    zklinger committed with gitster Dec 6, 2013
    When --prompt option is set, git-difftool displays a prompt for each
    modified file to be viewed in an external diff program.  At that
    point, it could be useful to display a counter and the total number
    of files in the diff queue.
    
    Below is the current difftool prompt for the first of 5 modified files:
    
        Viewing: 'diff.c'
        Launch 'vimdiff' [Y/n]:
    
    Consider the modified prompt:
    
        Viewing (1/5): 'diff.c'
        Launch 'vimdiff' [Y/n]:
    
    The current GIT_EXTERNAL_DIFF mechanism does not tell the number of
    paths in the diff queue nor the current counter.  To make this
    "counter/total" info available for GIT_EXTERNAL_DIFF programs
    without breaking existing ones by doing the following:
    
     - Keep track of the number of paths shown so far in diff_options;
    
     - Export two new environment variables from run_external_diff() to
       show the total number of paths (from diff_queue_struct) and the
       current value of the counter (from diff_options); and
    
     - Update git-difftool--helper to use these two environment variables.
    
    Signed-off-by: Zoltan Klinger <zoltan.klinger@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 10, 2013
  1. @davvid @gitster

    difftool--helper: fix printf usage

    davvid committed with gitster Feb 9, 2013
    Do not use a random string as if it is a format string for printf
    when showing it literally; instead feed it to '%s' format.
    
    Reported-by: Asheesh Laroia <asheesh@asheesh.org>
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 23, 2012
  1. @thenigan @gitster

    difftool: teach difftool to handle directory diffs

    thenigan committed with gitster Apr 23, 2012
    When 'difftool' is called to compare a range of commits that modify
    more than one file, it opens a separate instance of the diff tool for
    each file that changed.
    
    The new '--dir-diff' option copies all the modified files to a temporary
    location and runs a directory diff on them in a single instance of the
    diff tool.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 10, 2011
  1. @sitaramc @gitster

    git-difftool: allow skipping file by typing 'n' at prompt

    sitaramc committed with gitster Oct 8, 2011
    This is useful if you forgot to restrict the diff to the paths you want
    to see, or selecting precisely the ones you want is too much typing.
    
    [jc: with a change to return from the function upon 'n' by Charles Bailey
    and a small tweak in stdin_doesnot_contain() in the test]
    
    Signed-off-by: Sitaram Chamarty <sitaram@atc.tcs.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 19, 2011
  1. @davvid @gitster

    difftool--helper: Make style consistent with git

    davvid committed with gitster Aug 18, 2011
    Use the predominant conditional style where "then" appears
    alone on the line after the test expression.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 16, 2010
  1. @mjg @gitster

    difftool: provide basename to external tools

    mjg committed with gitster Dec 14, 2010
    Currently, only configured diff helpers get the basename of the file
    being compared. Tools specified with "git difftool -x" only get the
    names of temporary files for the different versions.
    
    Export BASE so that an external tool can read the name from the
    environment. Rather than using a third argument, this avoids breaking
    existing scripts which may somewhat carelessly be using "$@" rather than
    "$1" "$2".
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 22, 2010
  1. @sschuberth @gitster

    Make difftool.prompt fall back to mergetool.prompt

    sschuberth committed with gitster Jan 22, 2010
    The documentation states that "git-difftool falls back to git-mergetool
    config variables when the difftool equivalents have not been defined".
    Until now, this was not the case for "difftool.prompt".
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
    Acked-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 16, 2010
  1. @davvid @gitster

    difftool: Update copyright notices to list each year separately

    davvid committed with gitster Jan 15, 2010
    This is http://www.gnu.org/licenses/gpl-howto.html advises.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 15, 2010
  1. @davvid @gitster

    difftool: Use eval to expand '--extcmd' expressions

    davvid committed with gitster Jan 15, 2010
    It was not possible to pass quoted commands to '--extcmd'.
    By using 'eval' we ensure that expressions with spaces and
    quotes are supported.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 10, 2010
  1. @davvid @gitster

    difftool: Allow specifying unconfigured commands with --extcmd

    davvid committed with gitster Jan 9, 2010
    git-difftool requires difftool.<tool>.cmd configuration even when
    tools use the standard "$diffcmd $from $to" form.  This teaches
    git-difftool to run these tools in lieu of configuration by
    allowing the command to be specified on the command line.
    
    Reference: http://article.gmane.org/gmane.comp.version-control.git/133377
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @davvid @gitster

    difftool--helper: Remove use of the GIT_MERGE_TOOL variable

    davvid committed with gitster Jan 9, 2010
    An undocumented mis-feature in git-difftool is that it allows you
    to specify a default difftool by setting GIT_MERGE_TOOL.
    This behavior was never documented and was included as an
    oversight back when git-difftool was maintained outside of git.
    
    git-mergetool never honored GIT_MERGE_TOOL so neither should
    git-difftool.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @davvid @gitster

    difftool--helper: Update copyright and remove distracting comments

    davvid committed with gitster Jan 9, 2010
    Some of the comments in git-difftool--helper are not needed because
    the code is sufficiently readable without them.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 12, 2009
  1. @davvid @gitster

    mergetool--lib: simplify API usage by removing more global variables

    davvid committed with gitster Apr 11, 2009
    The mergetool--lib scriplet was tricky to use because it relied upon
    the existance of several global shell variables.  This removes more
    global variables so that things are simpler for callers.
    
    A side effect is that some variables are recomputed each time
    run_merge_tool() is called, but the overhead for recomputing
    them is justified by the simpler implementation.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 8, 2009
  1. @davvid @gitster

    difftool/mergetool: refactor commands to use git-mergetool--lib

    davvid committed with gitster Apr 8, 2009
    This consolidates the common functionality from git-mergetool and
    git-difftool--helper into a single git-mergetool--lib scriptlet.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @davvid @gitster

    difftool: add support for a difftool.prompt config variable

    davvid committed with gitster Apr 7, 2009
    difftool now supports difftool.prompt so that users do not have to
    pass --no-prompt or hit enter each time a diff tool is launched.
    The --prompt flag overrides the configuration variable.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @davvid @gitster

    difftool: move 'git-difftool' out of contrib

    davvid committed with gitster Apr 7, 2009
    This prepares 'git-difftool' and its documentation for
    mainstream use.
    
    'git-difftool-helper' became 'git-difftool--helper'
    since users should not use it directly.
    
    'git-difftool' was added to the list of commands as
    an ancillaryinterrogator.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.