Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.22.2 2019-04-16T10:28:03Z 2019-04-16T10:28:03Z Junio C Hamano gitster@pobox.com 2019-04-16T10:28:03Z urn:sha1:8a9a837a639cb4ef4c0b84c277aec2c9eb7ec58d Third batch to teach the diff machinery to use the parse-options API. * nd/diff-parseopt-3: diff-parseopt: convert --submodule diff-parseopt: convert --ignore-submodules diff-parseopt: convert --textconv diff-parseopt: convert --ext-diff diff-parseopt: convert --quiet diff-parseopt: convert --exit-code diff-parseopt: convert --color-words diff-parseopt: convert --word-diff-regex diff-parseopt: convert --word-diff diff-parseopt: convert --[no-]color diff-parseopt: convert --[no-]follow diff-parseopt: convert -R diff-parseopt: convert -a|--text diff-parseopt: convert --full-index diff-parseopt: convert --binary diff-parseopt: convert --anchored diff-parseopt: convert --diff-algorithm diff-parseopt: convert --histogram diff-parseopt: convert --patience diff-parseopt: convert --[no-]indent-heuristic 2019-03-07T00:59:58Z Junio C Hamano gitster@pobox.com 2019-03-07T00:59:58Z urn:sha1:4ab0f138577aded469cded8760065ea2095959de Second batch to teach the diff machinery to use the parse-options API. * nd/diff-parseopt-2: (21 commits) diff-parseopt: convert --ignore-some-changes diff-parseopt: convert --[no-]minimal diff-parseopt: convert --relative diff-parseopt: convert --no-renames|--[no--rename-empty diff-parseopt: convert --find-copies-harder diff-parseopt: convert -C|--find-copies diff-parseopt: convert -D|--irreversible-delete diff-parseopt: convert -M|--find-renames diff-parseopt: convert -B|--break-rewrites diff-parseopt: convert --output-* diff-parseopt: convert --[no-]compact-summary diff-parseopt: convert --stat* diff-parseopt: convert -s|--no-patch diff-parseopt: convert --name-status diff-parseopt: convert --name-only diff-parseopt: convert --patch-with-stat diff-parseopt: convert --summary diff-parseopt: convert --check diff-parseopt: convert --dirstat and friends diff-parseopt: convert --numstat and --shortstat ... 2019-03-07T00:59:52Z Junio C Hamano gitster@pobox.com 2019-03-07T00:59:52Z urn:sha1:54b469b9e9a9f276a5980265cd2abeb003cb6bf3 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 2019-03-06T23:02:21Z Nguyễn Thái Ngọc Duy pclouds@gmail.com 2019-03-05T12:30:12Z urn:sha1:6d9af6f4dac4079e0ea14a86cbdf6790c1586fce Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2019-02-21T23:16:59Z Nguyễn Thái Ngọc Duy pclouds@gmail.com 2019-02-21T11:16:18Z urn:sha1:cdc43eb0b871992b42cff02ea9fe818c812c6dca For --rename-empty, see 90d43b0768 (teach diffcore-rename to optionally ignore empty content - 2012-03-22) for more information. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2019-02-21T23:16:59Z Nguyễn Thái Ngọc Duy pclouds@gmail.com 2019-02-21T11:16:12Z urn:sha1:af2f36809182c24ee92d3b13ed3cc5a1fb6e10df This also validates that the user specifies a single character in --output-indicator-*, not a string. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2019-02-21T23:16:58Z Nguyễn Thái Ngọc Duy pclouds@gmail.com 2019-02-21T11:16:03Z urn:sha1:4ce7aab5a56394914bd05b9e5fa4ca66404ec5f5 Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2019-01-29T20:47:53Z Junio C Hamano gitster@pobox.com 2019-01-29T20:47:53Z urn:sha1:15b07cba0b60f0fc5dea0be0d68a355a8161476d "git diff --color-moved-ws" updates. * pw/diff-color-moved-ws-fix: diff --color-moved-ws: handle blank lines diff --color-moved-ws: modify allow-indentation-change diff --color-moved-ws: optimize allow-indentation-change diff --color-moved=zebra: be stricter with color alternation diff --color-moved-ws: fix false positives diff --color-moved-ws: demonstrate false positives diff: allow --no-color-moved-ws Use "whitespace" consistently diff: document --no-color-moved 2019-01-28T00:28:18Z Nguyễn Thái Ngọc Duy pclouds@gmail.com 2019-01-27T00:35:33Z urn:sha1:d473e2e0e8eedf2ab07ddc545e00bff7c8f450e7 Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2019-01-10T18:37:59Z Phillip Wood phillip.wood@dunelm.org.uk 2018-11-23T11:16:52Z urn:sha1:b73bcbac4a9d8c76ccdda0f0ac4b122b8e96e4b7 Allow --no-color-moved-ws and --color-moved-ws=no to cancel any previous --color-moved-ws option. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>