{"thread":{"id":"16438","subject":"[PATCH] config.txt: alphabetize configuration variable groups","startedAt":"2008-11-24T07:01:49Z","lastAt":"2008-11-26T08:26:50Z","messageCount":4,"participants":["Matt McCutchen","Johannes Sixt"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"96403","messageId":"1227510109.32583.2.camel@mattlaptop2.local","threadId":"16438","inReplyTo":null,"subject":"[PATCH] config.txt: alphabetize configuration variable groups","fromName":"Matt McCutchen","fromEmail":"matt@mattmccutchen.net","sentAt":"2008-11-24T07:01:49Z","receivedAt":"2008-11-24T07:01:49Z","isPatch":true,"sender":{"key":"matt@mattmccutchen.net","avatar":"https://avatars.githubusercontent.com/u/8885753?v=4"},"body":"Signed-off-by: Matt McCutchen \n---\n\nThis is an update of the following patch I sent on October 18, which\nreceived no comment:\nhttp://marc.info/?l=git&m=122438056720340&w=2\n\n Documentation/config.txt | 122 +++++++++++++++++++++++-----------------------\n 1 files changed, 61 insertions(+), 61 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex d536732..c339f56 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -572,9 +572,6 @@ color.status.::\n \tto red). The values of these variables may be specified as in\n \tcolor.branch..\n \n-commit.template::\n-\tSpecify a file to use as the template for new commit messages.\n-\n color.ui::\n \tWhen set to `always`, always use colors in all git commands which\n \tare capable of colored output. When false (or `never`), never. When\n@@ -582,6 +579,9 @@ color.ui::\n \tterminal. When more specific variables of color.* are set, they always\n \ttake precedence over this setting. Defaults to false.\n \n+commit.template::\n+\tSpecify a file to use as the template for new commit messages.\n+\n diff.autorefreshindex::\n \tWhen using 'git-diff' to compare with work tree\n \tfiles, do not consider stat-only change as changed.\n@@ -714,18 +714,6 @@ gc.rerereunresolved::\n \tkept for this many days when 'git-rerere gc' is run.\n \tThe default is 15 days. See linkgit:git-rerere[1].\n \n-rerere.autoupdate::\n-\tWhen set to true, `git-rerere` updates the index with the\n-\tresulting contents after it cleanly resolves conflicts using\n-\tpreviously recorded resolution. Defaults to false.\n-\n-rerere.enabled::\n-\tActivate recording of resolved conflicts, so that identical\n-\tconflict hunks can be resolved automatically, should they\n-\tbe encountered again. linkgit:git-rerere[1] command is by\n-\tdefault enabled if you create `rr-cache` directory under\n-\t`$GIT_DIR`, but can be disabled by setting this option to false.\n-\n gitcvs.enabled::\n \tWhether the CVS server interface is enabled for this repository.\n \tSee linkgit:git-cvsserver[1].\n@@ -917,6 +905,10 @@ i18n.logOutputEncoding::\n \tCharacter encoding the commit messages are converted to when\n \trunning 'git-log' and friends.\n \n+imap::\n+\tThe configuration variables in the 'imap' section are described\n+\tin linkgit:git-imap-send[1].\n+\n instaweb.browser::\n \tSpecify the program that will be used to browse your working\n \trepository in gitweb. See linkgit:git-instaweb[1].\n@@ -952,8 +944,6 @@ man.viewer::\n \tSpecify the programs that may be used to display help in the\n \t'man' format. See linkgit:git-help[1].\n \n-include::merge-config.txt[]\n-\n man..cmd::\n \tSpecify the command to invoke the specified man viewer. The\n \tspecified command is evaluated in shell with the man page\n@@ -963,6 +953,8 @@ man..path::\n \tOverride the path for the given tool that may be used to\n \tdisplay help in the 'man' format. See linkgit:git-help[1].\n \n+include::merge-config.txt[]\n+\n merge.conflictstyle::\n \tSpecify the style in which conflicted hunks are written out to\n \tworking tree files upon merge. The default is \"merge\", which\n@@ -1079,6 +1071,41 @@ pull.octopus::\n pull.twohead::\n \tThe default merge strategy to use when pulling a single branch.\n \n+receive.fsckObjects::\n+\tIf it is set to true, git-receive-pack will check all received\n+\tobjects. It will abort in the case of a malformed object or a\n+\tbroken link. The result of an abort are only dangling objects.\n+\tDefaults to false.\n+\n+receive.unpackLimit::\n+\tIf the number of objects received in a push is below this\n+\tlimit then the objects will be unpacked into loose object\n+\tfiles. However if the number of received objects equals or\n+\texceeds this limit then the received pack will be stored as\n+\ta pack, after adding any missing delta bases. Storing the\n+\tpack from a push can make the push operation complete faster,\n+\tespecially on slow filesystems. If not set, the value of\n+\t`transfer.unpackLimit` is used instead.\n+\n+receive.denyDeletes::\n+\tIf set to true, git-receive-pack will deny a ref update that deletes\n+\tthe ref. Use this to prevent such a ref deletion via a push.\n+\n+receive.denyNonFastForwards::\n+\tIf set to true, git-receive-pack will deny a ref update which is\n+\tnot a fast forward. Use this to prevent such an update via a push,\n+\teven if that push is forced. This configuration variable is\n+\tset when initializing a shared repository.\n+\n+receive.denyCurrentBranch::\n+\tIf set to true or \"refuse\", receive-pack will deny a ref update\n+\tto the currently checked out branch of a non-bare repository.\n+\tSuch a push is potentially dangerous because it brings the HEAD\n+\tout of sync with the index and working tree. If set to \"warn\",\n+\tprint a warning of such a push to stderr, but allow the push to\n+\tproceed. If set to false or \"ignore\", allow such pushes with no\n+\tmessage. Defaults to \"warn\".\n+\n remote..url::\n \tThe URL of a remote repository. See linkgit:git-fetch[1] or\n \tlinkgit:git-push[1].\n@@ -1128,6 +1155,18 @@ repack.usedeltabaseoffset::\n \t\"false\" and repack. Access from old git versions over the\n \tnative protocol are unaffected by this option.\n \n+rerere.autoupdate::\n+\tWhen set to true, `git-rerere` updates the index with the\n+\tresulting contents after it cleanly resolves conflicts using\n+\tpreviously recorded resolution. Defaults to false.\n+\n+rerere.enabled::\n+\tActivate recording of resolved conflicts, so that identical\n+\tconflict hunks can be resolved automatically, should they\n+\tbe encountered again. linkgit:git-rerere[1] command is by\n+\tdefault enabled if you create `rr-cache` directory under\n+\t`$GIT_DIR`, but can be disabled by setting this option to false.\n+\n showbranch.default::\n \tThe default set of branches for linkgit:git-show-branch[1].\n \tSee linkgit:git-show-branch[1].\n@@ -1164,6 +1203,11 @@ tar.umask::\n \tarchiving user's umask will be used instead. See umask(2) and\n \tlinkgit:git-archive[1].\n \n+transfer.unpackLimit::\n+\tWhen `fetch.unpackLimit` or `receive.unpackLimit` are\n+\tnot set, the value of this variable is used instead.\n+\tThe default value is 100.\n+\n url..insteadOf::\n \tAny URL that starts with this value will be rewritten to\n \tstart, instead, with . In cases where some site serves a\n@@ -1192,50 +1236,6 @@ user.signingkey::\n \tunchanged to gpg's --local-user parameter, so you may specify a key\n \tusing any method that gpg supports.\n \n-imap::\n-\tThe configuration variables in the 'imap' section are described\n-\tin linkgit:git-imap-send[1].\n-\n-receive.fsckObjects::\n-\tIf it is set to true, git-receive-pack will check all received\n-\tobjects. It will abort in the case of a malformed object or a\n-\tbroken link. The result of an abort are only dangling objects.\n-\tDefaults to false.\n-\n-receive.unpackLimit::\n-\tIf the number of objects received in a push is below this\n-\tlimit then the objects will be unpacked into loose object\n-\tfiles. However if the number of received objects equals or\n-\texceeds this limit then the received pack will be stored as\n-\ta pack, after adding any missing delta bases. Storing the\n-\tpack from a push can make the push operation complete faster,\n-\tespecially on slow filesystems. If not set, the value of\n-\t`transfer.unpackLimit` is used instead.\n-\n-receive.denyDeletes::\n-\tIf set to true, git-receive-pack will deny a ref update that deletes\n-\tthe ref. Use this to prevent such a ref deletion via a push.\n-\n-receive.denyNonFastForwards::\n-\tIf set to true, git-receive-pack will deny a ref update which is\n-\tnot a fast forward. Use this to prevent such an update via a push,\n-\teven if that push is forced. This configuration variable is\n-\tset when initializing a shared repository.\n-\n-receive.denyCurrentBranch::\n-\tIf set to true or \"refuse\", receive-pack will deny a ref update\n-\tto the currently checked out branch of a non-bare repository.\n-\tSuch a push is potentially dangerous because it brings the HEAD\n-\tout of sync with the index and working tree. If set to \"warn\",\n-\tprint a warning of such a push to stderr, but allow the push to\n-\tproceed. If set to false or \"ignore\", allow such pushes with no\n-\tmessage. Defaults to \"warn\".\n-\n-transfer.unpackLimit::\n-\tWhen `fetch.unpackLimit` or `receive.unpackLimit` are\n-\tnot set, the value of this variable is used instead.\n-\tThe default value is 100.\n-\n web.browser::\n \tSpecify a web browser that may be used by some commands.\n \tCurrently only linkgit:git-instaweb[1] and linkgit:git-help[1]\n-- \n1.6.0.2.593.g91df\n"},{"id":"96405","messageId":"492A579B.5000304@viscovery.net","threadId":"16438","inReplyTo":"1227510109.32583.2.camel@mattlaptop2.local","subject":"Re: [PATCH] config.txt: alphabetize configuration variable groups","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2008-11-24T07:28:27Z","receivedAt":"2008-11-24T07:28:27Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Matt McCutchen schrieb:\n> @@ -963,6 +953,8 @@ man..path::\n> \tOverride the path for the given tool that may be used to\n> \tdisplay help in the 'man' format. See linkgit:git-help[1].\n> \n> +include::merge-config.txt[]\n> +\n> merge.conflictstyle::\n> \tSpecify the style in which conflicted hunks are written out to\n> \tworking tree files upon merge. The default is \"merge\", which\n\nHere, the list is not in alphabetic order anymore.\n\nBTW, your commit message should emphasize the use-cases where an\nalphabetic order is a real benefit. Otherwise, this is just code churn.\n\n-- Hannes\n"},{"id":"96432","messageId":"1227556809.2628.8.camel@mattlaptop2.local","threadId":"16438","inReplyTo":"492A579B.5000304@viscovery.net","subject":"Re: [PATCH] config.txt: alphabetize configuration variable groups","fromName":"Matt McCutchen","fromEmail":"matt@mattmccutchen.net","sentAt":"2008-11-24T20:00:09Z","receivedAt":"2008-11-24T20:00:09Z","isPatch":true,"sender":{"key":"matt@mattmccutchen.net","avatar":"https://avatars.githubusercontent.com/u/8885753?v=4"},"body":"On Mon, 2008-11-24 at 08:28 +0100, Johannes Sixt wrote:\n> Matt McCutchen schrieb:\n> > @@ -963,6 +953,8 @@ man..path::\n> > \tOverride the path for the given tool that may be used to\n> > \tdisplay help in the 'man' format. See linkgit:git-help[1].\n> > \n> > +include::merge-config.txt[]\n> > +\n> > merge.conflictstyle::\n> > \tSpecify the style in which conflicted hunks are written out to\n> > \tworking tree files upon merge. The default is \"merge\", which\n> \n> Here, the list is not in alphabetic order anymore.\n\nAfter my change, the list is in alphabetical order by the first\ncomponent (before the first dot). I assume you're pointing out that I\nhaven't separated the merge. parameters from the non-\nmerge parameters.\n\nThe reason I left it that way was I thought there might be some reason\nwhy merge.conflictstyle is in config.txt rather than merge-config.txt\n(the difference being that it appears in \"man git-config\" but not\n\"man git-merge\"), and to keep that arrangement while grouping together\nthe non- merge parameters, I would have to split\nmerge-config.txt into two separately included files.\n\nI went back and looked at the commit (b5412484) that documented\nmerge.conflictstyle, and it appears that the placement in config.txt may\nhave been a mistake arising from the unsortedness of config.txt rather\nthan a conscious decision. Thus, I'll move that entry to\nmerge-config.txt for the better grouping. That does mean \"man\ngit-merge\" will contain two explanations of merge.conflictstyle (the\nbrief config-parameter one and the \"HOW CONFLICTS ARE PRESENTED\"\nsection), but I don't see that as a big problem.\n\n> BTW, your commit message should emphasize the use-cases where an\n> alphabetic order is a real benefit. Otherwise, this is just code churn.\n\nI don't see alphabetization as a major benefit except that it might help\npeople add new parameters in the right place (case in point: the\naddition of merge.conflictstyle). And I figured that the config\nparameters might as well be in /some/ order. I'll state that in the\ncommit message.\n\nUpdated patch to follow.\n\nMatt\n"},{"id":"96523","messageId":"1227688010.2680.0.camel@mattlaptop2.local","threadId":"16438","inReplyTo":"1227556809.2628.8.camel@mattlaptop2.local","subject":"[PATCH v2] config.txt: alphabetize configuration sections","fromName":"Matt McCutchen","fromEmail":"matt@mattmccutchen.net","sentAt":"2008-11-26T08:26:50Z","receivedAt":"2008-11-26T08:26:50Z","isPatch":true,"sender":{"key":"matt@mattmccutchen.net","avatar":"https://avatars.githubusercontent.com/u/8885753?v=4"},"body":"I figured the sections might as well be in some order, so I chose alphabetical\nbut with \"core\" at the beginning. This should help people add new variables\nin the right places.\n\nSigned-off-by: Matt McCutchen \n---\n Documentation/config.txt | 128 +++++++++++++++++++---------------------\n Documentation/merge-config.txt | 8 +++\n 2 files changed, 68 insertions(+), 68 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex d536732..17627ac 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -572,9 +572,6 @@ color.status.::\n \tto red). The values of these variables may be specified as in\n \tcolor.branch..\n \n-commit.template::\n-\tSpecify a file to use as the template for new commit messages.\n-\n color.ui::\n \tWhen set to `always`, always use colors in all git commands which\n \tare capable of colored output. When false (or `never`), never. When\n@@ -582,6 +579,9 @@ color.ui::\n \tterminal. When more specific variables of color.* are set, they always\n \ttake precedence over this setting. Defaults to false.\n \n+commit.template::\n+\tSpecify a file to use as the template for new commit messages.\n+\n diff.autorefreshindex::\n \tWhen using 'git-diff' to compare with work tree\n \tfiles, do not consider stat-only change as changed.\n@@ -714,18 +714,6 @@ gc.rerereunresolved::\n \tkept for this many days when 'git-rerere gc' is run.\n \tThe default is 15 days. See linkgit:git-rerere[1].\n \n-rerere.autoupdate::\n-\tWhen set to true, `git-rerere` updates the index with the\n-\tresulting contents after it cleanly resolves conflicts using\n-\tpreviously recorded resolution. Defaults to false.\n-\n-rerere.enabled::\n-\tActivate recording of resolved conflicts, so that identical\n-\tconflict hunks can be resolved automatically, should they\n-\tbe encountered again. linkgit:git-rerere[1] command is by\n-\tdefault enabled if you create `rr-cache` directory under\n-\t`$GIT_DIR`, but can be disabled by setting this option to false.\n-\n gitcvs.enabled::\n \tWhether the CVS server interface is enabled for this repository.\n \tSee linkgit:git-cvsserver[1].\n@@ -917,6 +905,10 @@ i18n.logOutputEncoding::\n \tCharacter encoding the commit messages are converted to when\n \trunning 'git-log' and friends.\n \n+imap::\n+\tThe configuration variables in the 'imap' section are described\n+\tin linkgit:git-imap-send[1].\n+\n instaweb.browser::\n \tSpecify the program that will be used to browse your working\n \trepository in gitweb. See linkgit:git-instaweb[1].\n@@ -952,8 +944,6 @@ man.viewer::\n \tSpecify the programs that may be used to display help in the\n \t'man' format. See linkgit:git-help[1].\n \n-include::merge-config.txt[]\n-\n man..cmd::\n \tSpecify the command to invoke the specified man viewer. The\n \tspecified command is evaluated in shell with the man page\n@@ -963,13 +953,7 @@ man..path::\n \tOverride the path for the given tool that may be used to\n \tdisplay help in the 'man' format. See linkgit:git-help[1].\n \n-merge.conflictstyle::\n-\tSpecify the style in which conflicted hunks are written out to\n-\tworking tree files upon merge. The default is \"merge\", which\n-\tshows `<<<<<<<` conflict marker, change made by one side,\n-\t`=======` marker, change made by the other side, and then\n-\t`>>>>>>>` marker. An alternate style, \"diff3\", adds `|||||||`\n-\tmarker and the original text before `=======` marker.\n+include::merge-config.txt[]\n \n mergetool..path::\n \tOverride the path for the given tool. This is useful in case\n@@ -1079,6 +1063,41 @@ pull.octopus::\n pull.twohead::\n \tThe default merge strategy to use when pulling a single branch.\n \n+receive.fsckObjects::\n+\tIf it is set to true, git-receive-pack will check all received\n+\tobjects. It will abort in the case of a malformed object or a\n+\tbroken link. The result of an abort are only dangling objects.\n+\tDefaults to false.\n+\n+receive.unpackLimit::\n+\tIf the number of objects received in a push is below this\n+\tlimit then the objects will be unpacked into loose object\n+\tfiles. However if the number of received objects equals or\n+\texceeds this limit then the received pack will be stored as\n+\ta pack, after adding any missing delta bases. Storing the\n+\tpack from a push can make the push operation complete faster,\n+\tespecially on slow filesystems. If not set, the value of\n+\t`transfer.unpackLimit` is used instead.\n+\n+receive.denyDeletes::\n+\tIf set to true, git-receive-pack will deny a ref update that deletes\n+\tthe ref. Use this to prevent such a ref deletion via a push.\n+\n+receive.denyNonFastForwards::\n+\tIf set to true, git-receive-pack will deny a ref update which is\n+\tnot a fast forward. Use this to prevent such an update via a push,\n+\teven if that push is forced. This configuration variable is\n+\tset when initializing a shared repository.\n+\n+receive.denyCurrentBranch::\n+\tIf set to true or \"refuse\", receive-pack will deny a ref update\n+\tto the currently checked out branch of a non-bare repository.\n+\tSuch a push is potentially dangerous because it brings the HEAD\n+\tout of sync with the index and working tree. If set to \"warn\",\n+\tprint a warning of such a push to stderr, but allow the push to\n+\tproceed. If set to false or \"ignore\", allow such pushes with no\n+\tmessage. Defaults to \"warn\".\n+\n remote..url::\n \tThe URL of a remote repository. See linkgit:git-fetch[1] or\n \tlinkgit:git-push[1].\n@@ -1128,6 +1147,18 @@ repack.usedeltabaseoffset::\n \t\"false\" and repack. Access from old git versions over the\n \tnative protocol are unaffected by this option.\n \n+rerere.autoupdate::\n+\tWhen set to true, `git-rerere` updates the index with the\n+\tresulting contents after it cleanly resolves conflicts using\n+\tpreviously recorded resolution. Defaults to false.\n+\n+rerere.enabled::\n+\tActivate recording of resolved conflicts, so that identical\n+\tconflict hunks can be resolved automatically, should they\n+\tbe encountered again. linkgit:git-rerere[1] command is by\n+\tdefault enabled if you create `rr-cache` directory under\n+\t`$GIT_DIR`, but can be disabled by setting this option to false.\n+\n showbranch.default::\n \tThe default set of branches for linkgit:git-show-branch[1].\n \tSee linkgit:git-show-branch[1].\n@@ -1164,6 +1195,11 @@ tar.umask::\n \tarchiving user's umask will be used instead. See umask(2) and\n \tlinkgit:git-archive[1].\n \n+transfer.unpackLimit::\n+\tWhen `fetch.unpackLimit` or `receive.unpackLimit` are\n+\tnot set, the value of this variable is used instead.\n+\tThe default value is 100.\n+\n url..insteadOf::\n \tAny URL that starts with this value will be rewritten to\n \tstart, instead, with . In cases where some site serves a\n@@ -1192,50 +1228,6 @@ user.signingkey::\n \tunchanged to gpg's --local-user parameter, so you may specify a key\n \tusing any method that gpg supports.\n \n-imap::\n-\tThe configuration variables in the 'imap' section are described\n-\tin linkgit:git-imap-send[1].\n-\n-receive.fsckObjects::\n-\tIf it is set to true, git-receive-pack will check all received\n-\tobjects. It will abort in the case of a malformed object or a\n-\tbroken link. The result of an abort are only dangling objects.\n-\tDefaults to false.\n-\n-receive.unpackLimit::\n-\tIf the number of objects received in a push is below this\n-\tlimit then the objects will be unpacked into loose object\n-\tfiles. However if the number of received objects equals or\n-\texceeds this limit then the received pack will be stored as\n-\ta pack, after adding any missing delta bases. Storing the\n-\tpack from a push can make the push operation complete faster,\n-\tespecially on slow filesystems. If not set, the value of\n-\t`transfer.unpackLimit` is used instead.\n-\n-receive.denyDeletes::\n-\tIf set to true, git-receive-pack will deny a ref update that deletes\n-\tthe ref. Use this to prevent such a ref deletion via a push.\n-\n-receive.denyNonFastForwards::\n-\tIf set to true, git-receive-pack will deny a ref update which is\n-\tnot a fast forward. Use this to prevent such an update via a push,\n-\teven if that push is forced. This configuration variable is\n-\tset when initializing a shared repository.\n-\n-receive.denyCurrentBranch::\n-\tIf set to true or \"refuse\", receive-pack will deny a ref update\n-\tto the currently checked out branch of a non-bare repository.\n-\tSuch a push is potentially dangerous because it brings the HEAD\n-\tout of sync with the index and working tree. If set to \"warn\",\n-\tprint a warning of such a push to stderr, but allow the push to\n-\tproceed. If set to false or \"ignore\", allow such pushes with no\n-\tmessage. Defaults to \"warn\".\n-\n-transfer.unpackLimit::\n-\tWhen `fetch.unpackLimit` or `receive.unpackLimit` are\n-\tnot set, the value of this variable is used instead.\n-\tThe default value is 100.\n-\n web.browser::\n \tSpecify a web browser that may be used by some commands.\n \tCurrently only linkgit:git-instaweb[1] and linkgit:git-help[1]\ndiff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt\nindex c735788..b10ce38 100644\n--- a/Documentation/merge-config.txt\n+++ b/Documentation/merge-config.txt\n@@ -26,6 +26,14 @@ merge.verbosity::\n \tabove outputs debugging information. The default is level 2.\n \tCan be overridden by 'GIT_MERGE_VERBOSITY' environment variable.\n \n+merge.conflictstyle::\n+\tSpecify the style in which conflicted hunks are written out to\n+\tworking tree files upon merge. The default is \"merge\", which\n+\tshows `<<<<<<<` conflict marker, change made by one side,\n+\t`=======` marker, change made by the other side, and then\n+\t`>>>>>>>` marker. An alternate style, \"diff3\", adds `|||||||`\n+\tmarker and the original text before `=======` marker.\n+\n merge..name::\n \tDefines a human readable name for a custom low-level\n \tmerge driver. See linkgit:gitattributes[5] for details.\n-- \n1.6.0.2.593.g91df\n"}]}