aboutsummaryrefslogtreecommitdiffstats
path: root/t/t7800-difftool.sh
AgeCommit message (Expand)AuthorFilesLines
2024-03-22t7800: use single quotes for test bodiesPatrick Steinhardt1-20/+20
2024-03-22t7800: improve test descriptions with empty argumentsPatrick Steinhardt1-8/+8
2024-02-20git-difftool--helper: honor `--trust-exit-code` with `--dir-diff`Patrick Steinhardt1-45/+54
2023-11-02tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano1-2/+2
2023-04-05mergetool: new config guiDefault supports auto-toggling gui by DISPLAYTao Klerks1-0/+52
2022-10-06Sync with 2.33.5Taylor Blau1-0/+1
2022-10-06Sync with 2.32.4Taylor Blau1-0/+1
2022-10-06Sync with 2.30.6Taylor Blau1-0/+1
2022-10-01t/t7NNN: allow local submodulesTaylor Blau1-0/+1
2021-10-12Merge branch 'da/difftool-dir-diff-symlink-fix' into maintJunio C Hamano1-2/+65
2021-09-30difftool: create a tmpdir path without repeated slashesDavid Aguilar1-0/+7
2021-09-23Merge branch 'da/difftool-dir-diff-symlink-fix' into da/difftoolJunio C Hamano1-2/+65
2021-09-23difftool: fix symlink-file writing in dir-diff modeDavid Aguilar1-2/+65
2021-06-08t: fix whitespace around &&Andrei Rybak1-1/+1
2021-02-22difftool.c: learn a new way start at specified fileZheNing Hu1-0/+32
2021-02-10Merge branch 'sg/t7800-difftool-robustify'Junio C Hamano1-19/+19
2021-01-09t7800-difftool: don't accidentally match tmp dirsSZEDER Gábor1-19/+19
2020-11-19t7[5-9]*: adjust the references to the default branch name "main"Johannes Schindelin1-20/+20
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2020-11-11t7800: simplify difftool testJinoh Kang1-19/+9
2020-11-06diff: allow passing NULL to diff_free_filespec_data()Jinoh Kang1-0/+23
2020-07-01difftool -d: ensure that intent-to-add files are handled correctlyJohannes Schindelin1-0/+8
2020-01-16t7800: don't rely on reuse_worktree_file()Jeff King1-3/+2
2019-05-19Merge branch 'dl/difftool-mergetool'Junio C Hamano1-0/+24
2019-05-13difftool: fallback on merge.guitoolDenton Liu1-0/+16
2019-05-13difftool: make --gui, --tool and --extcmd mutually exclusiveDenton Liu1-0/+8
2019-03-18difftool: allow running outside Git worktrees with --no-indexJohannes Schindelin1-0/+10
2019-01-27parse-options: disable option abbreviation with PARSE_OPT_KEEP_UNKNOWNNguyễn Thái Ngọc Duy1-2/+2
2018-11-13Merge branch 'js/mingw-utf8-env'Junio C Hamano1-1/+1
2018-10-31t7800: fix quotingJohannes Schindelin1-1/+1
2018-10-07t/*: fix ordering of expected/observed argumentsMatthew DeVore1-1/+1
2017-05-11tests: fix tests broken under GETTEXT_POISON=YesPleaseÆvar Arnfjörð Bjarmason1-2/+2
2017-04-13difftool: fix use-after-freeJohannes Schindelin1-0/+19
2017-03-15difftool: handle modified symlinks in dir-diff modeDavid Aguilar1-0/+60
2017-03-15t7800: cleanup cruft left behind by testsDavid Aguilar1-1/+4
2017-03-15t7800: remove whitespace before redirectDavid Aguilar1-1/+1
2017-02-08t7800: replace "wc -l" with test_line_countDavid Aguilar1-12/+19
2017-02-08Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanupJunio C Hamano1-3/+41
2017-02-08t7800: simplify basic usage testDavid Aguilar1-8/+7
2017-02-06difftool: fix bug when printing usageDavid Aguilar1-0/+13
2017-01-19difftool: retire the scripted versionJohannes Schindelin1-48/+46
2017-01-17difftool: add a skeleton for the upcoming builtinJohannes Schindelin1-0/+2
2016-12-08difftool: fix dir-diff index creation when in a subdirectoryDavid Aguilar1-3/+41
2016-08-15difftool: always honor fatal error exit codesJohn Keeping1-0/+6
2016-08-12Merge branch 'jk/difftool-in-subdir' into maintJunio C Hamano1-0/+14
2016-07-28difftool: avoid $GIT_DIR and $GIT_WORK_TREEDavid Aguilar1-0/+14
2016-07-11Merge branch 'ak/t7800-wo-readlink' into maintJunio C Hamano1-1/+1
2016-06-21t7800: readlink may not be availableArmin Kunaschik1-1/+1
2016-05-23Merge branch 'da/difftool'Junio C Hamano1-0/+23
2016-05-16difftool: handle unmerged files in dir-diff modeDavid Aguilar1-0/+23
2016-05-03Merge branch 'nf/mergetool-prompt'Junio C Hamano1-1/+1
2016-04-25difftool/mergetool: make the form of yes/no questions consistentNikola Forró1-1/+1
2016-01-28mingw: work around pwd issues in the testsJohannes Schindelin1-7/+7
2015-12-11Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maintJunio C Hamano1-4/+4
2015-11-03Merge branch 'da/difftool'Junio C Hamano1-0/+19
2015-10-29difftool: ignore symbolic links in use_wt_fileDavid Aguilar1-0/+19
2015-09-08t7800: don't use test_config in a subshellJohn Keeping1-4/+4
2014-11-14difftool: honor --trust-exit-code for builtin toolsDavid Aguilar1-0/+5
2014-10-28difftool: add support for --trust-exit-codeDavid Aguilar1-0/+43
2014-10-27difftool--helper: exit when reading a prompt answer failsJohannes Sixt1-0/+8
2014-04-21run_external_diff: clean up error handlingJeff King1-1/+1
2014-03-05t7800: add a difftool test for .git-filesJunio C Hamano1-0/+14
2013-05-29difftool --dir-diff: allow changing any clean working tree fileKenichi Saita1-0/+19
2013-05-17difftool: fix dir-diff when file does not exist in working treeJohn Keeping1-0/+7
2013-03-29t7800: run --dir-diff tests with and without symlinksJohn Keeping1-8/+19
2013-03-29t7800: fix tests when difftool uses --no-symlinksJohn Keeping1-1/+1
2013-03-29t7800: don't hide grep outputJohn Keeping1-27/+17
2013-03-29difftool: don't overwrite modified filesJohn Keeping1-0/+30
2013-03-29t7800: move '--symlinks' specific test to the endJohn Keeping1-15/+15
2013-03-28Merge branch 'jk/difftool-dir-diff-edit-fix'Junio C Hamano1-0/+22
2013-03-14difftool --dir-diff: symlink all files matching the working treeJohn Keeping1-0/+22
2013-02-21t7800: "defaults" is no longer a builtin tool nameDavid Aguilar1-2/+2
2013-02-20t7800: modernize testsDavid Aguilar1-198/+168
2013-02-19t7800: update copyright noticeDavid Aguilar1-1/+1
2012-09-25mergetool--lib: Allow custom commands to override built-insDavid Aguilar1-0/+11
2012-05-07Merge branch 'th/difftool-diffall'Junio C Hamano1-0/+57
2012-04-23difftool: print list of valid tools with '--tool-help'Tim Henigan1-0/+5
2012-04-23difftool: teach difftool to handle directory diffsTim Henigan1-0/+39
2012-03-23difftool: add '--no-gui' optionTim Henigan1-0/+13
2012-03-19t7800: Test difftool passing arguments to diffDavid Aguilar1-0/+11
2011-10-14t7800: avoid arithmetic expansion notationJunio C Hamano1-2/+2
2011-10-10git-difftool: allow skipping file by typing 'n' at promptSitaram Chamarty1-1/+42
2011-08-11test: consolidate definition of $LFJunio C Hamano1-3/+0
2010-10-06t7800 (difftool): add missing &&Elijah Newren1-6/+6
2010-08-18t/t7800-difftool.sh: Skip with prereq on no PERLÆvar Arnfjörð Bjarmason1-27/+22
2010-06-25tests: Skip tests in a way that makes sense under TAPÆvar Arnfjörð Bjarmason1-1/+1
2010-03-28difftool: Fix '--gui' when diff.guitool is unconfiguredDavid Aguilar1-0/+9
2010-01-22t7800-difftool.sh: Test mergetool.prompt fallbackDavid Aguilar1-0/+12
2010-01-15difftool: Update copyright notices to list each year separatelyDavid Aguilar1-1/+1
2010-01-15difftool: Use eval to expand '--extcmd' expressionsDavid Aguilar1-0/+13
2010-01-15difftool: Add '-x' and as an alias for '--extcmd'David Aguilar1-0/+8
2010-01-15t7800-difftool.sh: Simplify the --extcmd testDavid Aguilar1-8/+5
2010-01-09difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar1-1/+18
2010-01-09difftool--helper: Remove use of the GIT_MERGE_TOOL variableDavid Aguilar1-9/+0
2010-01-03git-difftool: Add '--gui' for selecting a GUI toolDavid Aguilar1-0/+12
2010-01-03t7800-difftool: Set a bogus tool for use by testsDavid Aguilar1-1/+2
2009-10-24t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT testMarkus Heidelberg1-1/+1
2009-04-24t7800: respect NO_PERLJeff King1-0/+5
2009-04-07difftool: add support for a difftool.prompt config variableDavid Aguilar1-0/+64
2009-04-07difftool: add various git-difftool testsDavid Aguilar1-0/+147
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-16 22:14:07 +0000