提交 · cdb5330a9baa64c28473fb0f446ca2242d6971fb · 李少辉-开发者 / git

24 3月, 2019 20 次提交

由 Nguyễn Thái Ngọc Duy 提交于 3月 24, 2019

diff_opt_parse() is a heavy hammer to just set diff filter. But it's
the only way because of the diff_status_letters[] mapping. Add a new
API to set diff filter and use it in git-am. diff_opt_parse()'s only
remaining call site in revision.c will be gone soon and having it here
just because of git-am does not make sense.
Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

cdb5330a

diff --no-index: use parse_options() instead of diff_opt_parse() · 16bb3d71

由 Nguyễn Thái Ngọc Duy 提交于 3月 24, 2019

While at there, move exit() back to the caller. It's easier to see the
flow that way than burying it in diff-no-index.c
Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

16bb3d71

range-diff: use parse_options() instead of diff_opt_parse() · c380a48c

由 Nguyễn Thái Ngọc Duy 提交于 3月 24, 2019

Diff's internal option parsing is now done with 'struct option', which
makes it possible to combine all diff options to range-diff and parse
everything all at once. Parsing code becomes simpler, and we get a
looong 'git range-diff -h'
Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

c380a48c

diff.c: allow --no-color-moved-ws · bb987290

由 Nguyễn Thái Ngọc Duy 提交于 3月 24, 2019

This option is added in commit b73bcbac (diff: allow
--no-color-moved-ws - 2018-11-23) in pw/diff-color-moved-ws-fix. To ease
merge conflict resolution, re-implement the option handling here so that
the conflict could be resolved by taking this side of change.
Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

bb987290

diff-parseopt: convert --color-moved-ws · 8ce2020f

由 Nguyễn Thái Ngọc Duy 提交于 3月 24, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

8ce2020f

diff-parseopt: convert --[no-]color-moved · 59311a98

由 Nguyễn Thái Ngọc Duy 提交于 3月 24, 2019

Mark one more string for translation while at there
Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

59311a98

diff-parseopt: convert --inter-hunk-context · 16ed6c97

由 Nguyễn Thái Ngọc Duy 提交于 3月 24, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

16ed6c97

diff-parseopt: convert --no-prefix · 11c659d8

由 Nguyễn Thái Ngọc Duy 提交于 3月 24, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

11c659d8

diff-parseopt: convert --line-prefix · 2f81cf98

由 Nguyễn Thái Ngọc Duy 提交于 3月 24, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

2f81cf98

diff-parseopt: convert --[src|dst]-prefix · 31fba9d3

由 Nguyễn Thái Ngọc Duy 提交于 3月 24, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

31fba9d3

diff-parseopt: convert --[no-]abbrev · d8774183

由 Nguyễn Thái Ngọc Duy 提交于 3月 24, 2019

OPT__ABBREV() has the same behavior as the deleted code with one
difference: it does check for valid number and error out if not. And the
'40' change is self explanatory.
Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

d8774183

diff-parseopt: convert --diff-filter · d2d3f273

由 Nguyễn Thái Ngọc Duy 提交于 3月 24, 2019

While at it, mark one more string for translation
Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

d2d3f273

diff-parseopt: convert --find-object · a75f28cb

由 Nguyễn Thái Ngọc Duy 提交于 3月 24, 2019

While at it, mark one more string for translation.
Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

a75f28cb

diff-parseopt: convert -O · f731814b

由 Nguyễn Thái Ngọc Duy 提交于 3月 24, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

f731814b

N
diff-parseopt: convert --pickaxe-all|--pickaxe-regex · 85f8e889
由 Nguyễn Thái Ngọc Duy 提交于 3月 24, 2019
```
Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
```
85f8e889

diff-parseopt: convert -S|-G · a41cfb32

由 Nguyễn Thái Ngọc Duy 提交于 3月 24, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

a41cfb32

diff-parseopt: convert -l · bffee749

由 Nguyễn Thái Ngọc Duy 提交于 3月 24, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

bffee749

diff-parseopt: convert -z · 1a1eb164

由 Nguyễn Thái Ngọc Duy 提交于 3月 24, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

1a1eb164

N
diff-parseopt: convert --ita-[in]visible-in-index · 96860e48
由 Nguyễn Thái Ngọc Duy 提交于 3月 24, 2019
```
Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
```
96860e48

diff-parseopt: convert --ws-error-highlight · 5a749d9f

由 Nguyễn Thái Ngọc Duy 提交于 3月 24, 2019

Mark one more string for translation while at there.
Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

5a749d9f

07 3月, 2019 20 次提交

diff-parseopt: convert --submodule · 125dcea9

由 Nguyễn Thái Ngọc Duy 提交于 3月 05, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

125dcea9

diff-parseopt: convert --ignore-submodules · b680ee14

由 Nguyễn Thái Ngọc Duy 提交于 3月 05, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

b680ee14

diff-parseopt: convert --textconv · 8ab76977

由 Nguyễn Thái Ngọc Duy 提交于 3月 05, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

8ab76977

diff-parseopt: convert --ext-diff · 0cda1003

由 Nguyễn Thái Ngọc Duy 提交于 3月 05, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

0cda1003

diff-parseopt: convert --quiet · 9bbaf1ce

由 Nguyễn Thái Ngọc Duy 提交于 3月 05, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

9bbaf1ce

diff-parseopt: convert --exit-code · 1086ea0c

由 Nguyễn Thái Ngọc Duy 提交于 3月 05, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

1086ea0c

diff-parseopt: convert --color-words · 212db69d

由 Nguyễn Thái Ngọc Duy 提交于 3月 05, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

212db69d

diff-parseopt: convert --word-diff-regex · 797df119

由 Nguyễn Thái Ngọc Duy 提交于 3月 05, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

797df119

diff-parseopt: convert --word-diff · e9fb39b6

由 Nguyễn Thái Ngọc Duy 提交于 3月 05, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

e9fb39b6

diff-parseopt: convert --[no-]color · 8b81c26e

由 Nguyễn Thái Ngọc Duy 提交于 3月 05, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

8b81c26e

diff-parseopt: convert --[no-]follow · 1e9250b5

由 Nguyễn Thái Ngọc Duy 提交于 3月 05, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

1e9250b5

diff-parseopt: convert -R · 4f99f299

由 Nguyễn Thái Ngọc Duy 提交于 3月 05, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

4f99f299

diff-parseopt: convert -a|--text · c37d4c0a

由 Nguyễn Thái Ngọc Duy 提交于 3月 05, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

c37d4c0a

diff-parseopt: convert --full-index · 4fe01672

由 Nguyễn Thái Ngọc Duy 提交于 3月 05, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

4fe01672

diff-parseopt: convert --binary · 6d9af6f4

由 Nguyễn Thái Ngọc Duy 提交于 3月 05, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

6d9af6f4

diff-parseopt: convert --anchored · df84a436

由 Nguyễn Thái Ngọc Duy 提交于 3月 05, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

df84a436

diff-parseopt: convert --diff-algorithm · 10f35b1c

由 Nguyễn Thái Ngọc Duy 提交于 3月 05, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

10f35b1c

diff-parseopt: convert --histogram · f1e68ef5

由 Nguyễn Thái Ngọc Duy 提交于 3月 05, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

f1e68ef5

diff-parseopt: convert --patience · 31fd640e

由 Nguyễn Thái Ngọc Duy 提交于 3月 05, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

31fd640e

diff-parseopt: convert --[no-]indent-heuristic · 06f77518

由 Nguyễn Thái Ngọc Duy 提交于 3月 05, 2019

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

06f77518

李少辉-开发者 / git 与 Fork 源项目一致

李少辉-开发者 / git
与 Fork 源项目一致