From 706b3e7a0904e1608dbc806d767100872086891b Mon Sep 17 00:00:00 2001 From: Philippe Blain Date: Sun, 21 Jan 2024 04:07:48 +0000 Subject: [PATCH 1/4] completion: complete missing rev-list options Some options listed in rev-list-options.txt, and thus accepted by 'git log' and friends, are missing from the Bash completion script. Add them to __git_log_common_options. Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 8c40ade494..6108d523a1 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2071,6 +2071,16 @@ __git_log_common_options=" --min-age= --until= --before= --min-parents= --max-parents= --no-min-parents --no-max-parents + --alternate-refs --ancestry-path + --author-date-order --basic-regexp + --bisect --boundary --exclude-first-parent-only + --exclude-hidden --extended-regexp + --fixed-strings --grep-reflog + --ignore-missing --left-only --perl-regexp + --reflog --regexp-ignore-case --remove-empty + --right-only --show-linear-break + --show-notes-by-default --show-pulls + --since-as-filter --single-worktree " # Options that go well for log and gitk (not shortlog) __git_log_gitk_options=" From 2e419b0578aec45ba332a5d260442c409f73091d Mon Sep 17 00:00:00 2001 From: Philippe Blain Date: Sun, 21 Jan 2024 04:07:49 +0000 Subject: [PATCH 2/4] completion: complete --patch-with-raw Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 6108d523a1..ccb17f4ad7 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1807,7 +1807,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --output= --output-indicator-context= --output-indicator-new= --output-indicator-old= --ws-error-highlight= - --pickaxe-all --pickaxe-regex + --pickaxe-all --pickaxe-regex --patch-with-raw " # Options for diff/difftool From 6d1bfcdd2a14ac8e04fa269bbadbb3688e52a3a6 Mon Sep 17 00:00:00 2001 From: Philippe Blain Date: Sun, 21 Jan 2024 04:07:50 +0000 Subject: [PATCH 3/4] completion: complete --encoding The option --encoding is supported by 'git log' and 'git show', so add it to __git_log_show_options. Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index ccb17f4ad7..a7ae2cbe55 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2096,6 +2096,7 @@ __git_log_shortlog_options=" # Options accepted by log and show __git_log_show_options=" --diff-merges --diff-merges= --no-diff-merges --dd --remerge-diff + --encoding= " __git_diff_merges_opts="off none on first-parent 1 separate m combined c dense-combined cc remerge r" From 544ea7f37586ce619c5e14622ba73494661e9770 Mon Sep 17 00:00:00 2001 From: Philippe Blain Date: Sun, 21 Jan 2024 04:07:51 +0000 Subject: [PATCH 4/4] completion: complete missing 'git log' options Some options specific to 'git log' are missing from the Bash completion script. Add them to _git_log. Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index a7ae2cbe55..2f1412d85e 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2180,6 +2180,8 @@ _git_log () --no-walk --no-walk= --do-walk --parents --children --expand-tabs --expand-tabs= --no-expand-tabs + --clear-decorations --decorate-refs= + --decorate-refs-exclude= $merge $__git_diff_common_options "