{"thread":{"id":"45034","subject":"[PATCH v2 3/7] completion: improve bash completion for git-add","startedAt":"2017-02-03T11:02:30Z","lastAt":"2017-02-07T09:00:16Z","messageCount":10,"participants":["cornelius.weig@tngtech.com","Junio C Hamano","Johannes Sixt"],"isPatch":true,"patchVersion":2,"patchTotal":7},"messages":[{"id":"310795","messageId":"20170203110159.377-4-cornelius.weig@tngtech.com","threadId":"45034","inReplyTo":"20170203110159.377-1-cornelius.weig@tngtech.com","subject":"[PATCH v2 3/7] completion: improve bash completion for git-add","fromName":"","fromEmail":"cornelius.weig@tngtech.com","sentAt":"2017-02-03T11:01:55Z","receivedAt":"2017-02-03T11:02:30Z","isPatch":true,"sender":{"key":"cornelius.weig@tngtech.com","avatar":null},"body":"From: Cornelius Weig <cornelius.weig@tngtech.com>\n\nCommand completion for git-add did not recognize some long-options.\nThis commits adds completion for all long-options that are mentioned in\nthe man-page synopsis. In addition, if the user specified `--update` or\n`-u`, path completion will only suggest modified tracked files.\n\nSigned-off-by: Cornelius Weig <cornelius.weig@tngtech.com>\nReviewed-by: SZEDER Gábor <szeder.dev@gmail.com>\n---\n contrib/completion/git-completion.bash | 10 +++++++---\n 1 file changed, 7 insertions(+), 3 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 8329f09..652c7e2 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -947,13 +947,17 @@ _git_add ()\n \t--*)\n \t\t__gitcomp \"\n \t\t\t--interactive --refresh --patch --update --dry-run\n-\t\t\t--ignore-errors --intent-to-add\n+\t\t\t--ignore-errors --intent-to-add --force --edit --chmod=\n \t\t\t\"\n \t\treturn\n \tesac\n \n-\t# XXX should we check for --update and --all options ?\n-\t__git_complete_index_file \"--others --modified --directory --no-empty-directory\"\n+\tlocal complete_opt=\"--others --modified --directory --no-empty-directory\"\n+\tif test -n \"$(__git_find_on_cmdline \"-u --update\")\"\n+\tthen\n+\t\tcomplete_opt=\"--modified\"\n+\tfi\n+\t__git_complete_index_file \"$complete_opt\"\n }\n \n _git_archive ()\n-- \n2.10.2\n\n"},{"id":"310796","messageId":"20170203110159.377-5-cornelius.weig@tngtech.com","threadId":"45034","inReplyTo":"20170203110159.377-1-cornelius.weig@tngtech.com","subject":"[PATCH v2 4/7] completion: teach ls-remote to complete options","fromName":"","fromEmail":"cornelius.weig@tngtech.com","sentAt":"2017-02-03T11:01:56Z","receivedAt":"2017-02-03T11:02:33Z","isPatch":true,"sender":{"key":"cornelius.weig@tngtech.com","avatar":null},"body":"From: Cornelius Weig <cornelius.weig@tngtech.com>\n\nls-remote needs to complete remote names and its own options. In\naddition to the existing remote name completions, do also complete\nthe options --heads, --tags, --refs, --get-url, and --symref.\n\nSigned-off-by: Cornelius Weig <cornelius.weig@tngtech.com>\nReviewed-by: SZEDER Gábor <szeder.dev@gmail.com>\n---\n contrib/completion/git-completion.bash | 6 ++++++\n 1 file changed, 6 insertions(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 652c7e2..a355eeb 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1449,6 +1449,12 @@ _git_ls_files ()\n \n _git_ls_remote ()\n {\n+\tcase \"$cur\" in\n+\t--*)\n+\t\t__gitcomp \"--heads --tags --refs --get-url --symref\"\n+\t\treturn\n+\t\t;;\n+\tesac\n \t__gitcomp_nl \"$(__git_remotes)\"\n }\n \n-- \n2.10.2\n\n"},{"id":"310797","messageId":"20170203110159.377-8-cornelius.weig@tngtech.com","threadId":"45034","inReplyTo":"20170203110159.377-1-cornelius.weig@tngtech.com","subject":"[PATCH v2 7/7] completion: recognize more long-options","fromName":"","fromEmail":"cornelius.weig@tngtech.com","sentAt":"2017-02-03T11:01:59Z","receivedAt":"2017-02-03T11:02:36Z","isPatch":true,"sender":{"key":"cornelius.weig@tngtech.com","avatar":null},"body":"From: Cornelius Weig <cornelius.weig@tngtech.com>\n\nCommand completion only recognizes a subset of the available options for\nthe various git commands. The set of recognized options needs to balance\nbetween having all useful options and to not clutter the terminal.\n\nThis commit adds all long-options that are mentioned in the man-page\nsynopsis of the respective git command. Possibly dangerous options are\nnot included in this set, to avoid accidental data loss. The added\noptions are:\n\n - apply: --recount --directory=\n - archive: --output\n - branch: --column --no-column --sort= --points-at\n - clone: --no-single-branch --shallow-submodules\n - commit: --patch --short --date --allow-empty\n - describe: --first-parent\n - fetch, pull: --unshallow --update-shallow\n - fsck: --name-objects\n - grep: --break --heading --show-function --function-context\n         --untracked --no-index\n - mergetool: --prompt --no-prompt\n - reset: --keep\n - revert: --strategy= --strategy-option=\n - shortlog: --email\n - tag: --merged --no-merged --create-reflog\n\nSigned-off-by: Cornelius Weig <cornelius.weig@tngtech.com>\nHelped-by: Johannes Sixt <j6t@kdbg.org>\nReviewed-by: SZEDER Gábor <szeder.dev@gmail.com>\n---\n contrib/completion/git-completion.bash | 29 ++++++++++++++++++++---------\n 1 file changed, 20 insertions(+), 9 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex d8960cf..3545f6a 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -936,6 +936,7 @@ _git_apply ()\n \t\t\t--apply --no-add --exclude=\n \t\t\t--ignore-whitespace --ignore-space-change\n \t\t\t--whitespace= --inaccurate-eof --verbose\n+\t\t\t--recount --directory=\n \t\t\t\"\n \t\treturn\n \tesac\n@@ -974,7 +975,7 @@ _git_archive ()\n \t--*)\n \t\t__gitcomp \"\n \t\t\t--format= --list --verbose\n-\t\t\t--prefix= --remote= --exec=\n+\t\t\t--prefix= --remote= --exec= --output\n \t\t\t\"\n \t\treturn\n \t\t;;\n@@ -1029,6 +1030,7 @@ _git_branch ()\n \t\t\t--track --no-track --contains --merged --no-merged\n \t\t\t--set-upstream-to= --edit-description --list\n \t\t\t--unset-upstream --delete --move --remotes\n+\t\t\t--column --no-column --sort= --points-at\n \t\t\t\"\n \t\t;;\n \t*)\n@@ -1142,6 +1144,8 @@ _git_clone ()\n \t\t\t--single-branch\n \t\t\t--branch\n \t\t\t--recurse-submodules\n+\t\t\t--no-single-branch\n+\t\t\t--shallow-submodules\n \t\t\t\"\n \t\treturn\n \t\t;;\n@@ -1183,6 +1187,7 @@ _git_commit ()\n \t\t\t--reset-author --file= --message= --template=\n \t\t\t--cleanup= --untracked-files --untracked-files=\n \t\t\t--verbose --quiet --fixup= --squash=\n+\t\t\t--patch --short --date --allow-empty\n \t\t\t\"\n \t\treturn\n \tesac\n@@ -1201,7 +1206,7 @@ _git_describe ()\n \t--*)\n \t\t__gitcomp \"\n \t\t\t--all --tags --contains --abbrev= --candidates=\n-\t\t\t--exact-match --debug --long --match --always\n+\t\t\t--exact-match --debug --long --match --always --first-parent\n \t\t\t\"\n \t\treturn\n \tesac\n@@ -1284,6 +1289,7 @@ __git_fetch_recurse_submodules=\"yes on-demand no\"\n __git_fetch_options=\"\n \t--quiet --verbose --append --upload-pack --force --keep --depth=\n \t--tags --no-tags --all --prune --dry-run --recurse-submodules=\n+\t--unshallow --update-shallow\n \"\n \n _git_fetch ()\n@@ -1333,7 +1339,7 @@ _git_fsck ()\n \t--*)\n \t\t__gitcomp \"\n \t\t\t--tags --root --unreachable --cache --no-reflogs --full\n-\t\t\t--strict --verbose --lost-found\n+\t\t\t--strict --verbose --lost-found --name-objects\n \t\t\t\"\n \t\treturn\n \t\t;;\n@@ -1377,6 +1383,8 @@ _git_grep ()\n \t\t\t--max-depth\n \t\t\t--count\n \t\t\t--and --or --not --all-match\n+\t\t\t--break --heading --show-function --function-context\n+\t\t\t--untracked --no-index\n \t\t\t\"\n \t\treturn\n \t\t;;\n@@ -1576,7 +1584,7 @@ _git_mergetool ()\n \t\treturn\n \t\t;;\n \t--*)\n-\t\t__gitcomp \"--tool=\"\n+\t\t__gitcomp \"--tool= --prompt --no-prompt\"\n \t\treturn\n \t\t;;\n \tesac\n@@ -2465,7 +2473,7 @@ _git_reset ()\n \n \tcase \"$cur\" in\n \t--*)\n-\t\t__gitcomp \"--merge --mixed --hard --soft --patch\"\n+\t\t__gitcomp \"--merge --mixed --hard --soft --patch --keep\"\n \t\treturn\n \t\t;;\n \tesac\n@@ -2481,7 +2489,10 @@ _git_revert ()\n \tfi\n \tcase \"$cur\" in\n \t--*)\n-\t\t__gitcomp \"--edit --mainline --no-edit --no-commit --signoff\"\n+\t\t__gitcomp \"\n+\t\t\t--edit --mainline --no-edit --no-commit --signoff\n+\t\t\t--strategy= --strategy-option=\n+\t\t\t\"\n \t\treturn\n \t\t;;\n \tesac\n@@ -2509,7 +2520,7 @@ _git_shortlog ()\n \t\t__gitcomp \"\n \t\t\t$__git_log_common_options\n \t\t\t$__git_log_shortlog_options\n-\t\t\t--numbered --summary\n+\t\t\t--numbered --summary --email\n \t\t\t\"\n \t\treturn\n \t\t;;\n@@ -2787,8 +2798,8 @@ _git_tag ()\n \t--*)\n \t\t__gitcomp \"\n \t\t\t--list --delete --verify --annotate --message --file\n-\t\t\t--sign --cleanup --local-user --force --column --sort\n-\t\t\t--contains --points-at\n+\t\t\t--sign --cleanup --local-user --force --column --sort=\n+\t\t\t--contains --points-at --merged --no-merged --create-reflog\n \t\t\t\"\n \t\t;;\n \tesac\n-- \n2.10.2\n\n"},{"id":"310798","messageId":"20170203110159.377-6-cornelius.weig@tngtech.com","threadId":"45034","inReplyTo":"20170203110159.377-1-cornelius.weig@tngtech.com","subject":"[PATCH v2 5/7] completion: teach replace to complete options","fromName":"","fromEmail":"cornelius.weig@tngtech.com","sentAt":"2017-02-03T11:01:57Z","receivedAt":"2017-02-03T11:02:37Z","isPatch":true,"sender":{"key":"cornelius.weig@tngtech.com","avatar":null},"body":"From: Cornelius Weig <cornelius.weig@tngtech.com>\n\nGit-replace needs to complete references and its own options. In\naddition to the existing references completions, do also complete the\noptions --edit --graft --format= --list --delete.\n\nSigned-off-by: Cornelius Weig <cornelius.weig@tngtech.com>\nReviewed-by: SZEDER Gábor <szeder.dev@gmail.com>\n---\n contrib/completion/git-completion.bash | 6 ++++++\n 1 file changed, 6 insertions(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex a355eeb..4841036 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -2408,6 +2408,12 @@ _git_remote ()\n \n _git_replace ()\n {\n+\tcase \"$cur\" in\n+\t--*)\n+\t\t__gitcomp \"--edit --graft --format= --list --delete\"\n+\t\treturn\n+\t\t;;\n+\tesac\n \t__gitcomp_nl \"$(__git_refs)\"\n }\n \n-- \n2.10.2\n\n"},{"id":"310799","messageId":"20170203110159.377-7-cornelius.weig@tngtech.com","threadId":"45034","inReplyTo":"20170203110159.377-1-cornelius.weig@tngtech.com","subject":"[PATCH v2 6/7] completion: teach remote subcommands to complete options","fromName":"","fromEmail":"cornelius.weig@tngtech.com","sentAt":"2017-02-03T11:01:58Z","receivedAt":"2017-02-03T11:02:40Z","isPatch":true,"sender":{"key":"cornelius.weig@tngtech.com","avatar":null},"body":"From: Cornelius Weig <cornelius.weig@tngtech.com>\n\nGit-remote needs to complete remote names, its subcommands, and options\nthereof. In addition to the existing subcommand and remote name\ncompletion, do also complete the options\n\n - add: --track --master --fetch --tags --no-tags --mirror=\n - set-url: --push --add --delete\n - get-url: --push --all\n - prune: --dry-run\n\nSigned-off-by: Cornelius Weig <cornelius.weig@tngtech.com>\nReviewed-by: SZEDER Gábor <szeder.dev@gmail.com>\n---\n contrib/completion/git-completion.bash | 45 ++++++++++++++++++++++++++++------\n 1 file changed, 38 insertions(+), 7 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 4841036..d8960cf 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -2384,24 +2384,55 @@ _git_config ()\n \n _git_remote ()\n {\n-\tlocal subcommands=\"add rename remove set-head set-branches set-url show prune update\"\n+\tlocal subcommands=\"\n+\t\tadd rename remove set-head set-branches\n+\t\tget-url set-url show prune update\n+\t\t\"\n \tlocal subcommand=\"$(__git_find_on_cmdline \"$subcommands\")\"\n \tif [ -z \"$subcommand\" ]; then\n-\t\t__gitcomp \"$subcommands\"\n+\t\tcase \"$cur\" in\n+\t\t--*)\n+\t\t\t__gitcomp \"--verbose\"\n+\t\t\t;;\n+\t\t*)\n+\t\t\t__gitcomp \"$subcommands\"\n+\t\t\t;;\n+\t\tesac\n \t\treturn\n \tfi\n \n-\tcase \"$subcommand\" in\n-\trename|remove|set-url|show|prune)\n-\t\t__gitcomp_nl \"$(__git_remotes)\"\n+\tcase \"$subcommand,$cur\" in\n+\tadd,--*)\n+\t\t__gitcomp \"--track --master --fetch --tags --no-tags --mirror=\"\n+\t\t;;\n+\tadd,*)\n+\t\t;;\n+\tset-head,--*)\n+\t\t__gitcomp \"--auto --delete\"\n \t\t;;\n-\tset-head|set-branches)\n+\tset-branches,--*)\n+\t\t__gitcomp \"--add\"\n+\t\t;;\n+\tset-head,*|set-branches,*)\n \t\t__git_complete_remote_or_refspec\n \t\t;;\n-\tupdate)\n+\tupdate,--*)\n+\t\t__gitcomp \"--prune\"\n+\t\t;;\n+\tupdate,*)\n \t\t__gitcomp \"$(__git_get_config_variables \"remotes\")\"\n \t\t;;\n+\tset-url,--*)\n+\t\t__gitcomp \"--push --add --delete\"\n+\t\t;;\n+\tget-url,--*)\n+\t\t__gitcomp \"--push --all\"\n+\t\t;;\n+\tprune,--*)\n+\t\t__gitcomp \"--dry-run\"\n+\t\t;;\n \t*)\n+\t\t__gitcomp_nl \"$(__git_remotes)\"\n \t\t;;\n \tesac\n }\n-- \n2.10.2\n\n"},{"id":"310800","messageId":"20170203110159.377-2-cornelius.weig@tngtech.com","threadId":"45034","inReplyTo":"20170203110159.377-1-cornelius.weig@tngtech.com","subject":"[PATCH v2 1/7] completion: teach submodule subcommands to complete options","fromName":"","fromEmail":"cornelius.weig@tngtech.com","sentAt":"2017-02-03T11:01:53Z","receivedAt":"2017-02-03T11:02:43Z","isPatch":true,"sender":{"key":"cornelius.weig@tngtech.com","avatar":null},"body":"From: Cornelius Weig <cornelius.weig@tngtech.com>\n\nEach submodule subcommand has specific long-options. Therefore, teach\nbash completion to support option completion based on the current\nsubcommand. All long-options that are mentioned in the man-page synopsis\nare added.\n\nSigned-off-by: Cornelius Weig <cornelius.weig@tngtech.com>\nReviewed-by: SZEDER Gábor <szeder.dev@gmail.com>\n---\n contrib/completion/git-completion.bash | 32 ++++++++++++++++++++++++++++++--\n 1 file changed, 30 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 6721ff8..c54a557 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -2556,10 +2556,11 @@ _git_submodule ()\n \t__git_has_doubledash && return\n \n \tlocal subcommands=\"add status init deinit update summary foreach sync\"\n-\tif [ -z \"$(__git_find_on_cmdline \"$subcommands\")\" ]; then\n+\tlocal subcommand=\"$(__git_find_on_cmdline \"$subcommands\")\"\n+\tif [ -z \"$subcommand\" ]; then\n \t\tcase \"$cur\" in\n \t\t--*)\n-\t\t\t__gitcomp \"--quiet --cached\"\n+\t\t\t__gitcomp \"--quiet\"\n \t\t\t;;\n \t\t*)\n \t\t\t__gitcomp \"$subcommands\"\n@@ -2567,6 +2568,33 @@ _git_submodule ()\n \t\tesac\n \t\treturn\n \tfi\n+\n+\tcase \"$subcommand,$cur\" in\n+\tadd,--*)\n+\t\t__gitcomp \"--branch --force --name --reference --depth\"\n+\t\t;;\n+\tstatus,--*)\n+\t\t__gitcomp \"--cached --recursive\"\n+\t\t;;\n+\tdeinit,--*)\n+\t\t__gitcomp \"--force --all\"\n+\t\t;;\n+\tupdate,--*)\n+\t\t__gitcomp \"\n+\t\t\t--init --remote --no-fetch\n+\t\t\t--recommend-shallow --no-recommend-shallow\n+\t\t\t--force --rebase --merge --reference --depth --recursive --jobs\n+\t\t\"\n+\t\t;;\n+\tsummary,--*)\n+\t\t__gitcomp \"--cached --files --summary-limit\"\n+\t\t;;\n+\tforeach,--*|sync,--*)\n+\t\t__gitcomp \"--recursive\"\n+\t\t;;\n+\t*)\n+\t\t;;\n+\tesac\n }\n \n _git_svn ()\n-- \n2.10.2\n\n"},{"id":"310801","messageId":"20170203110159.377-3-cornelius.weig@tngtech.com","threadId":"45034","inReplyTo":"20170203110159.377-1-cornelius.weig@tngtech.com","subject":"[PATCH v2 2/7] completion: add subcommand completion for rerere","fromName":"","fromEmail":"cornelius.weig@tngtech.com","sentAt":"2017-02-03T11:01:54Z","receivedAt":"2017-02-03T11:02:46Z","isPatch":true,"sender":{"key":"cornelius.weig@tngtech.com","avatar":null},"body":"From: Cornelius Weig <cornelius.weig@tngtech.com>\n\nManaging recorded resolutions requires command-line usage of git-rerere.\nAdded subcommand completion for rerere and path completion for its\nsubcommand forget.\n\nSigned-off-by: Cornelius Weig <cornelius.weig@tngtech.com>\nReviewed-by: SZEDER Gábor <szeder.dev@gmail.com>\n---\n contrib/completion/git-completion.bash | 11 +++++++++++\n 1 file changed, 11 insertions(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex c54a557..8329f09 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -2401,6 +2401,17 @@ _git_replace ()\n \t__gitcomp_nl \"$(__git_refs)\"\n }\n \n+_git_rerere ()\n+{\n+\tlocal subcommands=\"clear forget diff remaining status gc\"\n+\tlocal subcommand=\"$(__git_find_on_cmdline \"$subcommands\")\"\n+\tif test -z \"$subcommand\"\n+\tthen\n+\t\t__gitcomp \"$subcommands\"\n+\t\treturn\n+\tfi\n+}\n+\n _git_reset ()\n {\n \t__git_has_doubledash && return\n-- \n2.10.2\n\n"},{"id":"310802","messageId":"20170203110159.377-1-cornelius.weig@tngtech.com","threadId":"45034","inReplyTo":null,"subject":"[PATCH v2 0/7] completion bash: add more options and commands","fromName":"","fromEmail":"cornelius.weig@tngtech.com","sentAt":"2017-02-03T11:01:52Z","receivedAt":"2017-02-03T11:02:48Z","isPatch":true,"sender":{"key":"cornelius.weig@tngtech.com","avatar":null},"body":"From: Cornelius Weig <cornelius.weig@tngtech.com>\n\nThis is the re-roll of patch series <20170122225724.19360-1-cornelius.weig@tngtech.com>.\n\nThis patch series adds all long-options that are mentioned in the synopsis of\nthe man-page for the respective git-command. There are only a few exceptions,\nas discussed in the above thread. For example, no unsafe options should be\ncompleted.\nFurthermore, the patches add subommand option completion for git-submodule and\ngit-remote.\n\nChanges wrt first submission:\n\n - improve completion for git-remote set-head & set-branches\n - remove completion of unsafe options\n - improve commit messages\n - added sign-off :)\n - rebase to current master\n\nCornelius Weig (7):\n  completion: teach submodule subcommands to complete options\n  completion: add subcommand completion for rerere\n  completion: improve bash completion for git-add\n  completion: teach ls-remote to complete options\n  completion: teach replace to complete options\n  completion: teach remote subcommands to complete options\n  completion: recognize more long-options\n\n contrib/completion/git-completion.bash | 139 ++++++++++++++++++++++++++++-----\n 1 file changed, 118 insertions(+), 21 deletions(-)\n\n\nInterdiff since first iteration:\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 87d3d2c..3545f6a 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -936,7 +936,7 @@ _git_apply ()\n \t\t\t--apply --no-add --exclude=\n \t\t\t--ignore-whitespace --ignore-space-change\n \t\t\t--whitespace= --inaccurate-eof --verbose\n-\t\t\t--recount --directory= --unsafe-paths\n+\t\t\t--recount --directory=\n \t\t\t\"\n \t\treturn\n \tesac\n@@ -1459,7 +1459,7 @@ _git_ls_remote ()\n {\n \tcase \"$cur\" in\n \t--*)\n-\t\t__gitcomp \"--heads --tags --refs --get-url\"\n+\t\t__gitcomp \"--heads --tags --refs --get-url --symref\"\n \t\treturn\n \t\t;;\n \tesac\n@@ -2415,9 +2415,18 @@ _git_remote ()\n \t\t;;\n \tadd,*)\n \t\t;;\n+\tset-head,--*)\n+\t\t__gitcomp \"--auto --delete\"\n+\t\t;;\n+\tset-branches,--*)\n+\t\t__gitcomp \"--add\"\n+\t\t;;\n \tset-head,*|set-branches,*)\n \t\t__git_complete_remote_or_refspec\n \t\t;;\n+\tupdate,--*)\n+\t\t__gitcomp \"--prune\"\n+\t\t;;\n \tupdate,*)\n \t\t__gitcomp \"$(__git_get_config_variables \"remotes\")\"\n \t\t;;\n@@ -2494,7 +2503,7 @@ _git_rm ()\n {\n \tcase \"$cur\" in\n \t--*)\n-\t\t__gitcomp \"--cached --dry-run --ignore-unmatch --quiet --force\"\n+\t\t__gitcomp \"--cached --dry-run --ignore-unmatch --quiet\"\n \t\treturn\n \t\t;;\n \tesac\n\n-- \n2.10.2\n\n"},{"id":"310944","messageId":"xmqqd1ev100b.fsf@gitster.mtv.corp.google.com","threadId":"45034","inReplyTo":"20170203110159.377-1-cornelius.weig@tngtech.com","subject":"Re: [PATCH v2 0/7] completion bash: add more options and commands","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-02-06T21:29:24Z","receivedAt":"2017-02-06T21:29:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"cornelius.weig@tngtech.com writes:\n\n> From: Cornelius Weig <cornelius.weig@tngtech.com>\n>\n> This is the re-roll of patch series <20170122225724.19360-1-cornelius.weig@tngtech.com>.\n>\n> This patch series adds all long-options that are mentioned in the synopsis of\n> the man-page for the respective git-command. There are only a few exceptions,\n> as discussed in the above thread. For example, no unsafe options should be\n> completed.\n> Furthermore, the patches add subommand option completion for git-submodule and\n> git-remote.\n\nReviewers, do these look good now?\n\nThanks all.\n"},{"id":"310972","messageId":"5c8d6f15-e37f-f92f-5eb3-2e6224b2a92f@kdbg.org","threadId":"45034","inReplyTo":"xmqqd1ev100b.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH v2 0/7] completion bash: add more options and commands","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2017-02-07T09:00:03Z","receivedAt":"2017-02-07T09:00:16Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 06.02.2017 um 22:29 schrieb Junio C Hamano:\n> cornelius.weig@tngtech.com writes:\n>\n>> From: Cornelius Weig <cornelius.weig@tngtech.com>\n>>\n>> This is the re-roll of patch series <20170122225724.19360-1-cornelius.weig@tngtech.com>.\n>>\n>> This patch series adds all long-options that are mentioned in the synopsis of\n>> the man-page for the respective git-command. There are only a few exceptions,\n>> as discussed in the above thread. For example, no unsafe options should be\n>> completed.\n>> Furthermore, the patches add subommand option completion for git-submodule and\n>> git-remote.\n>\n> Reviewers, do these look good now?\n\nMy concerns have been addressed. The patches look good from a cursory read.\n\n-- Hannes\n\n"}]}