{"thread":{"id":"19171","subject":"[PATCH 1/5] completion: add missing configuration variables to _git_config()","startedAt":"2009-05-04T06:25:31Z","lastAt":"2009-05-04T14:29:28Z","messageCount":6,"participants":["Stephen Boyd","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":5},"messages":[{"id":"112948","messageId":"1241418335-18474-1-git-send-email-bebarino@gmail.com","threadId":"19171","inReplyTo":null,"subject":"[PATCH 1/5] completion: add missing configuration variables to _git_config()","fromName":"Stephen Boyd","fromEmail":"bebarino@gmail.com","sentAt":"2009-05-04T06:25:31Z","receivedAt":"2009-05-04T06:25:31Z","isPatch":true,"sender":{"key":"bebarino@gmail.com","avatar":"https://avatars.githubusercontent.com/u/38832?v=4"},"body":"Signed-off-by: Stephen Boyd <bebarino@gmail.com>\n---\n contrib/completion/git-completion.bash |   48 ++++++++++++++++++++++++++++++++\n 1 files changed, 48 insertions(+), 0 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 1a90cb8..28682a7 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1393,6 +1393,7 @@ _git_config ()\n \t\t;;\n \tesac\n \t__gitcomp \"\n+\t\talias.\n \t\tapply.whitespace\n \t\tbranch.autosetupmerge\n \t\tbranch.autosetuprebase\n@@ -1410,6 +1411,9 @@ _git_config ()\n \t\tcolor.diff.old\n \t\tcolor.diff.plain\n \t\tcolor.diff.whitespace\n+\t\tcolor.grep\n+\t\tcolor.grep.external\n+\t\tcolor.grep.match\n \t\tcolor.interactive\n \t\tcolor.interactive.header\n \t\tcolor.interactive.help\n@@ -1427,6 +1431,7 @@ _git_config ()\n \t\tcore.autocrlf\n \t\tcore.bare\n \t\tcore.compression\n+\t\tcore.createObject\n \t\tcore.deltaBaseCacheLimit\n \t\tcore.editor\n \t\tcore.excludesfile\n@@ -1457,11 +1462,20 @@ _git_config ()\n \t\tdiff.renameLimit\n \t\tdiff.renameLimit.\n \t\tdiff.renames\n+\t\tdiff.suppressBlankEmpty\n+\t\tdiff.tool\n+\t\tdiff.wordRegex\n+\t\tdifftool.prompt\n \t\tfetch.unpackLimit\n+\t\tformat.attach\n+\t\tformat.cc\n \t\tformat.headers\n \t\tformat.numbered\n \t\tformat.pretty\n+\t\tformat.signoff\n+\t\tformat.subjectprefix\n \t\tformat.suffix\n+\t\tformat.thread\n \t\tgc.aggressiveWindow\n \t\tgc.auto\n \t\tgc.autopacklimit\n@@ -1472,6 +1486,7 @@ _git_config ()\n \t\tgc.rerereresolved\n \t\tgc.rerereunresolved\n \t\tgitcvs.allbinary\n+\t\tgitcvs.commitmsgannotation\n \t\tgitcvs.dbTableNamePrefix\n \t\tgitcvs.dbdriver\n \t\tgitcvs.dbname\n@@ -1506,13 +1521,23 @@ _git_config ()\n \t\thttp.sslVerify\n \t\ti18n.commitEncoding\n \t\ti18n.logOutputEncoding\n+\t\timap.folder\n+\t\timap.host\n+\t\timap.pass\n+\t\timap.port\n+\t\timap.preformattedHTML\n+\t\timap.sslverify\n+\t\timap.tunnel\n+\t\timap.user\n \t\tinstaweb.browser\n \t\tinstaweb.httpd\n \t\tinstaweb.local\n \t\tinstaweb.modulepath\n \t\tinstaweb.port\n+\t\tinteractive.singlekey\n \t\tlog.date\n \t\tlog.showroot\n+\t\tmailmap.file\n \t\tman.viewer\n \t\tmerge.conflictstyle\n \t\tmerge.log\n@@ -1521,6 +1546,7 @@ _git_config ()\n \t\tmerge.tool\n \t\tmerge.verbosity\n \t\tmergetool.keepBackup\n+\t\tmergetool.prompt\n \t\tpack.compression\n \t\tpack.deltaCacheLimit\n \t\tpack.deltaCacheSize\n@@ -1532,6 +1558,8 @@ _git_config ()\n \t\tpack.windowMemory\n \t\tpull.octopus\n \t\tpull.twohead\n+\t\tpush.default\n+\t\trebase.stat\n \t\treceive.denyCurrentBranch\n \t\treceive.denyDeletes\n \t\treceive.denyNonFastForwards\n@@ -1540,6 +1568,26 @@ _git_config ()\n \t\trepack.usedeltabaseoffset\n \t\trerere.autoupdate\n \t\trerere.enabled\n+\t\tsendemail.aliasesfile\n+\t\tsendemail.aliasesfiletype\n+\t\tsendemail.bcc\n+\t\tsendemail.cc\n+\t\tsendemail.cccmd\n+\t\tsendemail.chainreplyto\n+\t\tsendemail.confirm\n+\t\tsendemail.envelopesender\n+\t\tsendemail.multiedit\n+\t\tsendemail.signedoffbycc\n+\t\tsendemail.smtpencryption\n+\t\tsendemail.smtppass\n+\t\tsendemail.smtpserver\n+\t\tsendemail.smtpserverport\n+\t\tsendemail.smtpuser\n+\t\tsendemail.suppresscc\n+\t\tsendemail.suppressfrom\n+\t\tsendemail.thread\n+\t\tsendemail.to\n+\t\tsendemail.validate\n \t\tshowbranch.default\n \t\tstatus.relativePaths\n \t\tstatus.showUntrackedFiles\n-- \n1.6.2.3\n"},{"id":"112949","messageId":"1241418335-18474-2-git-send-email-bebarino@gmail.com","threadId":"19171","inReplyTo":"1241418335-18474-1-git-send-email-bebarino@gmail.com","subject":"[PATCH 2/5] completion: add {gui,diff,merge}tool, man, and pager config variables","fromName":"Stephen Boyd","fromEmail":"bebarino@gmail.com","sentAt":"2009-05-04T06:25:32Z","receivedAt":"2009-05-04T06:25:32Z","isPatch":true,"sender":{"key":"bebarino@gmail.com","avatar":"https://avatars.githubusercontent.com/u/38832?v=4"},"body":"Signed-off-by: Stephen Boyd <bebarino@gmail.com>\n---\n contrib/completion/git-completion.bash |   45 ++++++++++++++++++++++++++++++++\n 1 files changed, 45 insertions(+), 0 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 28682a7..ec02b06 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1376,6 +1376,39 @@ _git_config ()\n \t\t__gitcomp \"$(__git_heads)\" \"$pfx\" \"$cur\" \".\"\n \t\treturn\n \t\t;;\n+\tguitool.*.*)\n+\t\tlocal pfx=\"${cur%.*}.\"\n+\t\tcur=\"${cur##*.}\"\n+\t\t__gitcomp \"\n+\t\t\targprompt cmd confirm needsfile noconsole norescan\n+\t\t\tprompt revprompt revunmerged title\n+\t\t\t\" \"$pfx\" \"$cur\"\n+\t\treturn\n+\t\t;;\n+\tdifftool.*.*)\n+\t\tlocal pfx=\"${cur%.*}.\"\n+\t\tcur=\"${cur##*.}\"\n+\t\t__gitcomp \"cmd path\" \"$pfx\" \"$cur\"\n+\t\treturn\n+\t\t;;\n+\tman.*.*)\n+\t\tlocal pfx=\"${cur%.*}.\"\n+\t\tcur=\"${cur##*.}\"\n+\t\t__gitcomp \"cmd path\" \"$pfx\" \"$cur\"\n+\t\treturn\n+\t\t;;\n+\tmergetool.*.*)\n+\t\tlocal pfx=\"${cur%.*}.\"\n+\t\tcur=\"${cur##*.}\"\n+\t\t__gitcomp \"cmd path trustExitCode\" \"$pfx\" \"$cur\"\n+\t\treturn\n+\t\t;;\n+\tpager.*)\n+\t\tlocal pfx=\"${cur%.*}.\"\n+\t\tcur=\"${cur#*.}\"\n+\t\t__gitcomp \"$(__git_all_commands)\" \"$pfx\" \"$cur\"\n+\t\treturn\n+\t\t;;\n \tremote.*.*)\n \t\tlocal pfx=\"${cur%.*}.\"\n \t\tcur=\"${cur##*.}\"\n@@ -1391,6 +1424,12 @@ _git_config ()\n \t\t__gitcomp \"$(__git_remotes)\" \"$pfx\" \"$cur\" \".\"\n \t\treturn\n \t\t;;\n+\turl.*.*)\n+\t\tlocal pfx=\"${cur%.*}.\"\n+\t\tcur=\"${cur##*.}\"\n+\t\t__gitcomp \"insteadof\" \"$pfx\" \"$cur\"\n+\t\treturn\n+\t\t;;\n \tesac\n \t__gitcomp \"\n \t\talias.\n@@ -1465,6 +1504,7 @@ _git_config ()\n \t\tdiff.suppressBlankEmpty\n \t\tdiff.tool\n \t\tdiff.wordRegex\n+\t\tdifftool.\n \t\tdifftool.prompt\n \t\tfetch.unpackLimit\n \t\tformat.attach\n@@ -1495,6 +1535,7 @@ _git_config ()\n \t\tgitcvs.enabled\n \t\tgitcvs.logfile\n \t\tgitcvs.usecrlfattr\n+\t\tguitool.\n \t\tgui.blamehistoryctx\n \t\tgui.commitmsgwidth\n \t\tgui.copyblamethreshold\n@@ -1538,6 +1579,7 @@ _git_config ()\n \t\tlog.date\n \t\tlog.showroot\n \t\tmailmap.file\n+\t\tman.\n \t\tman.viewer\n \t\tmerge.conflictstyle\n \t\tmerge.log\n@@ -1545,6 +1587,7 @@ _git_config ()\n \t\tmerge.stat\n \t\tmerge.tool\n \t\tmerge.verbosity\n+\t\tmergetool.\n \t\tmergetool.keepBackup\n \t\tmergetool.prompt\n \t\tpack.compression\n@@ -1556,6 +1599,7 @@ _git_config ()\n \t\tpack.threads\n \t\tpack.window\n \t\tpack.windowMemory\n+\t\tpager.\n \t\tpull.octopus\n \t\tpull.twohead\n \t\tpush.default\n@@ -1593,6 +1637,7 @@ _git_config ()\n \t\tstatus.showUntrackedFiles\n \t\ttar.umask\n \t\ttransfer.unpackLimit\n+\t\turl.\n \t\tuser.email\n \t\tuser.name\n \t\tuser.signingkey\n-- \n1.6.2.3\n"},{"id":"112950","messageId":"1241418335-18474-3-git-send-email-bebarino@gmail.com","threadId":"19171","inReplyTo":"1241418335-18474-2-git-send-email-bebarino@gmail.com","subject":"[PATCH 3/5] completion: complete values for help.format","fromName":"Stephen Boyd","fromEmail":"bebarino@gmail.com","sentAt":"2009-05-04T06:25:33Z","receivedAt":"2009-05-04T06:25:33Z","isPatch":true,"sender":{"key":"bebarino@gmail.com","avatar":"https://avatars.githubusercontent.com/u/38832?v=4"},"body":"Signed-off-by: Stephen Boyd <bebarino@gmail.com>\n---\n contrib/completion/git-completion.bash |    4 ++++\n 1 files changed, 4 insertions(+), 0 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex ec02b06..023b0c9 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1348,6 +1348,10 @@ _git_config ()\n \t\t\t\"\n \t\treturn\n \t\t;;\n+\thelp.format)\n+\t\t__gitcomp \"man info web html\"\n+\t\treturn\n+\t\t;;\n \t*.*)\n \t\tCOMPREPLY=()\n \t\treturn\n-- \n1.6.2.3\n"},{"id":"112952","messageId":"1241418335-18474-4-git-send-email-bebarino@gmail.com","threadId":"19171","inReplyTo":"1241418335-18474-3-git-send-email-bebarino@gmail.com","subject":"[PATCH 4/5] completion: complete values for log.date","fromName":"Stephen Boyd","fromEmail":"bebarino@gmail.com","sentAt":"2009-05-04T06:25:34Z","receivedAt":"2009-05-04T06:25:34Z","isPatch":true,"sender":{"key":"bebarino@gmail.com","avatar":"https://avatars.githubusercontent.com/u/38832?v=4"},"body":"Add raw to the date formats too.\n\nSigned-off-by: Stephen Boyd <bebarino@gmail.com>\n---\n contrib/completion/git-completion.bash |    9 ++++++---\n 1 files changed, 6 insertions(+), 3 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 023b0c9..d67ffd9 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1116,6 +1116,7 @@ __git_log_shortlog_options=\"\n \"\n \n __git_log_pretty_formats=\"oneline short medium full fuller email raw format:\"\n+__git_log_date_formats=\"relative iso8601 rfc2822 short local default raw\"\n \n _git_log ()\n {\n@@ -1139,9 +1140,7 @@ _git_log ()\n \t\treturn\n \t\t;;\n \t--date=*)\n-\t\t__gitcomp \"\n-\t\t\trelative iso8601 rfc2822 short local default\n-\t\t\" \"\" \"${cur##--date=}\"\n+\t\t__gitcomp \"$__git_log_date_formats\" \"\" \"${cur##--date=}\"\n \t\treturn\n \t\t;;\n \t--*)\n@@ -1352,6 +1351,10 @@ _git_config ()\n \t\t__gitcomp \"man info web html\"\n \t\treturn\n \t\t;;\n+\tlog.date)\n+\t\t__gitcomp \"$__git_log_date_formats\"\n+\t\treturn\n+\t\t;;\n \t*.*)\n \t\tCOMPREPLY=()\n \t\treturn\n-- \n1.6.2.3\n"},{"id":"112951","messageId":"1241418335-18474-5-git-send-email-bebarino@gmail.com","threadId":"19171","inReplyTo":"1241418335-18474-4-git-send-email-bebarino@gmail.com","subject":"[PATCH 5/5] completion: complete values for send-email","fromName":"Stephen Boyd","fromEmail":"bebarino@gmail.com","sentAt":"2009-05-04T06:25:35Z","receivedAt":"2009-05-04T06:25:35Z","isPatch":true,"sender":{"key":"bebarino@gmail.com","avatar":"https://avatars.githubusercontent.com/u/38832?v=4"},"body":"Add completion for --confirm, --suppress-cc, and --smtp-encryption\ncommand line arguments. Add completion for aliasfiletype and confirm\nconfiguration variables.\n\nSince --smtp-ssl is deprecated, replace it with --smtp-encryption and\nthe two options ssl and tls.\n\nSigned-off-by: Stephen Boyd <bebarino@gmail.com>\n---\n contrib/completion/git-completion.bash |   39 +++++++++++++++++++++++++++++--\n 1 files changed, 36 insertions(+), 3 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex d67ffd9..1683e6d 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1282,18 +1282,39 @@ _git_rebase ()\n \t__gitcomp \"$(__git_refs)\"\n }\n \n+__git_send_email_confirm_options=\"always never auto cc compose\"\n+__git_send_email_suppresscc_options=\"author self cc ccbody sob cccmd body all\"\n+\n _git_send_email ()\n {\n \tlocal cur=\"${COMP_WORDS[COMP_CWORD]}\"\n \tcase \"$cur\" in\n+\t--confirm=*)\n+\t\t__gitcomp \"\n+\t\t\t$__git_send_email_confirm_options\n+\t\t\t\" \"\" \"${cur##--confirm=}\"\n+\t\treturn\n+\t\t;;\n+\t--suppress-cc=*)\n+\t\t__gitcomp \"\n+\t\t\t$__git_send_email_suppresscc_options\n+\t\t\t\" \"\" \"${cur##--suppress-cc=}\"\n+\n+\t\treturn\n+\t\t;;\n+\t--smtp-encryption=*)\n+\t\t__gitcomp \"ssl tls\" \"\" \"${cur##--smtp-encryption=}\"\n+\t\treturn\n+\t\t;;\n \t--*)\n \t\t__gitcomp \"--annotate --bcc --cc --cc-cmd --chain-reply-to\n-\t\t\t--compose --dry-run --envelope-sender --from --identity\n+\t\t\t--compose --confirm= --dry-run --envelope-sender\n+\t\t\t--from --identity\n \t\t\t--in-reply-to --no-chain-reply-to --no-signed-off-by-cc\n \t\t\t--no-suppress-from --no-thread --quiet\n \t\t\t--signed-off-by-cc --smtp-pass --smtp-server\n-\t\t\t--smtp-server-port --smtp-ssl --smtp-user --subject\n-\t\t\t--suppress-cc --suppress-from --thread --to\n+\t\t\t--smtp-server-port --smtp-encryption= --smtp-user\n+\t\t\t--subject --suppress-cc= --suppress-from --thread --to\n \t\t\t--validate --no-validate\"\n \t\treturn\n \t\t;;\n@@ -1355,6 +1376,18 @@ _git_config ()\n \t\t__gitcomp \"$__git_log_date_formats\"\n \t\treturn\n \t\t;;\n+\tsendemail.aliasesfiletype)\n+\t\t__gitcomp \"mutt mailrc pine elm gnus\"\n+\t\treturn\n+\t\t;;\n+\tsendemail.confirm)\n+\t\t__gitcomp \"$__git_send_email_confirm_options\"\n+\t\treturn\n+\t\t;;\n+\tsendemail.suppresscc)\n+\t\t__gitcomp \"$__git_send_email_suppresscc_options\"\n+\t\treturn\n+\t\t;;\n \t*.*)\n \t\tCOMPREPLY=()\n \t\treturn\n-- \n1.6.2.3\n"},{"id":"112985","messageId":"20090504142928.GT23604@spearce.org","threadId":"19171","inReplyTo":"1241418335-18474-5-git-send-email-bebarino@gmail.com","subject":"Re: [PATCH 5/5] completion: complete values for send-email","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-05-04T14:29:28Z","receivedAt":"2009-05-04T14:29:28Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Stephen Boyd <bebarino@gmail.com> wrote:\n> Add completion for --confirm, --suppress-cc, and --smtp-encryption\n> command line arguments. Add completion for aliasfiletype and confirm\n> configuration variables.\n> \n> Since --smtp-ssl is deprecated, replace it with --smtp-encryption and\n> the two options ssl and tls.\n> \n> Signed-off-by: Stephen Boyd <bebarino@gmail.com>\n\nFor all 5 patches in this series: nicely written, thanks.\n\nAcked-by: Shawn O. Pearce <spearce@spearce.or>\n\n-- \nShawn.\n"}]}