diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-07 00:59:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 00:59:52 (GMT) |
| commit | 54b469b9e9a9f276a5980265cd2abeb003cb6bf3 (patch) | |
| tree | 3f49a8bb58e9a36a00a3556990ae9e39e0815eaf /t | |
| parent | 7d0c1f4556ad89b2f7eae97d31ea85c3bfdf7c87 (diff) | |
| parent | ed88148674502893790bf13d70154c157a489a6b (diff) | |
| download | git-54b469b9e9a9f276a5980265cd2abeb003cb6bf3.zip git-54b469b9e9a9f276a5980265cd2abeb003cb6bf3.tar.gz git-54b469b9e9a9f276a5980265cd2abeb003cb6bf3.tar.bz2 | |
Merge branch 'nd/diff-parseopt'
The diff machinery, one of the oldest parts of the system, which
long predates the parse-options API, uses fairly long and complex
handcrafted option parser. This is being rewritten to use the
parse-options API.
* nd/diff-parseopt:
diff.c: convert --raw
diff.c: convert -W|--[no-]function-context
diff.c: convert -U|--unified
diff.c: convert -u|-p|--patch
diff.c: prepare to use parse_options() for parsing
diff.h: avoid bit fields in struct diff_flags
diff.h: keep forward struct declarations sorted
parse-options: allow ll_callback with OPTION_CALLBACK
parse-options: avoid magic return codes
parse-options: stop abusing 'callback' for lowlevel callbacks
parse-options: add OPT_BITOP()
parse-options: disable option abbreviation with PARSE_OPT_KEEP_UNKNOWN
parse-options: add one-shot mode
parse-options.h: remove extern on function prototypes
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7800-difftool.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 22b9199..bb9a7f4 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -546,7 +546,7 @@ do done >actual EOF -test_expect_success SYMLINKS 'difftool --dir-diff --symlink without unstaged changes' ' +test_expect_success SYMLINKS 'difftool --dir-diff --symlinks without unstaged changes' ' cat >expect <<-EOF && file $PWD/file @@ -555,7 +555,7 @@ test_expect_success SYMLINKS 'difftool --dir-diff --symlink without unstaged cha sub/sub $PWD/sub/sub EOF - git difftool --dir-diff --symlink \ + git difftool --dir-diff --symlinks \ --extcmd "./.git/CHECK_SYMLINKS" branch HEAD && test_cmp expect actual ' |