Re: [PATCH] Poison gettext with the Ook language
Jeff King writes: > I.e., could we mostly ignore this problem as not applying to most modern > systems? And if there is such a system, give it a fallback like: > > /* >* For systems that use a single buffer for getenv(), this hacks >* around it by giving it _four_ buffers. That's just punting on >* the problem, but it at least gives enough breathing room for >* the caller to do something sane like use non-trivial functions >* to copy the string. It still does nothing for threading, but >* hopefully such systems don't support pthreads in the first place. ;) >*/ Tempting. > I dunno. Maybe I am being overly optimistic. But I strongly suspect we > have such bugs already in our code base, and nobody has run into them Yeah, I tend to agree that I would not be surprised at all if we have many such "bugs" that triggers for nobody on modern platforms.
Re*: [PATCH v3] fetch: replace string-list used as a look-up table with a hashmap
Johannes Schindelin writes:
> Just one thing^W^Wa couple of things:
>
> It would probably make more sense to `hashmap_get_from_hash()` and
> `strhash()` here (and `strhash()` should probably be used everywhere
> instead of `memhash(str, strlen(str))`).
hashmap_get_from_hash() certainly is much better suited for simpler
usage pattern like these callsites, and the ones in sequencer.c. It
is a shame that a more complex variant takes the shorter-and-sweeter
name hashmap_get().
I wish we named the latter hashmap_get_fullblown_feature_rich() and
called the _from_hash() thing a simple hashmap_get() from day one,
but it is way too late.
I looked briefly the users of the _get() variant, and some of their
uses are legitimately not-simple and cannot be reduced to use the
simpler _get_from_hash variant, it seems. But others like those in
builtin/difftool.c should be straight-forward to convert to use the
simpler get_from_hash variant. It could be a low-hanging fruit left
for later clean-up, perhaps.
>> @@ -271,10 +319,10 @@ static void find_non_local_tags(const struct ref *refs,
>> !has_object_file_with_flags(&ref->old_oid,
>> OBJECT_INFO_QUICK) &&
>> !will_fetch(head, ref->old_oid.hash) &&
>> -!has_sha1_file_with_flags(item->util,
>> +!has_sha1_file_with_flags(item->oid.hash,
>
> I am not sure that we need to test for null OIDs here, given that...
> ...
> Of course, `has_sha1_file_with_flags()` is supposed to return `false` for
> null OIDs, I guess.
Yup. An alternative is to make item->oid a pointer to oid, not an
oid object itself, so that we can express "no OID for this ref" in a
more explicit way, but is_null_oid() is already used as "no OID" in
many other codepaths, so...
>> +for_each_string_list_item(remote_ref_item, &remote_refs_list) {
>> +const char *refname = remote_ref_item->string;
>> +struct hashmap_entry key;
>> +
>> +hashmap_entry_init(&key, memhash(refname, strlen(refname)));
>> +item = hashmap_get(&remote_refs, &key, refname);
>> +if (!item)
>> +continue; /* can this happen??? */
>
> This would indicate a BUG, no?
Possibly. Alternatively, we can just use item without checking and
let the runtime segfault.
Here is an incremental on top that can be squashed in to turn v3
into v4.
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 0f8e333022..aee1d9bf21 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -259,7 +259,7 @@ static struct refname_hash_entry *refname_hash_add(struct
hashmap *map,
size_t len = strlen(refname);
FLEX_ALLOC_MEM(ent, refname, refname, len);
- hashmap_entry_init(ent, memhash(refname, len));
+ hashmap_entry_init(ent, strhash(refname));
oidcpy(&ent->oid, oid);
hashmap_add(map, ent);
return ent;
@@ -282,11 +282,7 @@ static void refname_hash_init(struct hashmap *map)
static int refname_hash_exists(struct hashmap *map, const char *refname)
{
- struct hashmap_entry key;
- size_t len = strlen(refname);
- hashmap_entry_init(&key, memhash(refname, len));
-
- return !!hashmap_get(map, &key, refname);
+ return !!hashmap_get_from_hash(map, strhash(refname), refname);
}
static void find_non_local_tags(const struct ref *refs,
@@ -365,12 +361,10 @@ static void find_non_local_tags(const struct ref *refs,
*/
for_each_string_list_item(remote_ref_item, &remote_refs_list) {
const char *refname = remote_ref_item->string;
- struct hashmap_entry key;
- hashmap_entry_init(&key, memhash(refname, strlen(refname)));
- item = hashmap_get(&remote_refs, &key, refname);
+ item = hashmap_get_from_hash(&remote_refs, strhash(refname),
refname);
if (!item)
- continue; /* can this happen??? */
+ BUG("unseen remote ref?");
/* Unless we have already decided to ignore this item... */
if (!is_null_oid(&item->oid)) {
@@ -497,12 +491,12 @@ static struct ref *get_ref_map(struct remote *remote,
for (rm = ref_map; rm; rm = rm->next) {
if (rm->peer_ref) {
- struct hashmap_entry key;
const char *refname = rm->peer_ref->name;
struct refname_hash_entry *peer_item;
- hashmap_entry_init(&key, memhash(refname,
strlen(refname)));
- peer_item = hashmap_get(&existing_refs, &key, refname);
+ peer_item = hashmap_get_from_hash(&existing_refs,
+ strhash(refname),
+ refname);
if (peer_item) {
Re: [PATCH 2/3] ewok_rlw.h: add missing 'inline' to function definition
On Sat, Oct 27, 2018 at 02:52:05AM +0100, Ramsay Jones wrote: > The 'ewok_rlw.h' header file contains the rlw_get_run_bit() function > definition, which is marked as 'static' but not 'inline'. At least when > compiled by gcc, with the default -O2 optimization level, the function > is actually inlined and leaves no static version in the ewah_bitmap.o > and ewah_rlw.o object files. Despite this, add the missing 'inline' > keyword to better describe the intended behaviour. Yep, this makes sense. Thanks! -Peff
Re: What's cooking in git.git (Oct 2018, #05; Fri, 26)
On Fri, Oct 26, 2018 at 08:45:12PM -0700, Taylor Blau wrote: > On Fri, Oct 26, 2018 at 04:57:26PM +0900, Junio C Hamano wrote: > > * tb/filter-alternate-refs (2018-10-25) 2 commits > > (merged to 'next' on 2018-10-26 at 887a7779a3) > > + t5410: use longer path for sample script > > + Documentation/config.txt: fix typo in core.alternateRefsCommand > > > > Test fix. > > > > Will merge to 'master'. > > There is an additional clean-up patch in [1] that I'm not sure if you > have seen or not. Could you please queue that as a fixup to the above? > > Thanks, > Taylor > > [1]: 6aabe7201dc81b98e404010b441fef8d582b0232.1540258140.git...@ttaylorr.com Isn't that queued without fanfare one commit below the test fix? -Peff
[PATCH 70/78] config.txt: move transfer.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 72 +-- Documentation/config/transfer.txt | 71 ++ 2 files changed, 72 insertions(+), 71 deletions(-) create mode 100644 Documentation/config/transfer.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 1db9c58e8d..07100e236e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -421,77 +421,7 @@ include::config/submodule.txt[] include::config/tag.txt[] -transfer.fsckObjects:: - When `fetch.fsckObjects` or `receive.fsckObjects` are - not set, the value of this variable is used instead. - Defaults to false. -+ -When set, the fetch or receive will abort in the case of a malformed -object or a link to a nonexistent object. In addition, various other -issues are checked for, including legacy issues (see `fsck.`), -and potential security issues like the existence of a `.GIT` directory -or a malicious `.gitmodules` file (see the release notes for v2.2.1 -and v2.17.1 for details). Other sanity and security checks may be -added in future releases. -+ -On the receiving side, failing fsckObjects will make those objects -unreachable, see "QUARANTINE ENVIRONMENT" in -linkgit:git-receive-pack[1]. On the fetch side, malformed objects will -instead be left unreferenced in the repository. -+ -Due to the non-quarantine nature of the `fetch.fsckObjects` -implementation it can not be relied upon to leave the object store -clean like `receive.fsckObjects` can. -+ -As objects are unpacked they're written to the object store, so there -can be cases where malicious objects get introduced even though the -"fetch" failed, only to have a subsequent "fetch" succeed because only -new incoming objects are checked, not those that have already been -written to the object store. That difference in behavior should not be -relied upon. In the future, such objects may be quarantined for -"fetch" as well. -+ -For now, the paranoid need to find some way to emulate the quarantine -environment if they'd like the same protection as "push". E.g. in the -case of an internal mirror do the mirroring in two steps, one to fetch -the untrusted objects, and then do a second "push" (which will use the -quarantine) to another internal repo, and have internal clients -consume this pushed-to repository, or embargo internal fetches and -only allow them once a full "fsck" has run (and no new fetches have -happened in the meantime). - -transfer.hideRefs:: - String(s) `receive-pack` and `upload-pack` use to decide which - refs to omit from their initial advertisements. Use more than - one definition to specify multiple prefix strings. A ref that is - under the hierarchies listed in the value of this variable is - excluded, and is hidden when responding to `git push` or `git - fetch`. See `receive.hideRefs` and `uploadpack.hideRefs` for - program-specific versions of this config. -+ -You may also include a `!` in front of the ref name to negate the entry, -explicitly exposing it, even if an earlier entry marked it as hidden. -If you have multiple hideRefs values, later entries override earlier ones -(and entries in more-specific config files override less-specific ones). -+ -If a namespace is in use, the namespace prefix is stripped from each -reference before it is matched against `transfer.hiderefs` patterns. -For example, if `refs/heads/master` is specified in `transfer.hideRefs` and -the current namespace is `foo`, then `refs/namespaces/foo/refs/heads/master` -is omitted from the advertisements but `refs/heads/master` and -`refs/namespaces/bar/refs/heads/master` are still advertised as so-called -"have" lines. In order to match refs before stripping, add a `^` in front of -the ref name. If you combine `!` and `^`, `!` must be specified first. -+ -Even if you hide refs, a client may still be able to steal the target -objects via the techniques described in the "SECURITY" section of the -linkgit:gitnamespaces[7] man page; it's best to keep private data in a -separate repository. - -transfer.unpackLimit:: - When `fetch.unpackLimit` or `receive.unpackLimit` are - not set, the value of this variable is used instead. - The default value is 100. +include::config/transfer.txt[] uploadarchive.allowUnreachable:: If true, allow clients to use `git archive --remote` to request diff --git a/Documentation/config/transfer.txt b/Documentation/config/transfer.txt new file mode 100644 index 00..4a5dfe2fc1 --- /dev/null +++ b/Documentation/config/transfer.txt @@ -0,0 +1,71 @@ +transfer.fsckObjects:: + When `fetch.fsckObjects` or `receive.fsckObjects` are + not set, the value of this variable is used instead. + Defaults to false. ++ +When set, the fetch or receive will abort in the case of a malformed +object or a link to a nonexistent object. In addition, various other +issues are c
[PATCH 52/78] config.txt: move protocol.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 65 +-- Documentation/config/protocol.txt | 64 ++ 2 files changed, 65 insertions(+), 64 deletions(-) create mode 100644 Documentation/config/protocol.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index d55776c383..e80148a133 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -383,70 +383,7 @@ include::config/pager.txt[] include::config/pretty.txt[] -protocol.allow:: - If set, provide a user defined default policy for all protocols which - don't explicitly have a policy (`protocol..allow`). By default, - if unset, known-safe protocols (http, https, git, ssh, file) have a - default policy of `always`, known-dangerous protocols (ext) have a - default policy of `never`, and all other protocols have a default - policy of `user`. Supported policies: -+ --- - -* `always` - protocol is always able to be used. - -* `never` - protocol is never able to be used. - -* `user` - protocol is only able to be used when `GIT_PROTOCOL_FROM_USER` is - either unset or has a value of 1. This policy should be used when you want a - protocol to be directly usable by the user but don't want it used by commands which - execute clone/fetch/push commands without user input, e.g. recursive - submodule initialization. - --- - -protocol..allow:: - Set a policy to be used by protocol `` with clone/fetch/push - commands. See `protocol.allow` above for the available policies. -+ -The protocol names currently used by git are: -+ --- - - `file`: any local file-based path (including `file://` URLs, -or local paths) - - - `git`: the anonymous git protocol over a direct TCP -connection (or proxy, if configured) - - - `ssh`: git over ssh (including `host:path` syntax, -`ssh://`, etc). - - - `http`: git over http, both "smart http" and "dumb http". -Note that this does _not_ include `https`; if you want to configure -both, you must do so individually. - - - any external helpers are named by their protocol (e.g., use -`hg` to allow the `git-remote-hg` helper) --- - -protocol.version:: - Experimental. If set, clients will attempt to communicate with a - server using the specified protocol version. If unset, no - attempt will be made by the client to communicate using a - particular protocol version, this results in protocol version 0 - being used. - Supported versions: -+ --- - -* `0` - the original wire protocol. - -* `1` - the original wire protocol with the addition of a version string - in the initial response from the server. - -* `2` - link:technical/protocol-v2.html[wire protocol version 2]. - --- +include::config/protocol.txt[] include::pull-config.txt[] diff --git a/Documentation/config/protocol.txt b/Documentation/config/protocol.txt new file mode 100644 index 00..bfccc07491 --- /dev/null +++ b/Documentation/config/protocol.txt @@ -0,0 +1,64 @@ +protocol.allow:: + If set, provide a user defined default policy for all protocols which + don't explicitly have a policy (`protocol..allow`). By default, + if unset, known-safe protocols (http, https, git, ssh, file) have a + default policy of `always`, known-dangerous protocols (ext) have a + default policy of `never`, and all other protocols have a default + policy of `user`. Supported policies: ++ +-- + +* `always` - protocol is always able to be used. + +* `never` - protocol is never able to be used. + +* `user` - protocol is only able to be used when `GIT_PROTOCOL_FROM_USER` is + either unset or has a value of 1. This policy should be used when you want a + protocol to be directly usable by the user but don't want it used by commands which + execute clone/fetch/push commands without user input, e.g. recursive + submodule initialization. + +-- + +protocol..allow:: + Set a policy to be used by protocol `` with clone/fetch/push + commands. See `protocol.allow` above for the available policies. ++ +The protocol names currently used by git are: ++ +-- + - `file`: any local file-based path (including `file://` URLs, +or local paths) + + - `git`: the anonymous git protocol over a direct TCP +connection (or proxy, if configured) + + - `ssh`: git over ssh (including `host:path` syntax, +`ssh://`, etc). + + - `http`: git over http, both "smart http" and "dumb http". +Note that this does _not_ include `https`; if you want to configure +both, you must do so individually. + + - any external helpers are named by their protocol (e.g., use +`hg` to allow the `git-remote-hg` helper) +-- + +protocol.version:: + Experimental. If set, clients will attempt to communicate with a + server using the specified protocol version. If unset, no + attempt will be made by the client to communicate using
[PATCH 59/78] config.txt: move repack.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 28 +--- Documentation/config/repack.txt | 27 +++ 2 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 Documentation/config/repack.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 9aa849ce8b..0ce5081f22 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -397,33 +397,7 @@ include::config/remote.txt[] include::config/remotes.txt[] -repack.useDeltaBaseOffset:: - By default, linkgit:git-repack[1] creates packs that use - delta-base offset. If you need to share your repository with - Git older than version 1.4.4, either directly or via a dumb - protocol such as http, then you need to set this option to - "false" and repack. Access from old Git versions over the - native protocol are unaffected by this option. - -repack.packKeptObjects:: - If set to true, makes `git repack` act as if - `--pack-kept-objects` was passed. See linkgit:git-repack[1] for - details. Defaults to `false` normally, but `true` if a bitmap - index is being written (either via `--write-bitmap-index` or - `repack.writeBitmaps`). - -repack.useDeltaIslands:: - If set to true, makes `git repack` act as if `--delta-islands` - was passed. Defaults to `false`. - -repack.writeBitmaps:: - When true, git will write a bitmap index when packing all - objects to disk (e.g., when `git repack -a` is run). This - index can speed up the "counting objects" phase of subsequent - packs created for clones and fetches, at the cost of some disk - space and extra time spent on the initial repack. This has - no effect if multiple packfiles are created. - Defaults to false. +include::config/repack.txt[] rerere.autoUpdate:: When set to true, `git-rerere` updates the index with the diff --git a/Documentation/config/repack.txt b/Documentation/config/repack.txt new file mode 100644 index 00..a5c37813fd --- /dev/null +++ b/Documentation/config/repack.txt @@ -0,0 +1,27 @@ +repack.useDeltaBaseOffset:: + By default, linkgit:git-repack[1] creates packs that use + delta-base offset. If you need to share your repository with + Git older than version 1.4.4, either directly or via a dumb + protocol such as http, then you need to set this option to + "false" and repack. Access from old Git versions over the + native protocol are unaffected by this option. + +repack.packKeptObjects:: + If set to true, makes `git repack` act as if + `--pack-kept-objects` was passed. See linkgit:git-repack[1] for + details. Defaults to `false` normally, but `true` if a bitmap + index is being written (either via `--write-bitmap-index` or + `repack.writeBitmaps`). + +repack.useDeltaIslands:: + If set to true, makes `git repack` act as if `--delta-islands` + was passed. Defaults to `false`. + +repack.writeBitmaps:: + When true, git will write a bitmap index when packing all + objects to disk (e.g., when `git repack -a` is run). This + index can speed up the "counting objects" phase of subsequent + packs created for clones and fetches, at the cost of some disk + space and extra time spent on the initial repack. This has + no effect if multiple packfiles are created. + Defaults to false. -- 2.19.1.647.g708186aaf9
[PATCH 74/78] config.txt: move user.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 27 +-- Documentation/config/user.txt | 26 ++ 2 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 Documentation/config/user.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 924776f7fa..3cba2420e0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -429,32 +429,7 @@ include::config/uploadpack.txt[] include::config/url.txt[] -user.email:: - Your email address to be recorded in any newly created commits. - Can be overridden by the `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_EMAIL`, and - `EMAIL` environment variables. See linkgit:git-commit-tree[1]. - -user.name:: - Your full name to be recorded in any newly created commits. - Can be overridden by the `GIT_AUTHOR_NAME` and `GIT_COMMITTER_NAME` - environment variables. See linkgit:git-commit-tree[1]. - -user.useConfigOnly:: - Instruct Git to avoid trying to guess defaults for `user.email` - and `user.name`, and instead retrieve the values only from the - configuration. For example, if you have multiple email addresses - and would like to use a different one for each repository, then - with this configuration option set to `true` in the global config - along with a name, Git will prompt you to set up an email before - making new commits in a newly cloned repository. - Defaults to `false`. - -user.signingKey:: - If linkgit:git-tag[1] or linkgit:git-commit[1] is not selecting the - key you want it to automatically when creating a signed tag or - commit, you can override the default selection with this variable. - This option is passed unchanged to gpg's --local-user parameter, - so you may specify a key using any method that gpg supports. +include::config/user.txt[] versionsort.prereleaseSuffix (deprecated):: Deprecated alias for `versionsort.suffix`. Ignored if diff --git a/Documentation/config/user.txt b/Documentation/config/user.txt new file mode 100644 index 00..b5b2ba1199 --- /dev/null +++ b/Documentation/config/user.txt @@ -0,0 +1,26 @@ +user.email:: + Your email address to be recorded in any newly created commits. + Can be overridden by the `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_EMAIL`, and + `EMAIL` environment variables. See linkgit:git-commit-tree[1]. + +user.name:: + Your full name to be recorded in any newly created commits. + Can be overridden by the `GIT_AUTHOR_NAME` and `GIT_COMMITTER_NAME` + environment variables. See linkgit:git-commit-tree[1]. + +user.useConfigOnly:: + Instruct Git to avoid trying to guess defaults for `user.email` + and `user.name`, and instead retrieve the values only from the + configuration. For example, if you have multiple email addresses + and would like to use a different one for each repository, then + with this configuration option set to `true` in the global config + along with a name, Git will prompt you to set up an email before + making new commits in a newly cloned repository. + Defaults to `false`. + +user.signingKey:: + If linkgit:git-tag[1] or linkgit:git-commit[1] is not selecting the + key you want it to automatically when creating a signed tag or + commit, you can override the default selection with this variable. + This option is passed unchanged to gpg's --local-user parameter, + so you may specify a key using any method that gpg supports. -- 2.19.1.647.g708186aaf9
[PATCH 58/78] config.txt: move remotes.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 4 +--- Documentation/config/remotes.txt | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Documentation/config/remotes.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index b7aafdbf17..9aa849ce8b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -395,9 +395,7 @@ include::config/receive.txt[] include::config/remote.txt[] -remotes.:: - The list of remotes which are fetched by "git remote update - ". See linkgit:git-remote[1]. +include::config/remotes.txt[] repack.useDeltaBaseOffset:: By default, linkgit:git-repack[1] creates packs that use diff --git a/Documentation/config/remotes.txt b/Documentation/config/remotes.txt new file mode 100644 index 00..4cfe03221e --- /dev/null +++ b/Documentation/config/remotes.txt @@ -0,0 +1,3 @@ +remotes.:: + The list of remotes which are fetched by "git remote update + ". See linkgit:git-remote[1]. -- 2.19.1.647.g708186aaf9
[PATCH 69/78] config.txt: move tag.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 17 + Documentation/config/tag.txt | 16 2 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 Documentation/config/tag.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 966e82e851..1db9c58e8d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -419,22 +419,7 @@ include::config/stash.txt[] include::config/submodule.txt[] -tag.forceSignAnnotated:: - A boolean to specify whether annotated tags created should be GPG signed. - If `--annotate` is specified on the command line, it takes - precedence over this option. - -tag.sort:: - This variable controls the sort ordering of tags when displayed by - linkgit:git-tag[1]. Without the "--sort=" option provided, the - value of this variable will be used as the default. - -tar.umask:: - This variable can be used to restrict the permission bits of - tar archive entries. The default is 0002, which turns off the - world write bit. The special value "user" indicates that the - archiving user's umask will be used instead. See umask(2) and - linkgit:git-archive[1]. +include::config/tag.txt[] transfer.fsckObjects:: When `fetch.fsckObjects` or `receive.fsckObjects` are diff --git a/Documentation/config/tag.txt b/Documentation/config/tag.txt new file mode 100644 index 00..663663bdec --- /dev/null +++ b/Documentation/config/tag.txt @@ -0,0 +1,16 @@ +tag.forceSignAnnotated:: + A boolean to specify whether annotated tags created should be GPG signed. + If `--annotate` is specified on the command line, it takes + precedence over this option. + +tag.sort:: + This variable controls the sort ordering of tags when displayed by + linkgit:git-tag[1]. Without the "--sort=" option provided, the + value of this variable will be used as the default. + +tar.umask:: + This variable can be used to restrict the permission bits of + tar archive entries. The default is 0002, which turns off the + world write bit. The special value "user" indicates that the + archiving user's umask will be used instead. See umask(2) and + linkgit:git-archive[1]. -- 2.19.1.647.g708186aaf9
[PATCH 76/78] config.txt: move web.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 5 + Documentation/config/web.txt | 4 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 Documentation/config/web.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index eacaaa2deb..10617d0a10 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -433,10 +433,7 @@ include::config/user.txt[] include::config/versionsort.txt[] -web.browser:: - Specify a web browser that may be used by some commands. - Currently only linkgit:git-instaweb[1] and linkgit:git-help[1] - may use it. +include::config/web.txt[] worktree.guessRemote:: With `add`, if no branch argument, and neither of `-b` nor diff --git a/Documentation/config/web.txt b/Documentation/config/web.txt new file mode 100644 index 00..beec8d1303 --- /dev/null +++ b/Documentation/config/web.txt @@ -0,0 +1,4 @@ +web.browser:: + Specify a web browser that may be used by some commands. + Currently only linkgit:git-instaweb[1] and linkgit:git-help[1] + may use it. -- 2.19.1.647.g708186aaf9
[PATCH 60/78] config.txt: move rerere.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 13 + Documentation/config/rerere.txt | 12 2 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 Documentation/config/rerere.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 0ce5081f22..71bab1f3b8 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -399,18 +399,7 @@ include::config/remotes.txt[] include::config/repack.txt[] -rerere.autoUpdate:: - When set to true, `git-rerere` updates the index with the - resulting contents after it cleanly resolves conflicts using - previously recorded resolution. Defaults to false. - -rerere.enabled:: - Activate recording of resolved conflicts, so that identical - conflict hunks can be resolved automatically, should they be - encountered again. By default, linkgit:git-rerere[1] is - enabled if there is an `rr-cache` directory under the - `$GIT_DIR`, e.g. if "rerere" was previously used in the - repository. +include::config/rerere.txt[] reset.quiet:: When set to true, 'git reset' will default to the '--quiet' option. diff --git a/Documentation/config/rerere.txt b/Documentation/config/rerere.txt new file mode 100644 index 00..40abdf6a6b --- /dev/null +++ b/Documentation/config/rerere.txt @@ -0,0 +1,12 @@ +rerere.autoUpdate:: + When set to true, `git-rerere` updates the index with the + resulting contents after it cleanly resolves conflicts using + previously recorded resolution. Defaults to false. + +rerere.enabled:: + Activate recording of resolved conflicts, so that identical + conflict hunks can be resolved automatically, should they be + encountered again. By default, linkgit:git-rerere[1] is + enabled if there is an `rr-cache` directory under the + `$GIT_DIR`, e.g. if "rerere" was previously used in the + repository. -- 2.19.1.647.g708186aaf9
[PATCH 78/78] config.txt: remove config/dummy.txt
This file was only needed when config directory was empty. Now that the directory is fully populated, it can be deleted. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config/dummy.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Documentation/config/dummy.txt diff --git a/Documentation/config/dummy.txt b/Documentation/config/dummy.txt deleted file mode 100644 index e69de29bb2..00 -- 2.19.1.647.g708186aaf9
[PATCH 72/78] config.txt: move uploadpack.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 66 + Documentation/config/uploadpack.txt | 65 2 files changed, 66 insertions(+), 65 deletions(-) create mode 100644 Documentation/config/uploadpack.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 00cc2791b5..451c9fe2b3 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -425,71 +425,7 @@ include::config/transfer.txt[] include::config/uploadarchive.txt[] -uploadpack.hideRefs:: - This variable is the same as `transfer.hideRefs`, but applies - only to `upload-pack` (and so affects only fetches, not pushes). - An attempt to fetch a hidden ref by `git fetch` will fail. See - also `uploadpack.allowTipSHA1InWant`. - -uploadpack.allowTipSHA1InWant:: - When `uploadpack.hideRefs` is in effect, allow `upload-pack` - to accept a fetch request that asks for an object at the tip - of a hidden ref (by default, such a request is rejected). - See also `uploadpack.hideRefs`. Even if this is false, a client - may be able to steal objects via the techniques described in the - "SECURITY" section of the linkgit:gitnamespaces[7] man page; it's - best to keep private data in a separate repository. - -uploadpack.allowReachableSHA1InWant:: - Allow `upload-pack` to accept a fetch request that asks for an - object that is reachable from any ref tip. However, note that - calculating object reachability is computationally expensive. - Defaults to `false`. Even if this is false, a client may be able - to steal objects via the techniques described in the "SECURITY" - section of the linkgit:gitnamespaces[7] man page; it's best to - keep private data in a separate repository. - -uploadpack.allowAnySHA1InWant:: - Allow `upload-pack` to accept a fetch request that asks for any - object at all. - Defaults to `false`. - -uploadpack.keepAlive:: - When `upload-pack` has started `pack-objects`, there may be a - quiet period while `pack-objects` prepares the pack. Normally - it would output progress information, but if `--quiet` was used - for the fetch, `pack-objects` will output nothing at all until - the pack data begins. Some clients and networks may consider - the server to be hung and give up. Setting this option instructs - `upload-pack` to send an empty keepalive packet every - `uploadpack.keepAlive` seconds. Setting this option to 0 - disables keepalive packets entirely. The default is 5 seconds. - -uploadpack.packObjectsHook:: - If this option is set, when `upload-pack` would run - `git pack-objects` to create a packfile for a client, it will - run this shell command instead. The `pack-objects` command and - arguments it _would_ have run (including the `git pack-objects` - at the beginning) are appended to the shell command. The stdin - and stdout of the hook are treated as if `pack-objects` itself - was run. I.e., `upload-pack` will feed input intended for - `pack-objects` to the hook, and expects a completed packfile on - stdout. -+ -Note that this configuration variable is ignored if it is seen in the -repository-level config (this is a safety measure against fetching from -untrusted repositories). - -uploadpack.allowFilter:: - If this option is set, `upload-pack` will support partial - clone and partial fetch object filtering. - -uploadpack.allowRefInWant:: - If this option is set, `upload-pack` will support the `ref-in-want` - feature of the protocol version 2 `fetch` command. This feature - is intended for the benefit of load-balanced servers which may - not have the same view of what OIDs their refs point to due to - replication delay. +include::config/uploadpack.txt[] url..insteadOf:: Any URL that starts with this value will be rewritten to diff --git a/Documentation/config/uploadpack.txt b/Documentation/config/uploadpack.txt new file mode 100644 index 00..ed1c835695 --- /dev/null +++ b/Documentation/config/uploadpack.txt @@ -0,0 +1,65 @@ +uploadpack.hideRefs:: + This variable is the same as `transfer.hideRefs`, but applies + only to `upload-pack` (and so affects only fetches, not pushes). + An attempt to fetch a hidden ref by `git fetch` will fail. See + also `uploadpack.allowTipSHA1InWant`. + +uploadpack.allowTipSHA1InWant:: + When `uploadpack.hideRefs` is in effect, allow `upload-pack` + to accept a fetch request that asks for an object at the tip + of a hidden ref (by default, such a request is rejected). + See also `uploadpack.hideRefs`. Even if this is false, a client + may be able to steal objects via the techniques described in the + "SECURITY" section of the linkgit:gitnamesp
[PATCH 53/78] config.txt: move pull-config.txt to config/
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/config.txt | 2 +-
Documentation/{pull-config.txt => config/pull.txt} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename Documentation/{pull-config.txt => config/pull.txt} (100%)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e80148a133..9de16a498e 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -385,7 +385,7 @@ include::config/pretty.txt[]
include::config/protocol.txt[]
-include::pull-config.txt[]
+include::config/pull.txt[]
include::push-config.txt[]
diff --git a/Documentation/pull-config.txt b/Documentation/config/pull.txt
similarity index 100%
rename from Documentation/pull-config.txt
rename to Documentation/config/pull.txt
--
2.19.1.647.g708186aaf9
[PATCH 68/78] config.txt: move submodule.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/config.txt | 2 +-
Documentation/{submodule-config.txt => config/submodule.txt} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename Documentation/{submodule-config.txt => config/submodule.txt} (100%)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index aedc73f4eb..966e82e851 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -417,7 +417,7 @@ include::config/status.txt[]
include::config/stash.txt[]
-include::submodule-config.txt[]
+include::config/submodule.txt[]
tag.forceSignAnnotated::
A boolean to specify whether annotated tags created should be GPG
signed.
diff --git a/Documentation/submodule-config.txt
b/Documentation/config/submodule.txt
similarity index 100%
rename from Documentation/submodule-config.txt
rename to Documentation/config/submodule.txt
--
2.19.1.647.g708186aaf9
[PATCH 73/78] config.txt: move url.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 31 +-- Documentation/config/url.txt | 30 ++ 2 files changed, 31 insertions(+), 30 deletions(-) create mode 100644 Documentation/config/url.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 451c9fe2b3..924776f7fa 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -427,36 +427,7 @@ include::config/uploadarchive.txt[] include::config/uploadpack.txt[] -url..insteadOf:: - Any URL that starts with this value will be rewritten to - start, instead, with . In cases where some site serves a - large number of repositories, and serves them with multiple - access methods, and some users need to use different access - methods, this feature allows people to specify any of the - equivalent URLs and have Git automatically rewrite the URL to - the best alternative for the particular user, even for a - never-before-seen repository on the site. When more than one - insteadOf strings match a given URL, the longest match is used. -+ -Note that any protocol restrictions will be applied to the rewritten -URL. If the rewrite changes the URL to use a custom protocol or remote -helper, you may need to adjust the `protocol.*.allow` config to permit -the request. In particular, protocols you expect to use for submodules -must be set to `always` rather than the default of `user`. See the -description of `protocol.allow` above. - -url..pushInsteadOf:: - Any URL that starts with this value will not be pushed to; - instead, it will be rewritten to start with , and the - resulting URL will be pushed to. In cases where some site serves - a large number of repositories, and serves them with multiple - access methods, some of which do not allow push, this feature - allows people to specify a pull-only URL and have Git - automatically use an appropriate URL to push, even for a - never-before-seen repository on the site. When more than one - pushInsteadOf strings match a given URL, the longest match is - used. If a remote has an explicit pushurl, Git will ignore this - setting for that remote. +include::config/url.txt[] user.email:: Your email address to be recorded in any newly created commits. diff --git a/Documentation/config/url.txt b/Documentation/config/url.txt new file mode 100644 index 00..e5566c371d --- /dev/null +++ b/Documentation/config/url.txt @@ -0,0 +1,30 @@ +url..insteadOf:: + Any URL that starts with this value will be rewritten to + start, instead, with . In cases where some site serves a + large number of repositories, and serves them with multiple + access methods, and some users need to use different access + methods, this feature allows people to specify any of the + equivalent URLs and have Git automatically rewrite the URL to + the best alternative for the particular user, even for a + never-before-seen repository on the site. When more than one + insteadOf strings match a given URL, the longest match is used. ++ +Note that any protocol restrictions will be applied to the rewritten +URL. If the rewrite changes the URL to use a custom protocol or remote +helper, you may need to adjust the `protocol.*.allow` config to permit +the request. In particular, protocols you expect to use for submodules +must be set to `always` rather than the default of `user`. See the +description of `protocol.allow` above. + +url..pushInsteadOf:: + Any URL that starts with this value will not be pushed to; + instead, it will be rewritten to start with , and the + resulting URL will be pushed to. In cases where some site serves + a large number of repositories, and serves them with multiple + access methods, some of which do not allow push, this feature + allows people to specify a pull-only URL and have Git + automatically use an appropriate URL to push, even for a + never-before-seen repository on the site. When more than one + pushInsteadOf strings match a given URL, the longest match is + used. If a remote has an explicit pushurl, Git will ignore this + setting for that remote. -- 2.19.1.647.g708186aaf9
[PATCH 54/78] config.txt: move push-config.txt to config/
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/config.txt | 2 +-
Documentation/{push-config.txt => config/push.txt} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename Documentation/{push-config.txt => config/push.txt} (100%)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9de16a498e..a6934fd87b 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -387,7 +387,7 @@ include::config/protocol.txt[]
include::config/pull.txt[]
-include::push-config.txt[]
+include::config/push.txt[]
include::rebase-config.txt[]
diff --git a/Documentation/push-config.txt b/Documentation/config/push.txt
similarity index 100%
rename from Documentation/push-config.txt
rename to Documentation/config/push.txt
--
2.19.1.647.g708186aaf9
[PATCH 63/78] config.txt: move sequencer.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 6 +- Documentation/config/sequencer.txt | 5 + 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 Documentation/config/sequencer.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 1c2a6ec3c5..ab504eaba2 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -405,11 +405,7 @@ include::config/reset.txt[] include::config/sendemail.txt[] -sequence.editor:: - Text editor used by `git rebase -i` for editing the rebase instruction file. - The value is meant to be interpreted by the shell when it is used. - It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable. - When not configured the default commit message editor is used instead. +include::config/sequencer.txt[] showBranch.default:: The default set of branches for linkgit:git-show-branch[1]. diff --git a/Documentation/config/sequencer.txt b/Documentation/config/sequencer.txt new file mode 100644 index 00..b48d532a96 --- /dev/null +++ b/Documentation/config/sequencer.txt @@ -0,0 +1,5 @@ +sequence.editor:: + Text editor used by `git rebase -i` for editing the rebase instruction file. + The value is meant to be interpreted by the shell when it is used. + It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable. + When not configured the default commit message editor is used instead. -- 2.19.1.647.g708186aaf9
[PATCH 38/78] config.txt: move index.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 11 +-- Documentation/config/index.txt | 10 ++ 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 Documentation/config/index.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index d26656df95..03b7ac75fc 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -355,16 +355,7 @@ include::config/i18n.txt[] include::config/imap.txt[] -index.threads:: - Specifies the number of threads to spawn when loading the index. - This is meant to reduce index load time on multiprocessor machines. - Specifying 0 or 'true' will cause Git to auto-detect the number of - CPU's and set the number of threads accordingly. Specifying 1 or - 'false' will disable multithreading. Defaults to 'true'. - -index.version:: - Specify the version with which new index files should be - initialized. This does not affect existing repositories. +include::config/index.txt[] init.templateDir:: Specify the directory from which templates will be copied. diff --git a/Documentation/config/index.txt b/Documentation/config/index.txt new file mode 100644 index 00..4b94b6bedc --- /dev/null +++ b/Documentation/config/index.txt @@ -0,0 +1,10 @@ +index.threads:: + Specifies the number of threads to spawn when loading the index. + This is meant to reduce index load time on multiprocessor machines. + Specifying 0 or 'true' will cause Git to auto-detect the number of + CPU's and set the number of threads accordingly. Specifying 1 or + 'false' will disable multithreading. Defaults to 'true'. + +index.version:: + Specify the version with which new index files should be + initialized. This does not affect existing repositories. -- 2.19.1.647.g708186aaf9
[PATCH 62/78] config.txt: move sendemail-config.txt to config/
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/config.txt | 2 +-
Documentation/{sendemail-config.txt => config/sendemail.txt} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename Documentation/{sendemail-config.txt => config/sendemail.txt} (100%)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index a6ce22a6d9..1c2a6ec3c5 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -403,7 +403,7 @@ include::config/rerere.txt[]
include::config/reset.txt[]
-include::sendemail-config.txt[]
+include::config/sendemail.txt[]
sequence.editor::
Text editor used by `git rebase -i` for editing the rebase instruction
file.
diff --git a/Documentation/sendemail-config.txt
b/Documentation/config/sendemail.txt
similarity index 100%
rename from Documentation/sendemail-config.txt
rename to Documentation/config/sendemail.txt
--
2.19.1.647.g708186aaf9
[PATCH 20/78] config.txt: move fastimport.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 9 + Documentation/config/fastimport.txt | 8 2 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 Documentation/config/fastimport.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index f313c7da2e..92bc420245 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -323,14 +323,7 @@ include::config/diff.txt[] include::config/difftool.txt[] -fastimport.unpackLimit:: - If the number of objects imported by linkgit:git-fast-import[1] - is below this limit, then the objects will be unpacked into - loose object files. However if the number of imported objects - equals or exceeds this limit then the pack will be stored as a - pack. Storing the pack from a fast-import can make the import - operation complete faster, especially on slow filesystems. If - not set, the value of `transfer.unpackLimit` is used instead. +include::config/fastimport.txt[] include::fetch-config.txt[] diff --git a/Documentation/config/fastimport.txt b/Documentation/config/fastimport.txt new file mode 100644 index 00..c1166e330d --- /dev/null +++ b/Documentation/config/fastimport.txt @@ -0,0 +1,8 @@ +fastimport.unpackLimit:: + If the number of objects imported by linkgit:git-fast-import[1] + is below this limit, then the objects will be unpacked into + loose object files. However if the number of imported objects + equals or exceeds this limit then the pack will be stored as a + pack. Storing the pack from a fast-import can make the import + operation complete faster, especially on slow filesystems. If + not set, the value of `transfer.unpackLimit` is used instead. -- 2.19.1.647.g708186aaf9
[PATCH 57/78] config.txt: move remote.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 79 + Documentation/config/remote.txt | 78 2 files changed, 79 insertions(+), 78 deletions(-) create mode 100644 Documentation/config/remote.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 465dc2abec..b7aafdbf17 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -393,84 +393,7 @@ include::config/rebase.txt[] include::config/receive.txt[] -remote.pushDefault:: - The remote to push to by default. Overrides - `branch..remote` for all branches, and is overridden by - `branch..pushRemote` for specific branches. - -remote..url:: - The URL of a remote repository. See linkgit:git-fetch[1] or - linkgit:git-push[1]. - -remote..pushurl:: - The push URL of a remote repository. See linkgit:git-push[1]. - -remote..proxy:: - For remotes that require curl (http, https and ftp), the URL to - the proxy to use for that remote. Set to the empty string to - disable proxying for that remote. - -remote..proxyAuthMethod:: - For remotes that require curl (http, https and ftp), the method to use for - authenticating against the proxy in use (probably set in - `remote..proxy`). See `http.proxyAuthMethod`. - -remote..fetch:: - The default set of "refspec" for linkgit:git-fetch[1]. See - linkgit:git-fetch[1]. - -remote..push:: - The default set of "refspec" for linkgit:git-push[1]. See - linkgit:git-push[1]. - -remote..mirror:: - If true, pushing to this remote will automatically behave - as if the `--mirror` option was given on the command line. - -remote..skipDefaultUpdate:: - If true, this remote will be skipped by default when updating - using linkgit:git-fetch[1] or the `update` subcommand of - linkgit:git-remote[1]. - -remote..skipFetchAll:: - If true, this remote will be skipped by default when updating - using linkgit:git-fetch[1] or the `update` subcommand of - linkgit:git-remote[1]. - -remote..receivepack:: - The default program to execute on the remote side when pushing. See - option --receive-pack of linkgit:git-push[1]. - -remote..uploadpack:: - The default program to execute on the remote side when fetching. See - option --upload-pack of linkgit:git-fetch-pack[1]. - -remote..tagOpt:: - Setting this value to --no-tags disables automatic tag following when - fetching from remote . Setting it to --tags will fetch every - tag from remote , even if they are not reachable from remote - branch heads. Passing these flags directly to linkgit:git-fetch[1] can - override this setting. See options --tags and --no-tags of - linkgit:git-fetch[1]. - -remote..vcs:: - Setting this to a value will cause Git to interact with - the remote with the git-remote- helper. - -remote..prune:: - When set to true, fetching from this remote by default will also - remove any remote-tracking references that no longer exist on the - remote (as if the `--prune` option was given on the command line). - Overrides `fetch.prune` settings, if any. - -remote..pruneTags:: - When set to true, fetching from this remote by default will also - remove any local tags that no longer exist on the remote if pruning - is activated in general via `remote..prune`, `fetch.prune` or - `--prune`. Overrides `fetch.pruneTags` settings, if any. -+ -See also `remote..prune` and the PRUNING section of -linkgit:git-fetch[1]. +include::config/remote.txt[] remotes.:: The list of remotes which are fetched by "git remote update diff --git a/Documentation/config/remote.txt b/Documentation/config/remote.txt new file mode 100644 index 00..6c4cad83a2 --- /dev/null +++ b/Documentation/config/remote.txt @@ -0,0 +1,78 @@ +remote.pushDefault:: + The remote to push to by default. Overrides + `branch..remote` for all branches, and is overridden by + `branch..pushRemote` for specific branches. + +remote..url:: + The URL of a remote repository. See linkgit:git-fetch[1] or + linkgit:git-push[1]. + +remote..pushurl:: + The push URL of a remote repository. See linkgit:git-push[1]. + +remote..proxy:: + For remotes that require curl (http, https and ftp), the URL to + the proxy to use for that remote. Set to the empty string to + disable proxying for that remote. + +remote..proxyAuthMethod:: + For remotes that require curl (http, https and ftp), the method to use for + authenticating against the proxy in use (probably set in + `remote..proxy`). See `http.proxyAuthMethod`. + +remote..fetch:: + The default set of "refspec" for linkgit:git-fetch[1]. See + linkgit:git-fetch[1]. + +remote..push:: + The default set of "refspec" for link
[PATCH 75/78] config.txt: move versionsort.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 34 +--- Documentation/config/versionsort.txt | 33 +++ 2 files changed, 34 insertions(+), 33 deletions(-) create mode 100644 Documentation/config/versionsort.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 3cba2420e0..eacaaa2deb 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -431,39 +431,7 @@ include::config/url.txt[] include::config/user.txt[] -versionsort.prereleaseSuffix (deprecated):: - Deprecated alias for `versionsort.suffix`. Ignored if - `versionsort.suffix` is set. - -versionsort.suffix:: - Even when version sort is used in linkgit:git-tag[1], tagnames - with the same base version but different suffixes are still sorted - lexicographically, resulting e.g. in prerelease tags appearing - after the main release (e.g. "1.0-rc1" after "1.0"). This - variable can be specified to determine the sorting order of tags - with different suffixes. -+ -By specifying a single suffix in this variable, any tagname containing -that suffix will appear before the corresponding main release. E.g. if -the variable is set to "-rc", then all "1.0-rcX" tags will appear before -"1.0". If specified multiple times, once per suffix, then the order of -suffixes in the configuration will determine the sorting order of tagnames -with those suffixes. E.g. if "-pre" appears before "-rc" in the -configuration, then all "1.0-preX" tags will be listed before any -"1.0-rcX" tags. The placement of the main release tag relative to tags -with various suffixes can be determined by specifying the empty suffix -among those other suffixes. E.g. if the suffixes "-rc", "", "-ck" and -"-bfs" appear in the configuration in this order, then all "v4.8-rcX" tags -are listed first, followed by "v4.8", then "v4.8-ckX" and finally -"v4.8-bfsX". -+ -If more than one suffixes match the same tagname, then that tagname will -be sorted according to the suffix which starts at the earliest position in -the tagname. If more than one different matching suffixes start at -that earliest position, then that tagname will be sorted according to the -longest of those suffixes. -The sorting order between different suffixes is undefined if they are -in multiple config files. +include::config/versionsort.txt[] web.browser:: Specify a web browser that may be used by some commands. diff --git a/Documentation/config/versionsort.txt b/Documentation/config/versionsort.txt new file mode 100644 index 00..6c7cc054fa --- /dev/null +++ b/Documentation/config/versionsort.txt @@ -0,0 +1,33 @@ +versionsort.prereleaseSuffix (deprecated):: + Deprecated alias for `versionsort.suffix`. Ignored if + `versionsort.suffix` is set. + +versionsort.suffix:: + Even when version sort is used in linkgit:git-tag[1], tagnames + with the same base version but different suffixes are still sorted + lexicographically, resulting e.g. in prerelease tags appearing + after the main release (e.g. "1.0-rc1" after "1.0"). This + variable can be specified to determine the sorting order of tags + with different suffixes. ++ +By specifying a single suffix in this variable, any tagname containing +that suffix will appear before the corresponding main release. E.g. if +the variable is set to "-rc", then all "1.0-rcX" tags will appear before +"1.0". If specified multiple times, once per suffix, then the order of +suffixes in the configuration will determine the sorting order of tagnames +with those suffixes. E.g. if "-pre" appears before "-rc" in the +configuration, then all "1.0-preX" tags will be listed before any +"1.0-rcX" tags. The placement of the main release tag relative to tags +with various suffixes can be determined by specifying the empty suffix +among those other suffixes. E.g. if the suffixes "-rc", "", "-ck" and +"-bfs" appear in the configuration in this order, then all "v4.8-rcX" tags +are listed first, followed by "v4.8", then "v4.8-ckX" and finally +"v4.8-bfsX". ++ +If more than one suffixes match the same tagname, then that tagname will +be sorted according to the suffix which starts at the earliest position in +the tagname. If more than one different matching suffixes start at +that earliest position, then that tagname will be sorted according to the +longest of those suffixes. +The sorting order between different suffixes is undefined if they are +in multiple config files. -- 2.19.1.647.g708186aaf9
[PATCH 47/78] config.txt: move mergetool.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 54 +- Documentation/config/mergetool.txt | 53 + 2 files changed, 54 insertions(+), 53 deletions(-) create mode 100644 Documentation/config/mergetool.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 441787e815..35a6b4e0e0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -373,59 +373,7 @@ include::config/man.txt[] include::config/merge.txt[] -mergetool..path:: - Override the path for the given tool. This is useful in case - your tool is not in the PATH. - -mergetool..cmd:: - Specify the command to invoke the specified merge tool. The - specified command is evaluated in shell with the following - variables available: 'BASE' is the name of a temporary file - containing the common base of the files to be merged, if available; - 'LOCAL' is the name of a temporary file containing the contents of - the file on the current branch; 'REMOTE' is the name of a temporary - file containing the contents of the file from the branch being - merged; 'MERGED' contains the name of the file to which the merge - tool should write the results of a successful merge. - -mergetool..trustExitCode:: - For a custom merge command, specify whether the exit code of - the merge command can be used to determine whether the merge was - successful. If this is not set to true then the merge target file - timestamp is checked and the merge assumed to have been successful - if the file has been updated, otherwise the user is prompted to - indicate the success of the merge. - -mergetool.meld.hasOutput:: - Older versions of `meld` do not support the `--output` option. - Git will attempt to detect whether `meld` supports `--output` - by inspecting the output of `meld --help`. Configuring - `mergetool.meld.hasOutput` will make Git skip these checks and - use the configured value instead. Setting `mergetool.meld.hasOutput` - to `true` tells Git to unconditionally use the `--output` option, - and `false` avoids using `--output`. - -mergetool.keepBackup:: - After performing a merge, the original file with conflict markers - can be saved as a file with a `.orig` extension. If this variable - is set to `false` then this file is not preserved. Defaults to - `true` (i.e. keep the backup files). - -mergetool.keepTemporaries:: - When invoking a custom merge tool, Git uses a set of temporary - files to pass to the tool. If the tool returns an error and this - variable is set to `true`, then these temporary files will be - preserved, otherwise they will be removed after the tool has - exited. Defaults to `false`. - -mergetool.writeToTemp:: - Git writes temporary 'BASE', 'LOCAL', and 'REMOTE' versions of - conflicting files in the worktree by default. Git will attempt - to use a temporary directory for these files when set `true`. - Defaults to `false`. - -mergetool.prompt:: - Prompt before each invocation of the merge resolution program. +include::config/mergetool.txt[] notes.mergeStrategy:: Which merge strategy to choose by default when resolving notes diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt new file mode 100644 index 00..09ed31dbfa --- /dev/null +++ b/Documentation/config/mergetool.txt @@ -0,0 +1,53 @@ +mergetool..path:: + Override the path for the given tool. This is useful in case + your tool is not in the PATH. + +mergetool..cmd:: + Specify the command to invoke the specified merge tool. The + specified command is evaluated in shell with the following + variables available: 'BASE' is the name of a temporary file + containing the common base of the files to be merged, if available; + 'LOCAL' is the name of a temporary file containing the contents of + the file on the current branch; 'REMOTE' is the name of a temporary + file containing the contents of the file from the branch being + merged; 'MERGED' contains the name of the file to which the merge + tool should write the results of a successful merge. + +mergetool..trustExitCode:: + For a custom merge command, specify whether the exit code of + the merge command can be used to determine whether the merge was + successful. If this is not set to true then the merge target file + timestamp is checked and the merge assumed to have been successful + if the file has been updated, otherwise the user is prompted to + indicate the success of the merge. + +mergetool.meld.hasOutput:: + Older versions of `meld` do not support the `--output` option. + Git will attempt to detect whether `meld` supports `--output` +
[PATCH 55/78] config.txt: move rebase-config.txt to config/
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/config.txt | 2 +-
Documentation/{rebase-config.txt => config/rebase.txt} | 0
Documentation/git-rebase.txt | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename Documentation/{rebase-config.txt => config/rebase.txt} (100%)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index a6934fd87b..0079cb31ff 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -389,7 +389,7 @@ include::config/pull.txt[]
include::config/push.txt[]
-include::rebase-config.txt[]
+include::config/rebase.txt[]
include::receive-config.txt[]
diff --git a/Documentation/rebase-config.txt b/Documentation/config/rebase.txt
similarity index 100%
rename from Documentation/rebase-config.txt
rename to Documentation/config/rebase.txt
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 432baabe33..e98d1ac8ae 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -203,7 +203,7 @@ Alternatively, you can undo the 'git rebase' with
CONFIGURATION
-
-include::rebase-config.txt[]
+include::config/rebase.txt[]
OPTIONS
---
--
2.19.1.647.g708186aaf9
[PATCH 51/78] config.txt: move pretty.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 10 +- Documentation/config/pretty.txt | 9 + 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 Documentation/config/pretty.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index a7b72d2722..d55776c383 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -381,15 +381,7 @@ include::config/pack.txt[] include::config/pager.txt[] -pretty.:: - Alias for a --pretty= format string, as specified in - linkgit:git-log[1]. Any aliases defined here can be used just - as the built-in pretty formats could. For example, - running `git config pretty.changelog "format:* %H %s"` - would cause the invocation `git log --pretty=changelog` - to be equivalent to running `git log "--pretty=format:* %H %s"`. - Note that an alias with the same name as a built-in format - will be silently ignored. +include::config/pretty.txt[] protocol.allow:: If set, provide a user defined default policy for all protocols which diff --git a/Documentation/config/pretty.txt b/Documentation/config/pretty.txt new file mode 100644 index 00..063c6b63d9 --- /dev/null +++ b/Documentation/config/pretty.txt @@ -0,0 +1,9 @@ +pretty.:: + Alias for a --pretty= format string, as specified in + linkgit:git-log[1]. Any aliases defined here can be used just + as the built-in pretty formats could. For example, + running `git config pretty.changelog "format:* %H %s"` + would cause the invocation `git log --pretty=changelog` + to be equivalent to running `git log "--pretty=format:* %H %s"`. + Note that an alias with the same name as a built-in format + will be silently ignored. -- 2.19.1.647.g708186aaf9
[PATCH 67/78] config.txt: move stash.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 10 +- Documentation/config/stash.txt | 9 + 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 Documentation/config/stash.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 5e9fc20c41..aedc73f4eb 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -415,15 +415,7 @@ include::config/ssh.txt[] include::config/status.txt[] -stash.showPatch:: - If this is set to true, the `git stash show` command without an - option will show the stash entry in patch form. Defaults to false. - See description of 'show' command in linkgit:git-stash[1]. - -stash.showStat:: - If this is set to true, the `git stash show` command without an - option will show diffstat of the stash entry. Defaults to true. - See description of 'show' command in linkgit:git-stash[1]. +include::config/stash.txt[] include::submodule-config.txt[] diff --git a/Documentation/config/stash.txt b/Documentation/config/stash.txt new file mode 100644 index 00..c583d46d6b --- /dev/null +++ b/Documentation/config/stash.txt @@ -0,0 +1,9 @@ +stash.showPatch:: + If this is set to true, the `git stash show` command without an + option will show the stash entry in patch form. Defaults to false. + See description of 'show' command in linkgit:git-stash[1]. + +stash.showStat:: + If this is set to true, the `git stash show` command without an + option will show diffstat of the stash entry. Defaults to true. + See description of 'show' command in linkgit:git-stash[1]. -- 2.19.1.647.g708186aaf9
[PATCH 65/78] config.txt: move splitIndex.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 25 + Documentation/config/splitindex.txt | 24 2 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 Documentation/config/splitindex.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 56cfe3e857..13beb1ea18 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -409,30 +409,7 @@ include::config/sequencer.txt[] include::config/showbranch.txt[] -splitIndex.maxPercentChange:: - When the split index feature is used, this specifies the - percent of entries the split index can contain compared to the - total number of entries in both the split index and the shared - index before a new shared index is written. - The value should be between 0 and 100. If the value is 0 then - a new shared index is always written, if it is 100 a new - shared index is never written. - By default the value is 20, so a new shared index is written - if the number of entries in the split index would be greater - than 20 percent of the total number of entries. - See linkgit:git-update-index[1]. - -splitIndex.sharedIndexExpire:: - When the split index feature is used, shared index files that - were not modified since the time this variable specifies will - be removed when a new shared index file is created. The value - "now" expires all entries immediately, and "never" suppresses - expiration altogether. - The default value is "2.weeks.ago". - Note that a shared index file is considered modified (for the - purpose of expiration) each time a new split-index file is - either created based on it or read from it. - See linkgit:git-update-index[1]. +include::config/splitindex.txt[] include::config/ssh.txt[] diff --git a/Documentation/config/splitindex.txt b/Documentation/config/splitindex.txt new file mode 100644 index 00..afdb186df8 --- /dev/null +++ b/Documentation/config/splitindex.txt @@ -0,0 +1,24 @@ +splitIndex.maxPercentChange:: + When the split index feature is used, this specifies the + percent of entries the split index can contain compared to the + total number of entries in both the split index and the shared + index before a new shared index is written. + The value should be between 0 and 100. If the value is 0 then + a new shared index is always written, if it is 100 a new + shared index is never written. + By default the value is 20, so a new shared index is written + if the number of entries in the split index would be greater + than 20 percent of the total number of entries. + See linkgit:git-update-index[1]. + +splitIndex.sharedIndexExpire:: + When the split index feature is used, shared index files that + were not modified since the time this variable specifies will + be removed when a new shared index file is created. The value + "now" expires all entries immediately, and "never" suppresses + expiration altogether. + The default value is "2.weeks.ago". + Note that a shared index file is considered modified (for the + purpose of expiration) each time a new split-index file is + either created based on it or read from it. + See linkgit:git-update-index[1]. -- 2.19.1.647.g708186aaf9
[PATCH 77/78] config.txt: move worktree.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 10 +- Documentation/config/worktree.txt | 9 + 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 Documentation/config/worktree.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 10617d0a10..75b8f6964d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -435,12 +435,4 @@ include::config/versionsort.txt[] include::config/web.txt[] -worktree.guessRemote:: - With `add`, if no branch argument, and neither of `-b` nor - `-B` nor `--detach` are given, the command defaults to - creating a new branch from HEAD. If `worktree.guessRemote` is - set to true, `worktree add` tries to find a remote-tracking - branch whose name uniquely matches the new branch name. If - such a branch exists, it is checked out and set as "upstream" - for the new branch. If no such match can be found, it falls - back to creating a new branch from the current HEAD. +include::config/worktree.txt[] diff --git a/Documentation/config/worktree.txt b/Documentation/config/worktree.txt new file mode 100644 index 00..b853798fc2 --- /dev/null +++ b/Documentation/config/worktree.txt @@ -0,0 +1,9 @@ +worktree.guessRemote:: + With `add`, if no branch argument, and neither of `-b` nor + `-B` nor `--detach` are given, the command defaults to + creating a new branch from HEAD. If `worktree.guessRemote` is + set to true, `worktree add` tries to find a remote-tracking + branch whose name uniquely matches the new branch name. If + such a branch exists, it is checked out and set as "upstream" + for the new branch. If no such match can be found, it falls + back to creating a new branch from the current HEAD. -- 2.19.1.647.g708186aaf9
[PATCH 66/78] config.txt: move status.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 73 + Documentation/config/status.txt | 72 2 files changed, 73 insertions(+), 72 deletions(-) create mode 100644 Documentation/config/status.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 13beb1ea18..5e9fc20c41 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -413,78 +413,7 @@ include::config/splitindex.txt[] include::config/ssh.txt[] -status.relativePaths:: - By default, linkgit:git-status[1] shows paths relative to the - current directory. Setting this variable to `false` shows paths - relative to the repository root (this was the default for Git - prior to v1.5.4). - -status.short:: - Set to true to enable --short by default in linkgit:git-status[1]. - The option --no-short takes precedence over this variable. - -status.branch:: - Set to true to enable --branch by default in linkgit:git-status[1]. - The option --no-branch takes precedence over this variable. - -status.displayCommentPrefix:: - If set to true, linkgit:git-status[1] will insert a comment - prefix before each output line (starting with - `core.commentChar`, i.e. `#` by default). This was the - behavior of linkgit:git-status[1] in Git 1.8.4 and previous. - Defaults to false. - -status.renameLimit:: - The number of files to consider when performing rename detection - in linkgit:git-status[1] and linkgit:git-commit[1]. Defaults to - the value of diff.renameLimit. - -status.renames:: - Whether and how Git detects renames in linkgit:git-status[1] and - linkgit:git-commit[1] . If set to "false", rename detection is - disabled. If set to "true", basic rename detection is enabled. - If set to "copies" or "copy", Git will detect copies, as well. - Defaults to the value of diff.renames. - -status.showStash:: - If set to true, linkgit:git-status[1] will display the number of - entries currently stashed away. - Defaults to false. - -status.showUntrackedFiles:: - By default, linkgit:git-status[1] and linkgit:git-commit[1] show - files which are not currently tracked by Git. Directories which - contain only untracked files, are shown with the directory name - only. Showing untracked files means that Git needs to lstat() all - the files in the whole repository, which might be slow on some - systems. So, this variable controls how the commands displays - the untracked files. Possible values are: -+ --- -* `no` - Show no untracked files. -* `normal` - Show untracked files and directories. -* `all` - Show also individual files in untracked directories. --- -+ -If this variable is not specified, it defaults to 'normal'. -This variable can be overridden with the -u|--untracked-files option -of linkgit:git-status[1] and linkgit:git-commit[1]. - -status.submoduleSummary:: - Defaults to false. - If this is set to a non zero number or true (identical to -1 or an - unlimited number), the submodule summary will be enabled and a - summary of commits for modified submodules will be shown (see - --summary-limit option of linkgit:git-submodule[1]). Please note - that the summary output command will be suppressed for all - submodules when `diff.ignoreSubmodules` is set to 'all' or only - for those submodules where `submodule..ignore=all`. The only - exception to that rule is that status and commit will show staged - submodule changes. To - also view the summary for ignored submodules you can either use - the --ignore-submodules=dirty command-line option or the 'git - submodule summary' command, which shows a similar output but does - not honor these settings. +include::config/status.txt[] stash.showPatch:: If this is set to true, the `git stash show` command without an diff --git a/Documentation/config/status.txt b/Documentation/config/status.txt new file mode 100644 index 00..ed72fa7dae --- /dev/null +++ b/Documentation/config/status.txt @@ -0,0 +1,72 @@ +status.relativePaths:: + By default, linkgit:git-status[1] shows paths relative to the + current directory. Setting this variable to `false` shows paths + relative to the repository root (this was the default for Git + prior to v1.5.4). + +status.short:: + Set to true to enable --short by default in linkgit:git-status[1]. + The option --no-short takes precedence over this variable. + +status.branch:: + Set to true to enable --branch by default in linkgit:git-status[1]. + The option --no-branch takes precedence over this variable. + +status.displayCommentPrefix:: + If set to true, linkgit:git-status[1] will insert a comment + prefix before each output line (starting with + `
[PATCH 42/78] config.txt: move log.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 44 +--- Documentation/config/log.txt | 43 +++ 2 files changed, 44 insertions(+), 43 deletions(-) create mode 100644 Documentation/config/log.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 763bb291e5..cce89ea50c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -363,49 +363,7 @@ include::config/instaweb.txt[] include::config/interactive.txt[] -log.abbrevCommit:: - If true, makes linkgit:git-log[1], linkgit:git-show[1], and - linkgit:git-whatchanged[1] assume `--abbrev-commit`. You may - override this option with `--no-abbrev-commit`. - -log.date:: - Set the default date-time mode for the 'log' command. - Setting a value for log.date is similar to using 'git log''s - `--date` option. See linkgit:git-log[1] for details. - -log.decorate:: - Print out the ref names of any commits that are shown by the log - command. If 'short' is specified, the ref name prefixes 'refs/heads/', - 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is - specified, the full ref name (including prefix) will be printed. - If 'auto' is specified, then if the output is going to a terminal, - the ref names are shown as if 'short' were given, otherwise no ref - names are shown. This is the same as the `--decorate` option - of the `git log`. - -log.follow:: - If `true`, `git log` will act as if the `--follow` option was used when - a single is given. This has the same limitations as `--follow`, - i.e. it cannot be used to follow multiple files and does not work well - on non-linear history. - -log.graphColors:: - A list of colors, separated by commas, that can be used to draw - history lines in `git log --graph`. - -log.showRoot:: - If true, the initial commit will be shown as a big creation event. - This is equivalent to a diff against an empty tree. - Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which - normally hide the root commit will now show it. True by default. - -log.showSignature:: - If true, makes linkgit:git-log[1], linkgit:git-show[1], and - linkgit:git-whatchanged[1] assume `--show-signature`. - -log.mailmap:: - If true, makes linkgit:git-log[1], linkgit:git-show[1], and - linkgit:git-whatchanged[1] assume `--use-mailmap`. +include::config/log.txt[] mailinfo.scissors:: If true, makes linkgit:git-mailinfo[1] (and therefore diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt new file mode 100644 index 00..78d9e4453a --- /dev/null +++ b/Documentation/config/log.txt @@ -0,0 +1,43 @@ +log.abbrevCommit:: + If true, makes linkgit:git-log[1], linkgit:git-show[1], and + linkgit:git-whatchanged[1] assume `--abbrev-commit`. You may + override this option with `--no-abbrev-commit`. + +log.date:: + Set the default date-time mode for the 'log' command. + Setting a value for log.date is similar to using 'git log''s + `--date` option. See linkgit:git-log[1] for details. + +log.decorate:: + Print out the ref names of any commits that are shown by the log + command. If 'short' is specified, the ref name prefixes 'refs/heads/', + 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is + specified, the full ref name (including prefix) will be printed. + If 'auto' is specified, then if the output is going to a terminal, + the ref names are shown as if 'short' were given, otherwise no ref + names are shown. This is the same as the `--decorate` option + of the `git log`. + +log.follow:: + If `true`, `git log` will act as if the `--follow` option was used when + a single is given. This has the same limitations as `--follow`, + i.e. it cannot be used to follow multiple files and does not work well + on non-linear history. + +log.graphColors:: + A list of colors, separated by commas, that can be used to draw + history lines in `git log --graph`. + +log.showRoot:: + If true, the initial commit will be shown as a big creation event. + This is equivalent to a diff against an empty tree. + Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which + normally hide the root commit will now show it. True by default. + +log.showSignature:: + If true, makes linkgit:git-log[1], linkgit:git-show[1], and + linkgit:git-whatchanged[1] assume `--show-signature`. + +log.mailmap:: + If true, makes linkgit:git-log[1], linkgit:git-show[1], and + linkgit:git-whatchanged[1] assume `--use-mailmap`. -- 2.19.1.647.g708186aaf9
[PATCH 71/78] config.txt: move uploadarchive.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 7 +-- Documentation/config/uploadarchive.txt | 6 ++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 Documentation/config/uploadarchive.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 07100e236e..00cc2791b5 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -423,12 +423,7 @@ include::config/tag.txt[] include::config/transfer.txt[] -uploadarchive.allowUnreachable:: - If true, allow clients to use `git archive --remote` to request - any tree, whether reachable from the ref tips or not. See the - discussion in the "SECURITY" section of - linkgit:git-upload-archive[1] for more details. Defaults to - `false`. +include::config/uploadarchive.txt[] uploadpack.hideRefs:: This variable is the same as `transfer.hideRefs`, but applies diff --git a/Documentation/config/uploadarchive.txt b/Documentation/config/uploadarchive.txt new file mode 100644 index 00..e0698e8c1d --- /dev/null +++ b/Documentation/config/uploadarchive.txt @@ -0,0 +1,6 @@ +uploadarchive.allowUnreachable:: + If true, allow clients to use `git archive --remote` to request + any tree, whether reachable from the ref tips or not. See the + discussion in the "SECURITY" section of + linkgit:git-upload-archive[1] for more details. Defaults to + `false`. -- 2.19.1.647.g708186aaf9
[PATCH 56/78] config.txt: move receive-config.txt to config/
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/config.txt | 2 +-
Documentation/{receive-config.txt => config/receive.txt} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename Documentation/{receive-config.txt => config/receive.txt} (100%)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0079cb31ff..465dc2abec 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -391,7 +391,7 @@ include::config/push.txt[]
include::config/rebase.txt[]
-include::receive-config.txt[]
+include::config/receive.txt[]
remote.pushDefault::
The remote to push to by default. Overrides
diff --git a/Documentation/receive-config.txt b/Documentation/config/receive.txt
similarity index 100%
rename from Documentation/receive-config.txt
rename to Documentation/config/receive.txt
--
2.19.1.647.g708186aaf9
[PATCH 46/78] config.txt: move merge-config.txt to config/
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/config.txt | 2 +-
Documentation/{merge-config.txt => config/merge.txt} | 4 ++--
Documentation/git-merge.txt | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
rename Documentation/{merge-config.txt => config/merge.txt} (98%)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index c3c92bc269..441787e815 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -371,7 +371,7 @@ include::config/mailmap.txt[]
include::config/man.txt[]
-include::merge-config.txt[]
+include::config/merge.txt[]
mergetool..path::
Override the path for the given tool. This is useful in case
diff --git a/Documentation/merge-config.txt b/Documentation/config/merge.txt
similarity index 98%
rename from Documentation/merge-config.txt
rename to Documentation/config/merge.txt
index 0bb703fbac..321d1c8ba9 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/config/merge.txt
@@ -30,7 +30,7 @@ merge.verifySignatures::
If true, this is equivalent to the --verify-signatures command
line option. See linkgit:git-merge[1] for details.
-include::config/fmt-merge-msg.txt[]
+include::fmt-merge-msg.txt[]
merge.renameLimit::
The number of files to consider when performing rename detection
@@ -63,7 +63,7 @@ merge.tool::
Any other value is treated as a custom merge tool and requires
that a corresponding mergetool..cmd variable is defined.
-include::mergetools-merge.txt[]
+include::../mergetools-merge.txt[]
merge.verbosity::
Controls the amount of output shown by the recursive merge
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index eb36837f86..4cc86469f3 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -342,7 +342,7 @@ include::merge-strategies.txt[]
CONFIGURATION
-
-include::merge-config.txt[]
+include::config/merge.txt[]
branch..mergeOptions::
Sets default options for merging into branch . The syntax and
--
2.19.1.647.g708186aaf9
[PATCH 40/78] config.txt: move instaweb.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 21 + Documentation/config/instaweb.txt | 20 2 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 Documentation/config/instaweb.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 94b14af9f3..5b6e2971e3 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -359,26 +359,7 @@ include::config/index.txt[] include::config/init.txt[] -instaweb.browser:: - Specify the program that will be used to browse your working - repository in gitweb. See linkgit:git-instaweb[1]. - -instaweb.httpd:: - The HTTP daemon command-line to start gitweb on your working - repository. See linkgit:git-instaweb[1]. - -instaweb.local:: - If true the web server started by linkgit:git-instaweb[1] will - be bound to the local IP (127.0.0.1). - -instaweb.modulePath:: - The default module path for linkgit:git-instaweb[1] to use - instead of /usr/lib/apache2/modules. Only used if httpd - is Apache. - -instaweb.port:: - The port number to bind the gitweb httpd to. See - linkgit:git-instaweb[1]. +include::config/instaweb.txt[] interactive.singleKey:: In interactive commands, allow the user to provide one-letter diff --git a/Documentation/config/instaweb.txt b/Documentation/config/instaweb.txt new file mode 100644 index 00..50cb2f7d62 --- /dev/null +++ b/Documentation/config/instaweb.txt @@ -0,0 +1,20 @@ +instaweb.browser:: + Specify the program that will be used to browse your working + repository in gitweb. See linkgit:git-instaweb[1]. + +instaweb.httpd:: + The HTTP daemon command-line to start gitweb on your working + repository. See linkgit:git-instaweb[1]. + +instaweb.local:: + If true the web server started by linkgit:git-instaweb[1] will + be bound to the local IP (127.0.0.1). + +instaweb.modulePath:: + The default module path for linkgit:git-instaweb[1] to use + instead of /usr/lib/apache2/modules. Only used if httpd + is Apache. + +instaweb.port:: + The port number to bind the gitweb httpd to. See + linkgit:git-instaweb[1]. -- 2.19.1.647.g708186aaf9
[PATCH 50/78] config.txt: move pager.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 9 + Documentation/config/pager.txt | 8 2 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 Documentation/config/pager.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 4e839db64c..a7b72d2722 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -379,14 +379,7 @@ include::config/notes.txt[] include::config/pack.txt[] -pager.:: - If the value is boolean, turns on or off pagination of the - output of a particular Git subcommand when writing to a tty. - Otherwise, turns on pagination for the subcommand using the - pager specified by the value of `pager.`. If `--paginate` - or `--no-pager` is specified on the command line, it takes - precedence over this option. To disable pagination for all - commands, set `core.pager` or `GIT_PAGER` to `cat`. +include::config/pager.txt[] pretty.:: Alias for a --pretty= format string, as specified in diff --git a/Documentation/config/pager.txt b/Documentation/config/pager.txt new file mode 100644 index 00..d3731cf66c --- /dev/null +++ b/Documentation/config/pager.txt @@ -0,0 +1,8 @@ +pager.:: + If the value is boolean, turns on or off pagination of the + output of a particular Git subcommand when writing to a tty. + Otherwise, turns on pagination for the subcommand using the + pager specified by the value of `pager.`. If `--paginate` + or `--no-pager` is specified on the command line, it takes + precedence over this option. To disable pagination for all + commands, set `core.pager` or `GIT_PAGER` to `cat`. -- 2.19.1.647.g708186aaf9
[PATCH 48/78] config.txt: move notes.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 60 +- Documentation/config/notes.txt | 59 + 2 files changed, 60 insertions(+), 59 deletions(-) create mode 100644 Documentation/config/notes.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 35a6b4e0e0..babe2e5682 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -375,65 +375,7 @@ include::config/merge.txt[] include::config/mergetool.txt[] -notes.mergeStrategy:: - Which merge strategy to choose by default when resolving notes - conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or - `cat_sort_uniq`. Defaults to `manual`. See "NOTES MERGE STRATEGIES" - section of linkgit:git-notes[1] for more information on each strategy. - -notes..mergeStrategy:: - Which merge strategy to choose when doing a notes merge into - refs/notes/. This overrides the more general - "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section in - linkgit:git-notes[1] for more information on the available strategies. - -notes.displayRef:: - The (fully qualified) refname from which to show notes when - showing commit messages. The value of this variable can be set - to a glob, in which case notes from all matching refs will be - shown. You may also specify this configuration variable - several times. A warning will be issued for refs that do not - exist, but a glob that does not match any refs is silently - ignored. -+ -This setting can be overridden with the `GIT_NOTES_DISPLAY_REF` -environment variable, which must be a colon separated list of refs or -globs. -+ -The effective value of "core.notesRef" (possibly overridden by -GIT_NOTES_REF) is also implicitly added to the list of refs to be -displayed. - -notes.rewrite.:: - When rewriting commits with (currently `amend` or - `rebase`) and this variable is set to `true`, Git - automatically copies your notes from the original to the - rewritten commit. Defaults to `true`, but see - "notes.rewriteRef" below. - -notes.rewriteMode:: - When copying notes during a rewrite (see the - "notes.rewrite." option), determines what to do if - the target commit already has a note. Must be one of - `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. - Defaults to `concatenate`. -+ -This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` -environment variable. - -notes.rewriteRef:: - When copying notes during a rewrite, specifies the (fully - qualified) ref whose notes should be copied. The ref may be a - glob, in which case notes in all matching refs will be copied. - You may also specify this configuration several times. -+ -Does not have a default value; you must configure this variable to -enable note rewriting. Set it to `refs/notes/commits` to enable -rewriting for the default commit notes. -+ -This setting can be overridden with the `GIT_NOTES_REWRITE_REF` -environment variable, which must be a colon separated list of refs or -globs. +include::config/notes.txt[] pack.window:: The size of the window used by linkgit:git-pack-objects[1] when no diff --git a/Documentation/config/notes.txt b/Documentation/config/notes.txt new file mode 100644 index 00..aeef56d49a --- /dev/null +++ b/Documentation/config/notes.txt @@ -0,0 +1,59 @@ +notes.mergeStrategy:: + Which merge strategy to choose by default when resolving notes + conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or + `cat_sort_uniq`. Defaults to `manual`. See "NOTES MERGE STRATEGIES" + section of linkgit:git-notes[1] for more information on each strategy. + +notes..mergeStrategy:: + Which merge strategy to choose when doing a notes merge into + refs/notes/. This overrides the more general + "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section in + linkgit:git-notes[1] for more information on the available strategies. + +notes.displayRef:: + The (fully qualified) refname from which to show notes when + showing commit messages. The value of this variable can be set + to a glob, in which case notes from all matching refs will be + shown. You may also specify this configuration variable + several times. A warning will be issued for refs that do not + exist, but a glob that does not match any refs is silently + ignored. ++ +This setting can be overridden with the `GIT_NOTES_DISPLAY_REF` +environment variable, which must be a colon separated list of refs or +globs. ++ +The effective value of "core.notesRef" (possibly overridden by +GIT_NOTES_REF) is also implicitly added to the list of refs to be +displayed. + +notes.rewrite.:: + When rewriting commits with (currently `amend` or + `rebase`) an
[PATCH 61/78] config.txt: move reset.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 3 +-- Documentation/config/reset.txt | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 Documentation/config/reset.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 71bab1f3b8..a6ce22a6d9 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -401,8 +401,7 @@ include::config/repack.txt[] include::config/rerere.txt[] -reset.quiet:: - When set to true, 'git reset' will default to the '--quiet' option. +include::config/reset.txt[] include::sendemail-config.txt[] diff --git a/Documentation/config/reset.txt b/Documentation/config/reset.txt new file mode 100644 index 00..63b7c45aac --- /dev/null +++ b/Documentation/config/reset.txt @@ -0,0 +1,2 @@ +reset.quiet:: + When set to true, 'git reset' will default to the '--quiet' option. -- 2.19.1.647.g708186aaf9
[PATCH 64/78] config.txt: move showBranch.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 4 +--- Documentation/config/showbranch.txt | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Documentation/config/showbranch.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index ab504eaba2..56cfe3e857 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -407,9 +407,7 @@ include::config/sendemail.txt[] include::config/sequencer.txt[] -showBranch.default:: - The default set of branches for linkgit:git-show-branch[1]. - See linkgit:git-show-branch[1]. +include::config/showbranch.txt[] splitIndex.maxPercentChange:: When the split index feature is used, this specifies the diff --git a/Documentation/config/showbranch.txt b/Documentation/config/showbranch.txt new file mode 100644 index 00..e79ecd9ee9 --- /dev/null +++ b/Documentation/config/showbranch.txt @@ -0,0 +1,3 @@ +showBranch.default:: + The default set of branches for linkgit:git-show-branch[1]. + See linkgit:git-show-branch[1]. -- 2.19.1.647.g708186aaf9
[PATCH 49/78] config.txt: move pack.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 121 +- Documentation/config/pack.txt | 120 + 2 files changed, 121 insertions(+), 120 deletions(-) create mode 100644 Documentation/config/pack.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index babe2e5682..4e839db64c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -377,126 +377,7 @@ include::config/mergetool.txt[] include::config/notes.txt[] -pack.window:: - The size of the window used by linkgit:git-pack-objects[1] when no - window size is given on the command line. Defaults to 10. - -pack.depth:: - The maximum delta depth used by linkgit:git-pack-objects[1] when no - maximum depth is given on the command line. Defaults to 50. - Maximum value is 4095. - -pack.windowMemory:: - The maximum size of memory that is consumed by each thread - in linkgit:git-pack-objects[1] for pack window memory when - no limit is given on the command line. The value can be - suffixed with "k", "m", or "g". When left unconfigured (or - set explicitly to 0), there will be no limit. - -pack.compression:: - An integer -1..9, indicating the compression level for objects - in a pack file. -1 is the zlib default. 0 means no - compression, and 1..9 are various speed/size tradeoffs, 9 being - slowest. If not set, defaults to core.compression. If that is - not set, defaults to -1, the zlib default, which is "a default - compromise between speed and compression (currently equivalent - to level 6)." -+ -Note that changing the compression level will not automatically recompress -all existing objects. You can force recompression by passing the -F option -to linkgit:git-repack[1]. - -pack.island:: - An extended regular expression configuring a set of delta - islands. See "DELTA ISLANDS" in linkgit:git-pack-objects[1] - for details. - -pack.islandCore:: - Specify an island name which gets to have its objects be - packed first. This creates a kind of pseudo-pack at the front - of one pack, so that the objects from the specified island are - hopefully faster to copy into any pack that should be served - to a user requesting these objects. In practice this means - that the island specified should likely correspond to what is - the most commonly cloned in the repo. See also "DELTA ISLANDS" - in linkgit:git-pack-objects[1]. - -pack.deltaCacheSize:: - The maximum memory in bytes used for caching deltas in - linkgit:git-pack-objects[1] before writing them out to a pack. - This cache is used to speed up the writing object phase by not - having to recompute the final delta result once the best match - for all objects is found. Repacking large repositories on machines - which are tight with memory might be badly impacted by this though, - especially if this cache pushes the system into swapping. - A value of 0 means no limit. The smallest size of 1 byte may be - used to virtually disable this cache. Defaults to 256 MiB. - -pack.deltaCacheLimit:: - The maximum size of a delta, that is cached in - linkgit:git-pack-objects[1]. This cache is used to speed up the - writing object phase by not having to recompute the final delta - result once the best match for all objects is found. - Defaults to 1000. Maximum value is 65535. - -pack.threads:: - Specifies the number of threads to spawn when searching for best - delta matches. This requires that linkgit:git-pack-objects[1] - be compiled with pthreads otherwise this option is ignored with a - warning. This is meant to reduce packing time on multiprocessor - machines. The required amount of memory for the delta search window - is however multiplied by the number of threads. - Specifying 0 will cause Git to auto-detect the number of CPU's - and set the number of threads accordingly. - -pack.indexVersion:: - Specify the default pack index version. Valid values are 1 for - legacy pack index used by Git versions prior to 1.5.2, and 2 for - the new pack index with capabilities for packs larger than 4 GB - as well as proper protection against the repacking of corrupted - packs. Version 2 is the default. Note that version 2 is enforced - and this config option ignored whenever the corresponding pack is - larger than 2 GB. -+ -If you have an old Git that does not understand the version 2 `*.idx` file, -cloning or fetching over a non native protocol (e.g. "http") -that will copy both `*.pack` file and corresponding `*.idx` file from the -other side may give you a repository that cannot be accessed with your -older version of Git. If the `*.pack` file is smaller than 2 GB, however, -y
[PATCH 18/78] config.txt: move diff-config.txt to config/
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/config.txt | 2 +-
Documentation/{diff-config.txt => config/diff.txt} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename Documentation/{diff-config.txt => config/diff.txt} (99%)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 83f5ce9056..5693ce7654 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -319,7 +319,7 @@ include::config/credential.txt[]
include::config/completion.txt[]
-include::diff-config.txt[]
+include::config/diff.txt[]
difftool..path::
Override the path for the given tool. This is useful in case
diff --git a/Documentation/diff-config.txt b/Documentation/config/diff.txt
similarity index 99%
rename from Documentation/diff-config.txt
rename to Documentation/config/diff.txt
index 85bca83c30..e4db77bc82 100644
--- a/Documentation/diff-config.txt
+++ b/Documentation/config/diff.txt
@@ -177,7 +177,7 @@ diff.tool::
Any other value is treated as a custom diff tool and requires
that a corresponding difftool..cmd variable is defined.
-include::mergetools-diff.txt[]
+include::../mergetools-diff.txt[]
diff.indentHeuristic::
Set this option to `true` to enable experimental heuristics
--
2.19.1.647.g708186aaf9
[PATCH 15/78] config.txt: move commit.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 30 +- Documentation/config/commit.txt | 29 + 2 files changed, 30 insertions(+), 29 deletions(-) create mode 100644 Documentation/config/commit.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 0618a7d974..bbae7e68bd 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -313,35 +313,7 @@ include::config/color.txt[] include::config/column.txt[] -commit.cleanup:: - This setting overrides the default of the `--cleanup` option in - `git commit`. See linkgit:git-commit[1] for details. Changing the - default can be useful when you always want to keep lines that begin - with comment character `#` in your log message, in which case you - would do `git config commit.cleanup whitespace` (note that you will - have to remove the help lines that begin with `#` in the commit log - template yourself, if you do this). - -commit.gpgSign:: - - A boolean to specify whether all commits should be GPG signed. - Use of this option when doing operations such as rebase can - result in a large number of commits being signed. It may be - convenient to use an agent to avoid typing your GPG passphrase - several times. - -commit.status:: - A boolean to enable/disable inclusion of status information in the - commit message template when using an editor to prepare the commit - message. Defaults to true. - -commit.template:: - Specify the pathname of a file to use as the template for - new commit messages. - -commit.verbose:: - A boolean or int to specify the level of verbose with `git commit`. - See linkgit:git-commit[1]. +include::config/commit.txt[] credential.helper:: Specify an external helper to be called when a username or diff --git a/Documentation/config/commit.txt b/Documentation/config/commit.txt new file mode 100644 index 00..2c95573930 --- /dev/null +++ b/Documentation/config/commit.txt @@ -0,0 +1,29 @@ +commit.cleanup:: + This setting overrides the default of the `--cleanup` option in + `git commit`. See linkgit:git-commit[1] for details. Changing the + default can be useful when you always want to keep lines that begin + with comment character `#` in your log message, in which case you + would do `git config commit.cleanup whitespace` (note that you will + have to remove the help lines that begin with `#` in the commit log + template yourself, if you do this). + +commit.gpgSign:: + + A boolean to specify whether all commits should be GPG signed. + Use of this option when doing operations such as rebase can + result in a large number of commits being signed. It may be + convenient to use an agent to avoid typing your GPG passphrase + several times. + +commit.status:: + A boolean to enable/disable inclusion of status information in the + commit message template when using an editor to prepare the commit + message. Defaults to true. + +commit.template:: + Specify the pathname of a file to use as the template for + new commit messages. + +commit.verbose:: + A boolean or int to specify the level of verbose with `git commit`. + See linkgit:git-commit[1]. -- 2.19.1.647.g708186aaf9
[PATCH 14/78] config.txt: move column.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 56 + Documentation/config/column.txt | 55 2 files changed, 56 insertions(+), 55 deletions(-) create mode 100644 Documentation/config/column.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 399c23e0c5..0618a7d974 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -311,61 +311,7 @@ include::config/clean.txt[] include::config/color.txt[] -column.ui:: - Specify whether supported commands should output in columns. - This variable consists of a list of tokens separated by spaces - or commas: -+ -These options control when the feature should be enabled -(defaults to 'never'): -+ --- -`always`;; - always show in columns -`never`;; - never show in columns -`auto`;; - show in columns if the output is to the terminal --- -+ -These options control layout (defaults to 'column'). Setting any -of these implies 'always' if none of 'always', 'never', or 'auto' are -specified. -+ --- -`column`;; - fill columns before rows -`row`;; - fill rows before columns -`plain`;; - show in one column --- -+ -Finally, these options can be combined with a layout option (defaults -to 'nodense'): -+ --- -`dense`;; - make unequal size columns to utilize more space -`nodense`;; - make equal size columns --- - -column.branch:: - Specify whether to output branch listing in `git branch` in columns. - See `column.ui` for details. - -column.clean:: - Specify the layout when list items in `git clean -i`, which always - shows files and directories in columns. See `column.ui` for details. - -column.status:: - Specify whether to output untracked files in `git status` in columns. - See `column.ui` for details. - -column.tag:: - Specify whether to output tag listing in `git tag` in columns. - See `column.ui` for details. +include::config/column.txt[] commit.cleanup:: This setting overrides the default of the `--cleanup` option in diff --git a/Documentation/config/column.txt b/Documentation/config/column.txt new file mode 100644 index 00..76aa2f29dc --- /dev/null +++ b/Documentation/config/column.txt @@ -0,0 +1,55 @@ +column.ui:: + Specify whether supported commands should output in columns. + This variable consists of a list of tokens separated by spaces + or commas: ++ +These options control when the feature should be enabled +(defaults to 'never'): ++ +-- +`always`;; + always show in columns +`never`;; + never show in columns +`auto`;; + show in columns if the output is to the terminal +-- ++ +These options control layout (defaults to 'column'). Setting any +of these implies 'always' if none of 'always', 'never', or 'auto' are +specified. ++ +-- +`column`;; + fill columns before rows +`row`;; + fill rows before columns +`plain`;; + show in one column +-- ++ +Finally, these options can be combined with a layout option (defaults +to 'nodense'): ++ +-- +`dense`;; + make unequal size columns to utilize more space +`nodense`;; + make equal size columns +-- + +column.branch:: + Specify whether to output branch listing in `git branch` in columns. + See `column.ui` for details. + +column.clean:: + Specify the layout when list items in `git clean -i`, which always + shows files and directories in columns. See `column.ui` for details. + +column.status:: + Specify whether to output untracked files in `git status` in columns. + See `column.ui` for details. + +column.tag:: + Specify whether to output tag listing in `git tag` in columns. + See `column.ui` for details. -- 2.19.1.647.g708186aaf9
[PATCH 25/78] config.txt: move fsck.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/config.txt | 68 +--
Documentation/config/fsck.txt | 67 ++
2 files changed, 68 insertions(+), 67 deletions(-)
create mode 100644 Documentation/config/fsck.txt
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 3dc2285ba5..f70f95d5cf 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -331,73 +331,7 @@ include::config/format.txt[]
include::config/filter.txt[]
-fsck.::
- During fsck git may find issues with legacy data which
- wouldn't be generated by current versions of git, and which
- wouldn't be sent over the wire if `transfer.fsckObjects` was
- set. This feature is intended to support working with legacy
- repositories containing such data.
-+
-Setting `fsck.` will be picked up by linkgit:git-fsck[1], but
-to accept pushes of such data set `receive.fsck.` instead, or
-to clone or fetch it set `fetch.fsck.`.
-+
-The rest of the documentation discusses `fsck.*` for brevity, but the
-same applies for the corresponding `receive.fsck.*` and
-`fetch..*`. variables.
-+
-Unlike variables like `color.ui` and `core.editor` the
-`receive.fsck.` and `fetch.fsck.` variables will not
-fall back on the `fsck.` configuration if they aren't set. To
-uniformly configure the same fsck settings in different circumstances
-all three of them they must all set to the same values.
-+
-When `fsck.` is set, errors can be switched to warnings and
-vice versa by configuring the `fsck.` setting where the
-`` is the fsck message ID and the value is one of `error`,
-`warn` or `ignore`. For convenience, fsck prefixes the error/warning
-with the message ID, e.g. "missingEmail: invalid author/committer line
-- missing email" means that setting `fsck.missingEmail = ignore` will
-hide that issue.
-+
-In general, it is better to enumerate existing objects with problems
-with `fsck.skipList`, instead of listing the kind of breakages these
-problematic objects share to be ignored, as doing the latter will
-allow new instances of the same breakages go unnoticed.
-+
-Setting an unknown `fsck.` value will cause fsck to die, but
-doing the same for `receive.fsck.` and `fetch.fsck.`
-will only cause git to warn.
-
-fsck.skipList::
- The path to a list of object names (i.e. one unabbreviated SHA-1 per
- line) that are known to be broken in a non-fatal way and should
- be ignored. On versions of Git 2.20 and later comments ('#'), empty
- lines, and any leading and trailing whitespace is ignored. Everything
- but a SHA-1 per line will error out on older versions.
-+
-This feature is useful when an established project should be accepted
-despite early commits containing errors that can be safely ignored
-such as invalid committer email addresses. Note: corrupt objects
-cannot be skipped with this setting.
-+
-Like `fsck.` this variable has corresponding
-`receive.fsck.skipList` and `fetch.fsck.skipList` variants.
-+
-Unlike variables like `color.ui` and `core.editor` the
-`receive.fsck.skipList` and `fetch.fsck.skipList` variables will not
-fall back on the `fsck.skipList` configuration if they aren't set. To
-uniformly configure the same fsck settings in different circumstances
-all three of them they must all set to the same values.
-+
-Older versions of Git (before 2.20) documented that the object names
-list should be sorted. This was never a requirement, the object names
-could appear in any order, but when reading the list we tracked whether
-the list was sorted for the purposes of an internal binary search
-implementation, which could save itself some work with an already sorted
-list. Unless you had a humongous list there was no reason to go out of
-your way to pre-sort the list. After Git version 2.20 a hash implementation
-is used instead, so there's now no reason to pre-sort the list.
+include::config/fsck.txt[]
gc.aggressiveDepth::
The depth parameter used in the delta compression
diff --git a/Documentation/config/fsck.txt b/Documentation/config/fsck.txt
new file mode 100644
index 00..879c5a29c4
--- /dev/null
+++ b/Documentation/config/fsck.txt
@@ -0,0 +1,67 @@
+fsck.::
+ During fsck git may find issues with legacy data which
+ wouldn't be generated by current versions of git, and which
+ wouldn't be sent over the wire if `transfer.fsckObjects` was
+ set. This feature is intended to support working with legacy
+ repositories containing such data.
++
+Setting `fsck.` will be picked up by linkgit:git-fsck[1], but
+to accept pushes of such data set `receive.fsck.` instead, or
+to clone or fetch it set `fetch.fsck.`.
++
+The rest of the documentation discusses `fsck.*` for brevity, but the
+same applies for the corresponding `receive.fsck.*` and
+`fetch..*`. variables.
++
+Unlike variables like `color.ui` and `core.editor` the
+`receive.fsck.` and `fetch.fsck.` var
[PATCH 06/78] config.txt: move am.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 15 +-- Documentation/config/am.txt | 14 ++ 2 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 Documentation/config/am.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index f207cae90c..5e0f76fc6e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -295,20 +295,7 @@ include::config/add.txt[] include::config/alias.txt[] -am.keepcr:: - If true, git-am will call git-mailsplit for patches in mbox format - with parameter `--keep-cr`. In this case git-mailsplit will - not remove `\r` from lines ending with `\r\n`. Can be overridden - by giving `--no-keep-cr` from the command line. - See linkgit:git-am[1], linkgit:git-mailsplit[1]. - -am.threeWay:: - By default, `git am` will fail if the patch does not apply cleanly. When - set to true, this setting tells `git am` to fall back on 3-way merge if - the patch records the identity of blobs it is supposed to apply to and - we have those blobs available locally (equivalent to giving the `--3way` - option from the command line). Defaults to `false`. - See linkgit:git-am[1]. +include::config/am.txt[] apply.ignoreWhitespace:: When set to 'change', tells 'git apply' to ignore changes in diff --git a/Documentation/config/am.txt b/Documentation/config/am.txt new file mode 100644 index 00..5bcad2efb1 --- /dev/null +++ b/Documentation/config/am.txt @@ -0,0 +1,14 @@ +am.keepcr:: + If true, git-am will call git-mailsplit for patches in mbox format + with parameter `--keep-cr`. In this case git-mailsplit will + not remove `\r` from lines ending with `\r\n`. Can be overridden + by giving `--no-keep-cr` from the command line. + See linkgit:git-am[1], linkgit:git-mailsplit[1]. + +am.threeWay:: + By default, `git am` will fail if the patch does not apply cleanly. When + set to true, this setting tells `git am` to fall back on 3-way merge if + the patch records the identity of blobs it is supposed to apply to and + we have those blobs available locally (equivalent to giving the `--3way` + option from the command line). Defaults to `false`. + See linkgit:git-am[1]. -- 2.19.1.647.g708186aaf9
[PATCH 03/78] config.txt: move core.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 595 +- Documentation/config/core.txt | 594 + 2 files changed, 595 insertions(+), 594 deletions(-) create mode 100644 Documentation/config/core.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 4d2e21b534..2ba70144c7 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -289,600 +289,7 @@ other popular tools, and describe them in your documentation. include::config/advice.txt[] -core.fileMode:: - Tells Git if the executable bit of files in the working tree - is to be honored. -+ -Some filesystems lose the executable bit when a file that is -marked as executable is checked out, or checks out a -non-executable file with executable bit on. -linkgit:git-clone[1] or linkgit:git-init[1] probe the filesystem -to see if it handles the executable bit correctly -and this variable is automatically set as necessary. -+ -A repository, however, may be on a filesystem that handles -the filemode correctly, and this variable is set to 'true' -when created, but later may be made accessible from another -environment that loses the filemode (e.g. exporting ext4 via -CIFS mount, visiting a Cygwin created repository with -Git for Windows or Eclipse). -In such a case it may be necessary to set this variable to 'false'. -See linkgit:git-update-index[1]. -+ -The default is true (when core.filemode is not specified in the config file). - -core.hideDotFiles:: - (Windows-only) If true, mark newly-created directories and files whose - name starts with a dot as hidden. If 'dotGitOnly', only the `.git/` - directory is hidden, but no other files starting with a dot. The - default mode is 'dotGitOnly'. - -core.ignoreCase:: - Internal variable which enables various workarounds to enable - Git to work better on filesystems that are not case sensitive, - like APFS, HFS+, FAT, NTFS, etc. For example, if a directory listing - finds "makefile" when Git expects "Makefile", Git will assume - it is really the same file, and continue to remember it as - "Makefile". -+ -The default is false, except linkgit:git-clone[1] or linkgit:git-init[1] -will probe and set core.ignoreCase true if appropriate when the repository -is created. -+ -Git relies on the proper configuration of this variable for your operating -and file system. Modifying this value may result in unexpected behavior. - -core.precomposeUnicode:: - This option is only used by Mac OS implementation of Git. - When core.precomposeUnicode=true, Git reverts the unicode decomposition - of filenames done by Mac OS. This is useful when sharing a repository - between Mac OS and Linux or Windows. - (Git for Windows 1.7.10 or higher is needed, or Git under cygwin 1.7). - When false, file names are handled fully transparent by Git, - which is backward compatible with older versions of Git. - -core.protectHFS:: - If set to true, do not allow checkout of paths that would - be considered equivalent to `.git` on an HFS+ filesystem. - Defaults to `true` on Mac OS, and `false` elsewhere. - -core.protectNTFS:: - If set to true, do not allow checkout of paths that would - cause problems with the NTFS filesystem, e.g. conflict with - 8.3 "short" names. - Defaults to `true` on Windows, and `false` elsewhere. - -core.fsmonitor:: - If set, the value of this variable is used as a command which - will identify all files that may have changed since the - requested date/time. This information is used to speed up git by - avoiding unnecessary processing of files that have not changed. - See the "fsmonitor-watchman" section of linkgit:githooks[5]. - -core.trustctime:: - If false, the ctime differences between the index and the - working tree are ignored; useful when the inode change time - is regularly modified by something outside Git (file system - crawlers and some backup systems). - See linkgit:git-update-index[1]. True by default. - -core.splitIndex:: - If true, the split-index feature of the index will be used. - See linkgit:git-update-index[1]. False by default. - -core.untrackedCache:: - Determines what to do about the untracked cache feature of the - index. It will be kept, if this variable is unset or set to - `keep`. It will automatically be added if set to `true`. And - it will automatically be removed, if set to `false`. Before - setting it to `true`, you should check that mtime is working - properly on your system. - See linkgit:git-update-index[1]. `keep` by default. - -core.checkStat:: - When missing or is set to `default`, many fields in the stat - structure are checked to detect if a file has been modified - since Git looked at it
[PATCH 37/78] git-imap-send.txt: move imap.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 4 +-- Documentation/config/imap.txt | 44 Documentation/git-imap-send.txt | 45 + 3 files changed, 46 insertions(+), 47 deletions(-) create mode 100644 Documentation/config/imap.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index a44e717f30..d26656df95 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -353,9 +353,7 @@ include::config/http.txt[] include::config/i18n.txt[] -imap:: - The configuration variables in the 'imap' section are described - in linkgit:git-imap-send[1]. +include::config/imap.txt[] index.threads:: Specifies the number of threads to spawn when loading the index. diff --git a/Documentation/config/imap.txt b/Documentation/config/imap.txt new file mode 100644 index 00..06166fb5c0 --- /dev/null +++ b/Documentation/config/imap.txt @@ -0,0 +1,44 @@ +imap.folder:: + The folder to drop the mails into, which is typically the Drafts + folder. For example: "INBOX.Drafts", "INBOX/Drafts" or + "[Gmail]/Drafts". Required. + +imap.tunnel:: + Command used to setup a tunnel to the IMAP server through which + commands will be piped instead of using a direct network connection + to the server. Required when imap.host is not set. + +imap.host:: + A URL identifying the server. Use an `imap://` prefix for non-secure + connections and an `imaps://` prefix for secure connections. + Ignored when imap.tunnel is set, but required otherwise. + +imap.user:: + The username to use when logging in to the server. + +imap.pass:: + The password to use when logging in to the server. + +imap.port:: + An integer port number to connect to on the server. + Defaults to 143 for imap:// hosts and 993 for imaps:// hosts. + Ignored when imap.tunnel is set. + +imap.sslverify:: + A boolean to enable/disable verification of the server certificate + used by the SSL/TLS connection. Default is `true`. Ignored when + imap.tunnel is set. + +imap.preformattedHTML:: + A boolean to enable/disable the use of html encoding when sending + a patch. An html encoded patch will be bracketed with + and have a content type of text/html. Ironically, enabling this + option causes Thunderbird to send the patch as a plain/text, + format=fixed email. Default is `false`. + +imap.authMethod:: + Specify authenticate method for authentication with IMAP server. + If Git was built with the NO_CURL option, or if your curl version is older + than 7.34.0, or if you're running git-imap-send with the `--no-curl` + option, the only supported method is 'CRAM-MD5'. If this is not set + then 'git imap-send' uses the basic IMAP plaintext LOGIN command. diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt index 7b157441eb..65b53fcc47 100644 --- a/Documentation/git-imap-send.txt +++ b/Documentation/git-imap-send.txt @@ -57,50 +57,7 @@ to appropriate values. Variables ~ -imap.folder:: - The folder to drop the mails into, which is typically the Drafts - folder. For example: "INBOX.Drafts", "INBOX/Drafts" or - "[Gmail]/Drafts". Required. - -imap.tunnel:: - Command used to setup a tunnel to the IMAP server through which - commands will be piped instead of using a direct network connection - to the server. Required when imap.host is not set. - -imap.host:: - A URL identifying the server. Use an `imap://` prefix for non-secure - connections and an `imaps://` prefix for secure connections. - Ignored when imap.tunnel is set, but required otherwise. - -imap.user:: - The username to use when logging in to the server. - -imap.pass:: - The password to use when logging in to the server. - -imap.port:: - An integer port number to connect to on the server. - Defaults to 143 for imap:// hosts and 993 for imaps:// hosts. - Ignored when imap.tunnel is set. - -imap.sslverify:: - A boolean to enable/disable verification of the server certificate - used by the SSL/TLS connection. Default is `true`. Ignored when - imap.tunnel is set. - -imap.preformattedHTML:: - A boolean to enable/disable the use of html encoding when sending - a patch. An html encoded patch will be bracketed with - and have a content type of text/html. Ironically, enabling this - option causes Thunderbird to send the patch as a plain/text, - format=fixed email. Default is `false`. - -imap.authMethod:: - Specify authenticate method for authentication with IMAP server. - If Git was built with the NO_CURL option, or if your curl version is older - than 7.34.0, or if you're running git-imap-send with the `--no-curl` - option, the only supported met
[PATCH 07/78] config.txt: move apply.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 12 +--- Documentation/config/apply.txt | 11 +++ 2 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 Documentation/config/apply.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 5e0f76fc6e..c8d20227a8 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -297,17 +297,7 @@ include::config/alias.txt[] include::config/am.txt[] -apply.ignoreWhitespace:: - When set to 'change', tells 'git apply' to ignore changes in - whitespace, in the same way as the `--ignore-space-change` - option. - When set to one of: no, none, never, false tells 'git apply' to - respect all whitespace differences. - See linkgit:git-apply[1]. - -apply.whitespace:: - Tells 'git apply' how to handle whitespaces, in the same way - as the `--whitespace` option. See linkgit:git-apply[1]. +include::config/apply.txt[] blame.blankBoundary:: Show blank commit object name for boundary commits in diff --git a/Documentation/config/apply.txt b/Documentation/config/apply.txt new file mode 100644 index 00..8fb8ef763d --- /dev/null +++ b/Documentation/config/apply.txt @@ -0,0 +1,11 @@ +apply.ignoreWhitespace:: + When set to 'change', tells 'git apply' to ignore changes in + whitespace, in the same way as the `--ignore-space-change` + option. + When set to one of: no, none, never, false tells 'git apply' to + respect all whitespace differences. + See linkgit:git-apply[1]. + +apply.whitespace:: + Tells 'git apply' how to handle whitespaces, in the same way + as the `--whitespace` option. See linkgit:git-apply[1]. -- 2.19.1.647.g708186aaf9
[PATCH 39/78] config.txt: move init.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 4 +--- Documentation/config/init.txt | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Documentation/config/init.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 03b7ac75fc..94b14af9f3 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -357,9 +357,7 @@ include::config/imap.txt[] include::config/index.txt[] -init.templateDir:: - Specify the directory from which templates will be copied. - (See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].) +include::config/init.txt[] instaweb.browser:: Specify the program that will be used to browse your working diff --git a/Documentation/config/init.txt b/Documentation/config/init.txt new file mode 100644 index 00..46fa8c6a08 --- /dev/null +++ b/Documentation/config/init.txt @@ -0,0 +1,3 @@ +init.templateDir:: + Specify the directory from which templates will be copied. + (See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].) -- 2.19.1.647.g708186aaf9
[PATCH 26/78] config.txt: move gc.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 109 +--- Documentation/config/gc.txt | 108 +++ 2 files changed, 109 insertions(+), 108 deletions(-) create mode 100644 Documentation/config/gc.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index f70f95d5cf..dee012a5d5 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -333,114 +333,7 @@ include::config/filter.txt[] include::config/fsck.txt[] -gc.aggressiveDepth:: - The depth parameter used in the delta compression - algorithm used by 'git gc --aggressive'. This defaults - to 50. - -gc.aggressiveWindow:: - The window size parameter used in the delta compression - algorithm used by 'git gc --aggressive'. This defaults - to 250. - -gc.auto:: - When there are approximately more than this many loose - objects in the repository, `git gc --auto` will pack them. - Some Porcelain commands use this command to perform a - light-weight garbage collection from time to time. The - default value is 6700. Setting this to 0 disables it. - -gc.autoPackLimit:: - When there are more than this many packs that are not - marked with `*.keep` file in the repository, `git gc - --auto` consolidates them into one larger pack. The - default value is 50. Setting this to 0 disables it. - -gc.autoDetach:: - Make `git gc --auto` return immediately and run in background - if the system supports it. Default is true. - -gc.bigPackThreshold:: - If non-zero, all packs larger than this limit are kept when - `git gc` is run. This is very similar to `--keep-base-pack` - except that all packs that meet the threshold are kept, not - just the base pack. Defaults to zero. Common unit suffixes of - 'k', 'm', or 'g' are supported. -+ -Note that if the number of kept packs is more than gc.autoPackLimit, -this configuration variable is ignored, all packs except the base pack -will be repacked. After this the number of packs should go below -gc.autoPackLimit and gc.bigPackThreshold should be respected again. - -gc.writeCommitGraph:: - If true, then gc will rewrite the commit-graph file when - linkgit:git-gc[1] is run. When using linkgit:git-gc[1] - '--auto' the commit-graph will be updated if housekeeping is - required. Default is false. See linkgit:git-commit-graph[1] - for details. - -gc.logExpiry:: - If the file gc.log exists, then `git gc --auto` will print - its content and exit with status zero instead of running - unless that file is more than 'gc.logExpiry' old. Default is - "1.day". See `gc.pruneExpire` for more ways to specify its - value. - -gc.packRefs:: - Running `git pack-refs` in a repository renders it - unclonable by Git versions prior to 1.5.1.2 over dumb - transports such as HTTP. This variable determines whether - 'git gc' runs `git pack-refs`. This can be set to `notbare` - to enable it within all non-bare repos or it can be set to a - boolean value. The default is `true`. - -gc.pruneExpire:: - When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'. - Override the grace period with this config variable. The value - "now" may be used to disable this grace period and always prune - unreachable objects immediately, or "never" may be used to - suppress pruning. This feature helps prevent corruption when - 'git gc' runs concurrently with another process writing to the - repository; see the "NOTES" section of linkgit:git-gc[1]. - -gc.worktreePruneExpire:: - When 'git gc' is run, it calls - 'git worktree prune --expire 3.months.ago'. - This config variable can be used to set a different grace - period. The value "now" may be used to disable the grace - period and prune `$GIT_DIR/worktrees` immediately, or "never" - may be used to suppress pruning. - -gc.reflogExpire:: -gc..reflogExpire:: - 'git reflog expire' removes reflog entries older than - this time; defaults to 90 days. The value "now" expires all - entries immediately, and "never" suppresses expiration - altogether. With "" (e.g. - "refs/stash") in the middle the setting applies only to - the refs that match the . - -gc.reflogExpireUnreachable:: -gc..reflogExpireUnreachable:: - 'git reflog expire' removes reflog entries older than - this time and are not reachable from the current tip; - defaults to 30 days. The value "now" expires all entries - immediately, and "never" suppresses expiration altogether. - With "" (e.g. "refs/stash") - in the middle, the setting applies only to the refs that - match the . - -gc.rerereResolved:: - Records of conflicted merge you resolved earlier are - kept f
[PATCH 28/78] config.txt: move gitweb.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 17 + Documentation/config/gitweb.txt | 16 2 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 Documentation/config/gitweb.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 6f4a66b3f2..99ac8fc8ec 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -337,22 +337,7 @@ include::config/gc.txt[] include::config/gitcvs.txt[] -gitweb.category:: -gitweb.description:: -gitweb.owner:: -gitweb.url:: - See linkgit:gitweb[1] for description. - -gitweb.avatar:: -gitweb.blame:: -gitweb.grep:: -gitweb.highlight:: -gitweb.patches:: -gitweb.pickaxe:: -gitweb.remote_heads:: -gitweb.showSizes:: -gitweb.snapshot:: - See linkgit:gitweb.conf[5] for description. +include::config/gitweb.txt[] grep.lineNumber:: If set to true, enable `-n` option by default. diff --git a/Documentation/config/gitweb.txt b/Documentation/config/gitweb.txt new file mode 100644 index 00..1b51475108 --- /dev/null +++ b/Documentation/config/gitweb.txt @@ -0,0 +1,16 @@ +gitweb.category:: +gitweb.description:: +gitweb.owner:: +gitweb.url:: + See linkgit:gitweb[1] for description. + +gitweb.avatar:: +gitweb.blame:: +gitweb.grep:: +gitweb.highlight:: +gitweb.patches:: +gitweb.pickaxe:: +gitweb.remote_heads:: +gitweb.showSizes:: +gitweb.snapshot:: + See linkgit:gitweb.conf[5] for description. -- 2.19.1.647.g708186aaf9
[PATCH 34/78] config.txt: move ssh.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 38 ++-- Documentation/config/ssh.txt | 35 + 2 files changed, 37 insertions(+), 36 deletions(-) create mode 100644 Documentation/config/ssh.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index ba3b775fb0..60c2204fb4 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -621,42 +621,6 @@ Environment variable settings always override any matches. The URLs that are matched against are those given directly to Git commands. This means any URLs visited as a result of a redirection do not participate in matching. -ssh.variant:: - By default, Git determines the command line arguments to use - based on the basename of the configured SSH command (configured - using the environment variable `GIT_SSH` or `GIT_SSH_COMMAND` or - the config setting `core.sshCommand`). If the basename is - unrecognized, Git will attempt to detect support of OpenSSH - options by first invoking the configured SSH command with the - `-G` (print configuration) option and will subsequently use - OpenSSH options (if that is successful) or no options besides - the host and remote command (if it fails). -+ -The config variable `ssh.variant` can be set to override this detection. -Valid values are `ssh` (to use OpenSSH options), `plink`, `putty`, -`tortoiseplink`, `simple` (no options except the host and remote command). -The default auto-detection can be explicitly requested using the value -`auto`. Any other value is treated as `ssh`. This setting can also be -overridden via the environment variable `GIT_SSH_VARIANT`. -+ -The current command-line parameters used for each variant are as -follows: -+ --- - -* `ssh` - [-p port] [-4] [-6] [-o option] [username@]host command - -* `simple` - [username@]host command - -* `plink` or `putty` - [-P port] [-4] [-6] [username@]host command - -* `tortoiseplink` - [-P port] [-4] [-6] -batch [username@]host command - --- -+ -Except for the `simple` variant, command-line parameters are likely to -change as git gains new features. - i18n.commitEncoding:: Character encoding the commit messages are stored in; Git itself does not care per se, but this information is necessary e.g. when @@ -1298,6 +1262,8 @@ splitIndex.sharedIndexExpire:: either created based on it or read from it. See linkgit:git-update-index[1]. +include::config/ssh.txt[] + status.relativePaths:: By default, linkgit:git-status[1] shows paths relative to the current directory. Setting this variable to `false` shows paths diff --git a/Documentation/config/ssh.txt b/Documentation/config/ssh.txt new file mode 100644 index 00..2ca4bf93e1 --- /dev/null +++ b/Documentation/config/ssh.txt @@ -0,0 +1,35 @@ +ssh.variant:: + By default, Git determines the command line arguments to use + based on the basename of the configured SSH command (configured + using the environment variable `GIT_SSH` or `GIT_SSH_COMMAND` or + the config setting `core.sshCommand`). If the basename is + unrecognized, Git will attempt to detect support of OpenSSH + options by first invoking the configured SSH command with the + `-G` (print configuration) option and will subsequently use + OpenSSH options (if that is successful) or no options besides + the host and remote command (if it fails). ++ +The config variable `ssh.variant` can be set to override this detection. +Valid values are `ssh` (to use OpenSSH options), `plink`, `putty`, +`tortoiseplink`, `simple` (no options except the host and remote command). +The default auto-detection can be explicitly requested using the value +`auto`. Any other value is treated as `ssh`. This setting can also be +overridden via the environment variable `GIT_SSH_VARIANT`. ++ +The current command-line parameters used for each variant are as +follows: ++ +-- + +* `ssh` - [-p port] [-4] [-6] [-o option] [username@]host command + +* `simple` - [username@]host command + +* `plink` or `putty` - [-P port] [-4] [-6] [username@]host command + +* `tortoiseplink` - [-P port] [-4] [-6] -batch [username@]host command + +-- ++ +Except for the `simple` variant, command-line parameters are likely to +change as git gains new features. -- 2.19.1.647.g708186aaf9
[PATCH 41/78] config.txt: move interactive.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 17 + Documentation/config/interactive.txt | 16 2 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 Documentation/config/interactive.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 5b6e2971e3..763bb291e5 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -361,22 +361,7 @@ include::config/init.txt[] include::config/instaweb.txt[] -interactive.singleKey:: - In interactive commands, allow the user to provide one-letter - input with a single key (i.e., without hitting enter). - Currently this is used by the `--patch` mode of - linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-commit[1], - linkgit:git-reset[1], and linkgit:git-stash[1]. Note that this - setting is silently ignored if portable keystroke input - is not available; requires the Perl module Term::ReadKey. - -interactive.diffFilter:: - When an interactive command (such as `git add --patch`) shows - a colorized diff, git will pipe the diff through the shell - command defined by this configuration variable. The command may - mark up the diff further for human consumption, provided that it - retains a one-to-one correspondence with the lines in the - original diff. Defaults to disabled (no filtering). +include::config/interactive.txt[] log.abbrevCommit:: If true, makes linkgit:git-log[1], linkgit:git-show[1], and diff --git a/Documentation/config/interactive.txt b/Documentation/config/interactive.txt new file mode 100644 index 00..ad846dd7c9 --- /dev/null +++ b/Documentation/config/interactive.txt @@ -0,0 +1,16 @@ +interactive.singleKey:: + In interactive commands, allow the user to provide one-letter + input with a single key (i.e., without hitting enter). + Currently this is used by the `--patch` mode of + linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-commit[1], + linkgit:git-reset[1], and linkgit:git-stash[1]. Note that this + setting is silently ignored if portable keystroke input + is not available; requires the Perl module Term::ReadKey. + +interactive.diffFilter:: + When an interactive command (such as `git add --patch`) shows + a colorized diff, git will pipe the diff through the shell + command defined by this configuration variable. The command may + mark up the diff further for human consumption, provided that it + retains a one-to-one correspondence with the lines in the + original diff. Defaults to disabled (no filtering). -- 2.19.1.647.g708186aaf9
[PATCH 45/78] config.txt: move man.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 13 + Documentation/config/man.txt | 12 2 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 Documentation/config/man.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index ff9c8797a6..c3c92bc269 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -369,18 +369,7 @@ include::config/mailinfo.txt[] include::config/mailmap.txt[] -man.viewer:: - Specify the programs that may be used to display help in the - 'man' format. See linkgit:git-help[1]. - -man..cmd:: - Specify the command to invoke the specified man viewer. The - specified command is evaluated in shell with the man page - passed as argument. (See linkgit:git-help[1].) - -man..path:: - Override the path for the given tool that may be used to - display help in the 'man' format. See linkgit:git-help[1]. +include::config/man.txt[] include::merge-config.txt[] diff --git a/Documentation/config/man.txt b/Documentation/config/man.txt new file mode 100644 index 00..a727d987a8 --- /dev/null +++ b/Documentation/config/man.txt @@ -0,0 +1,12 @@ +man.viewer:: + Specify the programs that may be used to display help in the + 'man' format. See linkgit:git-help[1]. + +man..cmd:: + Specify the command to invoke the specified man viewer. The + specified command is evaluated in shell with the man page + passed as argument. (See linkgit:git-help[1].) + +man..path:: + Override the path for the given tool that may be used to + display help in the 'man' format. See linkgit:git-help[1]. -- 2.19.1.647.g708186aaf9
[PATCH 24/78] config.txt: move fmt-merge-msg-config.txt to config/
Note that this file is not directly included in config.txt but through
merge-config.txt and it's in "merge" section instead of a separate
"fmtMergeMsg" section like others.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
.../{fmt-merge-msg-config.txt => config/fmt-merge-msg.txt} | 0
Documentation/git-fmt-merge-msg.txt | 2 +-
Documentation/merge-config.txt | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename Documentation/{fmt-merge-msg-config.txt => config/fmt-merge-msg.txt}
(100%)
diff --git a/Documentation/fmt-merge-msg-config.txt
b/Documentation/config/fmt-merge-msg.txt
similarity index 100%
rename from Documentation/fmt-merge-msg-config.txt
rename to Documentation/config/fmt-merge-msg.txt
diff --git a/Documentation/git-fmt-merge-msg.txt
b/Documentation/git-fmt-merge-msg.txt
index 423b6e033b..6793d8fc05 100644
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -51,7 +51,7 @@ OPTIONS
CONFIGURATION
-
-include::fmt-merge-msg-config.txt[]
+include::config/fmt-merge-msg.txt[]
merge.summary::
Synonym to `merge.log`; this is deprecated and will be removed in
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 662c2713ca..0bb703fbac 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -30,7 +30,7 @@ merge.verifySignatures::
If true, this is equivalent to the --verify-signatures command
line option. See linkgit:git-merge[1] for details.
-include::fmt-merge-msg-config.txt[]
+include::config/fmt-merge-msg.txt[]
merge.renameLimit::
The number of files to consider when performing rename detection
--
2.19.1.647.g708186aaf9
[PATCH 12/78] config.txt: move clean.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 4 +--- Documentation/config/clean.txt | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Documentation/config/clean.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index a473ddc3c3..b5efac8cc5 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -307,9 +307,7 @@ include::config/browser.txt[] include::config/checkout.txt[] -clean.requireForce:: - A boolean to make git-clean do nothing unless given -f, - -i or -n. Defaults to true. +include::config/clean.txt[] color.advice:: A boolean to enable/disable color in hints (e.g. when a push diff --git a/Documentation/config/clean.txt b/Documentation/config/clean.txt new file mode 100644 index 00..a807c925b9 --- /dev/null +++ b/Documentation/config/clean.txt @@ -0,0 +1,3 @@ +clean.requireForce:: + A boolean to make git-clean do nothing unless given -f, + -i or -n. Defaults to true. -- 2.19.1.647.g708186aaf9
[PATCH 27/78] config.txt: move gitcvs-config.txt to config/
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/config.txt | 2 +-
Documentation/{gitcvs-config.txt => config/gitcvs.txt} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename Documentation/{gitcvs-config.txt => config/gitcvs.txt} (100%)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index dee012a5d5..6f4a66b3f2 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -335,7 +335,7 @@ include::config/fsck.txt[]
include::config/gc.txt[]
-include::gitcvs-config.txt[]
+include::config/gitcvs.txt[]
gitweb.category::
gitweb.description::
diff --git a/Documentation/gitcvs-config.txt b/Documentation/config/gitcvs.txt
similarity index 100%
rename from Documentation/gitcvs-config.txt
rename to Documentation/config/gitcvs.txt
--
2.19.1.647.g708186aaf9
[PATCH 02/78] config.txt: move advice.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 88 + Documentation/config/advice.txt | 86 2 files changed, 87 insertions(+), 87 deletions(-) create mode 100644 Documentation/config/advice.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index ff2d0190f6..4d2e21b534 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -287,93 +287,7 @@ inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation. - -advice.*:: - These variables control various optional help messages designed to - aid new users. All 'advice.*' variables default to 'true', and you - can tell Git that you do not need help by setting these to 'false': -+ --- - pushUpdateRejected:: - Set this variable to 'false' if you want to disable - 'pushNonFFCurrent', - 'pushNonFFMatching', 'pushAlreadyExists', - 'pushFetchFirst', and 'pushNeedsForce' - simultaneously. - pushNonFFCurrent:: - Advice shown when linkgit:git-push[1] fails due to a - non-fast-forward update to the current branch. - pushNonFFMatching:: - Advice shown when you ran linkgit:git-push[1] and pushed - 'matching refs' explicitly (i.e. you used ':', or - specified a refspec that isn't your current branch) and - it resulted in a non-fast-forward error. - pushAlreadyExists:: - Shown when linkgit:git-push[1] rejects an update that - does not qualify for fast-forwarding (e.g., a tag.) - pushFetchFirst:: - Shown when linkgit:git-push[1] rejects an update that - tries to overwrite a remote ref that points at an - object we do not have. - pushNeedsForce:: - Shown when linkgit:git-push[1] rejects an update that - tries to overwrite a remote ref that points at an - object that is not a commit-ish, or make the remote - ref point at an object that is not a commit-ish. - statusHints:: - Show directions on how to proceed from the current - state in the output of linkgit:git-status[1], in - the template shown when writing commit messages in - linkgit:git-commit[1], and in the help message shown - by linkgit:git-checkout[1] when switching branch. - statusUoption:: - Advise to consider using the `-u` option to linkgit:git-status[1] - when the command takes more than 2 seconds to enumerate untracked - files. - commitBeforeMerge:: - Advice shown when linkgit:git-merge[1] refuses to - merge to avoid overwriting local changes. - resetQuiet:: - Advice to consider using the `--quiet` option to linkgit:git-reset[1] - when the command takes more than 2 seconds to enumerate unstaged - changes after reset. - resolveConflict:: - Advice shown by various commands when conflicts - prevent the operation from being performed. - implicitIdentity:: - Advice on how to set your identity configuration when - your information is guessed from the system username and - domain name. - detachedHead:: - Advice shown when you used linkgit:git-checkout[1] to - move to the detach HEAD state, to instruct how to create - a local branch after the fact. - checkoutAmbiguousRemoteBranchName:: - Advice shown when the argument to - linkgit:git-checkout[1] ambiguously resolves to a - remote tracking branch on more than one remote in - situations where an unambiguous argument would have - otherwise caused a remote-tracking branch to be - checked out. See the `checkout.defaultRemote` - configuration variable for how to set a given remote - to used by default in some situations where this - advice would be printed. - amWorkDir:: - Advice that shows the location of the patch file when - linkgit:git-am[1] fails to apply it. - rmHints:: - In case of failure in the output of linkgit:git-rm[1], - show directions on how to proceed from the current state. - addEmbeddedRepo:: - Advice on what to do when you've accidentally added one - git repo inside of another. - ignoredHook:: - Advice shown if a hook is ignored because the hook is not - set as executable. -
[PATCH 04/78] config.txt: move add.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 8 +--- Documentation/config/add.txt | 7 +++ 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 Documentation/config/add.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 2ba70144c7..77e45e5219 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -291,13 +291,7 @@ include::config/advice.txt[] include::config/core.txt[] -add.ignoreErrors:: -add.ignore-errors (deprecated):: - Tells 'git add' to continue adding files when some files cannot be - added due to indexing errors. Equivalent to the `--ignore-errors` - option of linkgit:git-add[1]. `add.ignore-errors` is deprecated, - as it does not follow the usual naming convention for configuration - variables. +include::config/add.txt[] alias.*:: Command aliases for the linkgit:git[1] command wrapper - e.g. diff --git a/Documentation/config/add.txt b/Documentation/config/add.txt new file mode 100644 index 00..4d753f006e --- /dev/null +++ b/Documentation/config/add.txt @@ -0,0 +1,7 @@ +add.ignoreErrors:: +add.ignore-errors (deprecated):: + Tells 'git add' to continue adding files when some files cannot be + added due to indexing errors. Equivalent to the `--ignore-errors` + option of linkgit:git-add[1]. `add.ignore-errors` is deprecated, + as it does not follow the usual naming convention for configuration + variables. -- 2.19.1.647.g708186aaf9
[PATCH 01/78] Update makefile in preparation for Documentation/config/*.txt
config.txt is going to be broken down in smaller pieces and put under
Documentation/config directory. Update build rules to take these files
into account.
A dummy file is added to make sure wildcard expansion is predictable
(depending on shell setting it could expand to nothing or becomes a
path if config directory is empty). The file will be deleted once the
move is over.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/Makefile | 2 +-
Documentation/config/dummy.txt | 0
Makefile | 2 +-
generate-cmdlist.sh| 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
create mode 100644 Documentation/config/dummy.txt
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 95f6a321f2..48d261dc2c 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -285,7 +285,7 @@ docdep_prereqs = \
mergetools-list.made $(mergetools_txt) \
cmd-list.made $(cmds_txt)
-doc.dep : $(docdep_prereqs) $(wildcard *.txt) build-docdep.perl
+doc.dep : $(docdep_prereqs) $(wildcard *.txt) $(wildcard config/*.txt)
build-docdep.perl
$(QUIET_GEN)$(RM) $@+ $@ && \
$(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \
mv $@+ $@
diff --git a/Documentation/config/dummy.txt b/Documentation/config/dummy.txt
new file mode 100644
index 00..e69de29bb2
diff --git a/Makefile b/Makefile
index b08d5ea258..e2ca83203f 100644
--- a/Makefile
+++ b/Makefile
@@ -2068,7 +2068,7 @@ $(BUILT_INS): git$X
command-list.h: generate-cmdlist.sh command-list.txt
-command-list.h: $(wildcard Documentation/git*.txt) Documentation/*config.txt
+command-list.h: $(wildcard Documentation/git*.txt) Documentation/*config.txt
Documentation/config/*.txt
$(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh command-list.txt >$@+
&& mv $@+ $@
SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index fa1e5475e8..709d67405b 100755
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -80,7 +80,7 @@ print_config_list () {
cat <
[PATCH 11/78] config.txt: move checkout.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 24 +--- Documentation/config/checkout.txt | 23 +++ 2 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 Documentation/config/checkout.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 47eb119976..a473ddc3c3 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -305,29 +305,7 @@ include::config/branch.txt[] include::config/browser.txt[] -checkout.defaultRemote:: - When you run 'git checkout ' and only have one - remote, it may implicitly fall back on checking out and - tracking e.g. 'origin/'. This stops working as soon - as you have more than one remote with a '' - reference. This setting allows for setting the name of a - preferred remote that should always win when it comes to - disambiguation. The typical use-case is to set this to - `origin`. -+ -Currently this is used by linkgit:git-checkout[1] when 'git checkout -' will checkout the '' branch on another remote, -and by linkgit:git-worktree[1] when 'git worktree add' refers to a -remote branch. This setting might be used for other checkout-like -commands or functionality in the future. - -checkout.optimizeNewBranch:: - Optimizes the performance of "git checkout -b " when - using sparse-checkout. When set to true, git will not update the - repo based on the current sparse-checkout settings. This means it - will not update the skip-worktree bit in the index nor add/remove - files in the working directory to reflect the current sparse checkout - settings nor will it show the local changes. +include::config/checkout.txt[] clean.requireForce:: A boolean to make git-clean do nothing unless given -f, diff --git a/Documentation/config/checkout.txt b/Documentation/config/checkout.txt new file mode 100644 index 00..c4118fa196 --- /dev/null +++ b/Documentation/config/checkout.txt @@ -0,0 +1,23 @@ +checkout.defaultRemote:: + When you run 'git checkout ' and only have one + remote, it may implicitly fall back on checking out and + tracking e.g. 'origin/'. This stops working as soon + as you have more than one remote with a '' + reference. This setting allows for setting the name of a + preferred remote that should always win when it comes to + disambiguation. The typical use-case is to set this to + `origin`. ++ +Currently this is used by linkgit:git-checkout[1] when 'git checkout +' will checkout the '' branch on another remote, +and by linkgit:git-worktree[1] when 'git worktree add' refers to a +remote branch. This setting might be used for other checkout-like +commands or functionality in the future. + +checkout.optimizeNewBranch:: + Optimizes the performance of "git checkout -b " when + using sparse-checkout. When set to true, git will not update the + repo based on the current sparse-checkout settings. This means it + will not update the skip-worktree bit in the index nor add/remove + files in the working directory to reflect the current sparse checkout + settings nor will it show the local changes. -- 2.19.1.647.g708186aaf9
[PATCH 10/78] config.txt: move browser.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/config.txt | 10 +-
Documentation/config/browser.txt | 9 +
2 files changed, 10 insertions(+), 9 deletions(-)
create mode 100644 Documentation/config/browser.txt
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 3dc7dd6cdb..47eb119976 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -303,15 +303,7 @@ include::config/blame.txt[]
include::config/branch.txt[]
-browser..cmd::
- Specify the command to invoke the specified browser. The
- specified command is evaluated in shell with the URLs passed
- as arguments. (See linkgit:git-web{litdd}browse[1].)
-
-browser..path::
- Override the path for the given tool that may be used to
- browse HTML help (see `-w` option in linkgit:git-help[1]) or a
- working repository in gitweb (see linkgit:git-instaweb[1]).
+include::config/browser.txt[]
checkout.defaultRemote::
When you run 'git checkout ' and only have one
diff --git a/Documentation/config/browser.txt b/Documentation/config/browser.txt
new file mode 100644
index 00..195df207a6
--- /dev/null
+++ b/Documentation/config/browser.txt
@@ -0,0 +1,9 @@
+browser..cmd::
+ Specify the command to invoke the specified browser. The
+ specified command is evaluated in shell with the URLs passed
+ as arguments. (See linkgit:git-web{litdd}browse[1].)
+
+browser..path::
+ Override the path for the given tool that may be used to
+ browse HTML help (see `-w` option in linkgit:git-help[1]) or a
+ working repository in gitweb (see linkgit:git-instaweb[1]).
--
2.19.1.647.g708186aaf9
[PATCH 05/78] config.txt: move alias.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 19 +-- Documentation/config/alias.txt | 18 ++ 2 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 Documentation/config/alias.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 77e45e5219..f207cae90c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -293,24 +293,7 @@ include::config/core.txt[] include::config/add.txt[] -alias.*:: - Command aliases for the linkgit:git[1] command wrapper - e.g. - after defining "alias.last = cat-file commit HEAD", the invocation - "git last" is equivalent to "git cat-file commit HEAD". To avoid - confusion and troubles with script usage, aliases that - hide existing Git commands are ignored. Arguments are split by - spaces, the usual shell quoting and escaping is supported. - A quote pair or a backslash can be used to quote them. -+ -If the alias expansion is prefixed with an exclamation point, -it will be treated as a shell command. For example, defining -"alias.new = !gitk --all --not ORIG_HEAD", the invocation -"git new" is equivalent to running the shell command -"gitk --all --not ORIG_HEAD". Note that shell commands will be -executed from the top-level directory of a repository, which may -not necessarily be the current directory. -`GIT_PREFIX` is set as returned by running 'git rev-parse --show-prefix' -from the original current directory. See linkgit:git-rev-parse[1]. +include::config/alias.txt[] am.keepcr:: If true, git-am will call git-mailsplit for patches in mbox format diff --git a/Documentation/config/alias.txt b/Documentation/config/alias.txt new file mode 100644 index 00..0b14178314 --- /dev/null +++ b/Documentation/config/alias.txt @@ -0,0 +1,18 @@ +alias.*:: + Command aliases for the linkgit:git[1] command wrapper - e.g. + after defining "alias.last = cat-file commit HEAD", the invocation + "git last" is equivalent to "git cat-file commit HEAD". To avoid + confusion and troubles with script usage, aliases that + hide existing Git commands are ignored. Arguments are split by + spaces, the usual shell quoting and escaping is supported. + A quote pair or a backslash can be used to quote them. ++ +If the alias expansion is prefixed with an exclamation point, +it will be treated as a shell command. For example, defining +"alias.new = !gitk --all --not ORIG_HEAD", the invocation +"git new" is equivalent to running the shell command +"gitk --all --not ORIG_HEAD". Note that shell commands will be +executed from the top-level directory of a repository, which may +not necessarily be the current directory. +`GIT_PREFIX` is set as returned by running 'git rev-parse --show-prefix' +from the original current directory. See linkgit:git-rev-parse[1]. -- 2.19.1.647.g708186aaf9
[PATCH 16/78] config.txt: move credential.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 27 +-- Documentation/config/credential.txt | 26 ++ 2 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 Documentation/config/credential.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index bbae7e68bd..2c21a5f366 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -315,32 +315,7 @@ include::config/column.txt[] include::config/commit.txt[] -credential.helper:: - Specify an external helper to be called when a username or - password credential is needed; the helper may consult external - storage to avoid prompting the user for the credentials. Note - that multiple helpers may be defined. See linkgit:gitcredentials[7] - for details. - -credential.useHttpPath:: - When acquiring credentials, consider the "path" component of an http - or https URL to be important. Defaults to false. See - linkgit:gitcredentials[7] for more information. - -credential.username:: - If no username is set for a network authentication, use this username - by default. See credential..* below, and - linkgit:gitcredentials[7]. - -credential..*:: - Any of the credential.* options above can be applied selectively to - some credentials. For example "credential.https://example.com.username"; - would set the default username only for https connections to - example.com. See linkgit:gitcredentials[7] for details on how URLs are - matched. - -credentialCache.ignoreSIGHUP:: - Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting. +include::config/credential.txt[] completion.commands:: This is only used by git-completion.bash to add or remove diff --git a/Documentation/config/credential.txt b/Documentation/config/credential.txt new file mode 100644 index 00..60fb3189e1 --- /dev/null +++ b/Documentation/config/credential.txt @@ -0,0 +1,26 @@ +credential.helper:: + Specify an external helper to be called when a username or + password credential is needed; the helper may consult external + storage to avoid prompting the user for the credentials. Note + that multiple helpers may be defined. See linkgit:gitcredentials[7] + for details. + +credential.useHttpPath:: + When acquiring credentials, consider the "path" component of an http + or https URL to be important. Defaults to false. See + linkgit:gitcredentials[7] for more information. + +credential.username:: + If no username is set for a network authentication, use this username + by default. See credential..* below, and + linkgit:gitcredentials[7]. + +credential..*:: + Any of the credential.* options above can be applied selectively to + some credentials. For example "credential.https://example.com.username"; + would set the default username only for https connections to + example.com. See linkgit:gitcredentials[7] for details on how URLs are + matched. + +credentialCache.ignoreSIGHUP:: + Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting. -- 2.19.1.647.g708186aaf9
[PATCH 30/78] config.txt: move gpg.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 21 + Documentation/config/gpg.txt | 20 2 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 Documentation/config/gpg.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 177fefc83c..f52b89883d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -341,26 +341,7 @@ include::config/gitweb.txt[] include::config/grep.txt[] -gpg.program:: - Use this custom program instead of "`gpg`" found on `$PATH` when - making or verifying a PGP signature. The program must support the - same command-line interface as GPG, namely, to verify a detached - signature, "`gpg --verify $file - <$signature`" is run, and the - program is expected to signal a good signature by exiting with - code 0, and to generate an ASCII-armored detached signature, the - standard input of "`gpg -bsau $key`" is fed with the contents to be - signed, and the program is expected to send the result to its - standard output. - -gpg.format:: - Specifies which key format to use when signing with `--gpg-sign`. - Default is "openpgp" and another possible value is "x509". - -gpg..program:: - Use this to customize the program used for the signing format you - chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still - be used as a legacy synonym for `gpg.openpgp.program`. The default - value for `gpg.x509.program` is "gpgsm". +include::config/gpg.txt[] include::gui-config.txt[] diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt new file mode 100644 index 00..590fe0d4ba --- /dev/null +++ b/Documentation/config/gpg.txt @@ -0,0 +1,20 @@ +gpg.program:: + Use this custom program instead of "`gpg`" found on `$PATH` when + making or verifying a PGP signature. The program must support the + same command-line interface as GPG, namely, to verify a detached + signature, "`gpg --verify $file - <$signature`" is run, and the + program is expected to signal a good signature by exiting with + code 0, and to generate an ASCII-armored detached signature, the + standard input of "`gpg -bsau $key`" is fed with the contents to be + signed, and the program is expected to send the result to its + standard output. + +gpg.format:: + Specifies which key format to use when signing with `--gpg-sign`. + Default is "openpgp" and another possible value is "x509". + +gpg..program:: + Use this to customize the program used for the signing format you + chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still + be used as a legacy synonym for `gpg.openpgp.program`. The default + value for `gpg.x509.program` is "gpgsm". -- 2.19.1.647.g708186aaf9
[PATCH 29/78] config.txt: move grep.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 25 + Documentation/config/grep.txt | 24 2 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 Documentation/config/grep.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 99ac8fc8ec..177fefc83c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -339,30 +339,7 @@ include::config/gitcvs.txt[] include::config/gitweb.txt[] -grep.lineNumber:: - If set to true, enable `-n` option by default. - -grep.column:: - If set to true, enable the `--column` option by default. - -grep.patternType:: - Set the default matching behavior. Using a value of 'basic', 'extended', - 'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`, - `--fixed-strings`, or `--perl-regexp` option accordingly, while the - value 'default' will return to the default matching behavior. - -grep.extendedRegexp:: - If set to true, enable `--extended-regexp` option by default. This - option is ignored when the `grep.patternType` option is set to a value - other than 'default'. - -grep.threads:: - Number of grep worker threads to use. - See `grep.threads` in linkgit:git-grep[1] for more information. - -grep.fallbackToNoIndex:: - If set to true, fall back to git grep --no-index if git grep - is executed outside of a git repository. Defaults to false. +include::config/grep.txt[] gpg.program:: Use this custom program instead of "`gpg`" found on `$PATH` when diff --git a/Documentation/config/grep.txt b/Documentation/config/grep.txt new file mode 100644 index 00..44abe45a7c --- /dev/null +++ b/Documentation/config/grep.txt @@ -0,0 +1,24 @@ +grep.lineNumber:: + If set to true, enable `-n` option by default. + +grep.column:: + If set to true, enable the `--column` option by default. + +grep.patternType:: + Set the default matching behavior. Using a value of 'basic', 'extended', + 'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`, + `--fixed-strings`, or `--perl-regexp` option accordingly, while the + value 'default' will return to the default matching behavior. + +grep.extendedRegexp:: + If set to true, enable `--extended-regexp` option by default. This + option is ignored when the `grep.patternType` option is set to a value + other than 'default'. + +grep.threads:: + Number of grep worker threads to use. + See `grep.threads` in linkgit:git-grep[1] for more information. + +grep.fallbackToNoIndex:: + If set to true, fall back to git grep --no-index if git grep + is executed outside of a git repository. Defaults to false. -- 2.19.1.647.g708186aaf9
[PATCH 08/78] config.txt: move blame.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 22 +- Documentation/config/blame.txt | 21 + 2 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 Documentation/config/blame.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index c8d20227a8..9ee989bc67 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -299,27 +299,7 @@ include::config/am.txt[] include::config/apply.txt[] -blame.blankBoundary:: - Show blank commit object name for boundary commits in - linkgit:git-blame[1]. This option defaults to false. - -blame.coloring:: - This determines the coloring scheme to be applied to blame - output. It can be 'repeatedLines', 'highlightRecent', - or 'none' which is the default. - -blame.date:: - Specifies the format used to output dates in linkgit:git-blame[1]. - If unset the iso format is used. For supported values, - see the discussion of the `--date` option at linkgit:git-log[1]. - -blame.showEmail:: - Show the author email instead of author name in linkgit:git-blame[1]. - This option defaults to false. - -blame.showRoot:: - Do not treat root commits as boundaries in linkgit:git-blame[1]. - This option defaults to false. +include::config/blame.txt[] branch.autoSetupMerge:: Tells 'git branch' and 'git checkout' to set up new branches diff --git a/Documentation/config/blame.txt b/Documentation/config/blame.txt new file mode 100644 index 00..67b5c1d1e0 --- /dev/null +++ b/Documentation/config/blame.txt @@ -0,0 +1,21 @@ +blame.blankBoundary:: + Show blank commit object name for boundary commits in + linkgit:git-blame[1]. This option defaults to false. + +blame.coloring:: + This determines the coloring scheme to be applied to blame + output. It can be 'repeatedLines', 'highlightRecent', + or 'none' which is the default. + +blame.date:: + Specifies the format used to output dates in linkgit:git-blame[1]. + If unset the iso format is used. For supported values, + see the discussion of the `--date` option at linkgit:git-log[1]. + +blame.showEmail:: + Show the author email instead of author name in linkgit:git-blame[1]. + This option defaults to false. + +blame.showRoot:: + Do not treat root commits as boundaries in linkgit:git-blame[1]. + This option defaults to false. -- 2.19.1.647.g708186aaf9
[PATCH 43/78] config.txt: move mailinfo.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 7 +-- Documentation/config/mailinfo.txt | 6 ++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 Documentation/config/mailinfo.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index cce89ea50c..585d55d03d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -365,12 +365,7 @@ include::config/interactive.txt[] include::config/log.txt[] -mailinfo.scissors:: - If true, makes linkgit:git-mailinfo[1] (and therefore - linkgit:git-am[1]) act by default as if the --scissors option - was provided on the command-line. When active, this features - removes everything from the message body before a scissors - line (i.e. consisting mainly of ">8", "8<" and "-"). +include::config/mailinfo.txt[] mailmap.file:: The location of an augmenting mailmap file. The default diff --git a/Documentation/config/mailinfo.txt b/Documentation/config/mailinfo.txt new file mode 100644 index 00..3854d4ae37 --- /dev/null +++ b/Documentation/config/mailinfo.txt @@ -0,0 +1,6 @@ +mailinfo.scissors:: + If true, makes linkgit:git-mailinfo[1] (and therefore + linkgit:git-am[1]) act by default as if the --scissors option + was provided on the command-line. When active, this features + removes everything from the message body before a scissors + line (i.e. consisting mainly of ">8", "8<" and "-"). -- 2.19.1.647.g708186aaf9
[PATCH 44/78] config.txt: move mailmap.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 16 +--- Documentation/config/mailmap.txt | 15 +++ 2 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 Documentation/config/mailmap.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 585d55d03d..ff9c8797a6 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -367,21 +367,7 @@ include::config/log.txt[] include::config/mailinfo.txt[] -mailmap.file:: - The location of an augmenting mailmap file. The default - mailmap, located in the root of the repository, is loaded - first, then the mailmap file pointed to by this variable. - The location of the mailmap file may be in a repository - subdirectory, or somewhere outside of the repository itself. - See linkgit:git-shortlog[1] and linkgit:git-blame[1]. - -mailmap.blob:: - Like `mailmap.file`, but consider the value as a reference to a - blob in the repository. If both `mailmap.file` and - `mailmap.blob` are given, both are parsed, with entries from - `mailmap.file` taking precedence. In a bare repository, this - defaults to `HEAD:.mailmap`. In a non-bare repository, it - defaults to empty. +include::config/mailmap.txt[] man.viewer:: Specify the programs that may be used to display help in the diff --git a/Documentation/config/mailmap.txt b/Documentation/config/mailmap.txt new file mode 100644 index 00..48cbc30722 --- /dev/null +++ b/Documentation/config/mailmap.txt @@ -0,0 +1,15 @@ +mailmap.file:: + The location of an augmenting mailmap file. The default + mailmap, located in the root of the repository, is loaded + first, then the mailmap file pointed to by this variable. + The location of the mailmap file may be in a repository + subdirectory, or somewhere outside of the repository itself. + See linkgit:git-shortlog[1] and linkgit:git-blame[1]. + +mailmap.blob:: + Like `mailmap.file`, but consider the value as a reference to a + blob in the repository. If both `mailmap.file` and + `mailmap.blob` are given, both are parsed, with entries from + `mailmap.file` taking precedence. In a bare repository, this + defaults to `HEAD:.mailmap`. In a non-bare repository, it + defaults to empty. -- 2.19.1.647.g708186aaf9
[PATCH 31/78] config.txt: move gui-config.txt to config/
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/config.txt | 2 +-
Documentation/{gui-config.txt => config/gui.txt} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename Documentation/{gui-config.txt => config/gui.txt} (100%)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index f52b89883d..093a71e5d1 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -343,7 +343,7 @@ include::config/grep.txt[]
include::config/gpg.txt[]
-include::gui-config.txt[]
+include::config/gui.txt[]
guitool..cmd::
Specifies the shell command line to execute when the corresponding item
diff --git a/Documentation/gui-config.txt b/Documentation/config/gui.txt
similarity index 100%
rename from Documentation/gui-config.txt
rename to Documentation/config/gui.txt
--
2.19.1.647.g708186aaf9
[PATCH 00/78] nd/config-split reroll
Compared to the version on 'pu', this one moves all the config files to Documentation/config/ directory. imap.* is also added back in config.txt (curently only documented in git-imap-send.txt) This one is built on top of bp/reset-quiet and js/mingw-http-ssl to avoid non-trivial conflicts. I notice that there are duplicated config documentation in git-*.txt. But given the size of this series, I think people will agree that can be done separately later. Nguyễn Thái Ngọc Duy (78): Update makefile in preparation for Documentation/config/*.txt config.txt: move advice.* to a separate file config.txt: move core.* to a separate file config.txt: move add.* to a separate file config.txt: move alias.* to a separate file config.txt: move am.* to a separate file config.txt: move apply.* to a separate file config.txt: move blame.* to a separate file config.txt: move branch.* to a separate file config.txt: move browser.* to a separate file config.txt: move checkout.* to a separate file config.txt: move clean.* to a separate file config.txt: move color.* to a separate file config.txt: move column.* to a separate file config.txt: move commit.* to a separate file config.txt: move credential.* to a separate file config.txt: move completion.* to a separate file config.txt: move diff-config.txt to config/ config.txt: move difftool.* to a separate file config.txt: move fastimport.* to a separate file config.txt: move fetch-config.txt to config/ config.txt: move filter.* to a separate file config.txt: move format-config.txt to config/ config.txt: move fmt-merge-msg-config.txt to config/ config.txt: move fsck.* to a separate file config.txt: move gc.* to a separate file config.txt: move gitcvs-config.txt to config/ config.txt: move gitweb.* to a separate file config.txt: move grep.* to a separate file config.txt: move gpg.* to a separate file config.txt: move gui-config.txt to config/ config.txt: move guitool.* to a separate file config.txt: move help.* to a separate file config.txt: move ssh.* to a separate file config.txt: move http.* to a separate file config.txt: move i18n.* to a separate file git-imap-send.txt: move imap.* to a separate file config.txt: move index.* to a separate file config.txt: move init.* to a separate file config.txt: move instaweb.* to a separate file config.txt: move interactive.* to a separate file config.txt: move log.* to a separate file config.txt: move mailinfo.* to a separate file config.txt: move mailmap.* to a separate file config.txt: move man.* to a separate file config.txt: move merge-config.txt to config/ config.txt: move mergetool.* to a separate file config.txt: move notes.* to a separate file config.txt: move pack.* to a separate file config.txt: move pager.* to a separate file config.txt: move pretty.* to a separate file config.txt: move protocol.* to a separate file config.txt: move pull-config.txt to config/ config.txt: move push-config.txt to config/ config.txt: move rebase-config.txt to config/ config.txt: move receive-config.txt to config/ config.txt: move remote.* to a separate file config.txt: move remotes.* to a separate file config.txt: move repack.* to a separate file config.txt: move rerere.* to a separate file config.txt: move reset.* to a separate file config.txt: move sendemail-config.txt to config/ config.txt: move sequencer.* to a separate file config.txt: move showBranch.* to a separate file config.txt: move splitIndex.* to a separate file config.txt: move status.* to a separate file config.txt: move stash.* to a separate file config.txt: move submodule.* to a separate file config.txt: move tag.* to a separate file config.txt: move transfer.* to a separate file config.txt: move uploadarchive.* to a separate file config.txt: move uploadpack.* to a separate file config.txt: move url.* to a separate file config.txt: move user.* to a separate file config.txt: move versionsort.* to a separate file config.txt: move web.* to a separate file config.txt: move worktree.* to a separate file config.txt: remove config/dummy.txt Documentation/Makefile|2 +- Documentation/config.txt | 2957 + Documentation/config/add.txt |7 + Documentation/config/advice.txt | 86 + Documentation/config/alias.txt| 18 + Documentation/config/am.txt | 14 + Documentation/config/apply.txt| 11 + Documentation/config/blame.txt| 21 + Documentation/config/branch.txt | 102 + Documentation/config/browser.txt |9 + Documentation/config/checkout.txt | 23 + Documentation/config/clean.txt|3 + Documentation/config/color.txt| 201 ++ Documentation/config/column.txt | 55 + Documentat
[PATCH 13/78] config.txt: move color.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/config.txt | 202 +
Documentation/config/color.txt | 201
2 files changed, 202 insertions(+), 201 deletions(-)
create mode 100644 Documentation/config/color.txt
diff --git a/Documentation/config.txt b/Documentation/config.txt
index b5efac8cc5..399c23e0c5 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -309,207 +309,7 @@ include::config/checkout.txt[]
include::config/clean.txt[]
-color.advice::
- A boolean to enable/disable color in hints (e.g. when a push
- failed, see `advice.*` for a list). May be set to `always`,
- `false` (or `never`) or `auto` (or `true`), in which case colors
- are used only when the error output goes to a terminal. If
- unset, then the value of `color.ui` is used (`auto` by default).
-
-color.advice.hint::
- Use customized color for hints.
-
-color.blame.highlightRecent::
- This can be used to color the metadata of a blame line depending
- on age of the line.
-+
-This setting should be set to a comma-separated list of color and date
settings,
-starting and ending with a color, the dates should be set from oldest to
newest.
-The metadata will be colored given the colors if the the line was introduced
-before the given timestamp, overwriting older timestamped colors.
-+
-Instead of an absolute timestamp relative timestamps work as well, e.g.
-2.weeks.ago is valid to address anything older than 2 weeks.
-+
-It defaults to 'blue,12 month ago,white,1 month ago,red', which colors
-everything older than one year blue, recent changes between one month and
-one year old are kept white, and lines introduced within the last month are
-colored red.
-
-color.blame.repeatedLines::
- Use the customized color for the part of git-blame output that
- is repeated meta information per line (such as commit id,
- author name, date and timezone). Defaults to cyan.
-
-color.branch::
- A boolean to enable/disable color in the output of
- linkgit:git-branch[1]. May be set to `always`,
- `false` (or `never`) or `auto` (or `true`), in which case colors are
used
- only when the output is to a terminal. If unset, then the
- value of `color.ui` is used (`auto` by default).
-
-color.branch.::
- Use customized color for branch coloration. `` is one of
- `current` (the current branch), `local` (a local branch),
- `remote` (a remote-tracking branch in refs/remotes/),
- `upstream` (upstream tracking branch), `plain` (other
- refs).
-
-color.diff::
- Whether to use ANSI escape sequences to add color to patches.
- If this is set to `always`, linkgit:git-diff[1],
- linkgit:git-log[1], and linkgit:git-show[1] will use color
- for all patches. If it is set to `true` or `auto`, those
- commands will only use color when output is to the terminal.
- If unset, then the value of `color.ui` is used (`auto` by
- default).
-+
-This does not affect linkgit:git-format-patch[1] or the
-'git-diff-{asterisk}' plumbing commands. Can be overridden on the
-command line with the `--color[=]` option.
-
-color.diff.::
- Use customized color for diff colorization. `` specifies
- which part of the patch to use the specified color, and is one
- of `context` (context text - `plain` is a historical synonym),
- `meta` (metainformation), `frag`
- (hunk header), 'func' (function in hunk header), `old` (removed lines),
- `new` (added lines), `commit` (commit headers), `whitespace`
- (highlighting whitespace errors), `oldMoved` (deleted lines),
- `newMoved` (added lines), `oldMovedDimmed`, `oldMovedAlternative`,
- `oldMovedAlternativeDimmed`, `newMovedDimmed`, `newMovedAlternative`
- `newMovedAlternativeDimmed` (See the ''
- setting of '--color-moved' in linkgit:git-diff[1] for details),
- `contextDimmed`, `oldDimmed`, `newDimmed`, `contextBold`,
- `oldBold`, and `newBold` (see linkgit:git-range-diff[1] for details).
-
-color.decorate.::
- Use customized color for 'git log --decorate' output. `` is one
- of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local
- branches, remote-tracking branches, tags, stash and HEAD, respectively
- and `grafted` for grafted commits.
-
-color.grep::
- When set to `always`, always highlight matches. When `false` (or
- `never`), never. When set to `true` or `auto`, use color only
- when the output is written to the terminal. If unset, then the
- value of `color.ui` is used (`auto` by default).
-
-color.grep.::
- Use customized color for grep colorization. `` specifies which
- part of the line to use the specified color, and is one of
-+
---
-`context`;;
- non-matching text in context lines (when using `-A`, `-B`, or `-C`)
-`filename`;;
-
[PATCH 22/78] config.txt: move filter.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 10 +- Documentation/config/filter.txt | 9 + 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 Documentation/config/filter.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index f85014f803..a225dc530f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -329,15 +329,7 @@ include::config/fetch.txt[] include::format-config.txt[] -filter..clean:: - The command which is used to convert the content of a worktree - file to a blob upon checkin. See linkgit:gitattributes[5] for - details. - -filter..smudge:: - The command which is used to convert the content of a blob - object to a worktree file upon checkout. See - linkgit:gitattributes[5] for details. +include::config/filter.txt[] fsck.:: During fsck git may find issues with legacy data which diff --git a/Documentation/config/filter.txt b/Documentation/config/filter.txt new file mode 100644 index 00..90dfe0ba5a --- /dev/null +++ b/Documentation/config/filter.txt @@ -0,0 +1,9 @@ +filter..clean:: + The command which is used to convert the content of a worktree + file to a blob upon checkin. See linkgit:gitattributes[5] for + details. + +filter..smudge:: + The command which is used to convert the content of a blob + object to a worktree file upon checkout. See + linkgit:gitattributes[5] for details. -- 2.19.1.647.g708186aaf9
[PATCH 23/78] config.txt: move format-config.txt to config/
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/config.txt | 2 +-
Documentation/{format-config.txt => config/format.txt} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename Documentation/{format-config.txt => config/format.txt} (100%)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index a225dc530f..3dc2285ba5 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -327,7 +327,7 @@ include::config/fastimport.txt[]
include::config/fetch.txt[]
-include::format-config.txt[]
+include::config/format.txt[]
include::config/filter.txt[]
diff --git a/Documentation/format-config.txt b/Documentation/config/format.txt
similarity index 100%
rename from Documentation/format-config.txt
rename to Documentation/config/format.txt
--
2.19.1.647.g708186aaf9
[PATCH 17/78] config.txt: move completion.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 8 +--- Documentation/config/completion.txt | 7 +++ 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 Documentation/config/completion.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 2c21a5f366..83f5ce9056 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -317,13 +317,7 @@ include::config/commit.txt[] include::config/credential.txt[] -completion.commands:: - This is only used by git-completion.bash to add or remove - commands from the list of completed commands. Normally only - porcelain commands and a few select others are completed. You - can add more commands, separated by space, in this - variable. Prefixing the command with '-' will remove it from - the existing list. +include::config/completion.txt[] include::diff-config.txt[] diff --git a/Documentation/config/completion.txt b/Documentation/config/completion.txt new file mode 100644 index 00..4d99bf33c9 --- /dev/null +++ b/Documentation/config/completion.txt @@ -0,0 +1,7 @@ +completion.commands:: + This is only used by git-completion.bash to add or remove + commands from the list of completed commands. Normally only + porcelain commands and a few select others are completed. You + can add more commands, separated by space, in this + variable. Prefixing the command with '-' will remove it from + the existing list. -- 2.19.1.647.g708186aaf9
[PATCH 21/78] config.txt: move fetch-config.txt to config/
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/config.txt | 2 +-
Documentation/{fetch-config.txt => config/fetch.txt} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename Documentation/{fetch-config.txt => config/fetch.txt} (100%)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 92bc420245..f85014f803 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -325,7 +325,7 @@ include::config/difftool.txt[]
include::config/fastimport.txt[]
-include::fetch-config.txt[]
+include::config/fetch.txt[]
include::format-config.txt[]
diff --git a/Documentation/fetch-config.txt b/Documentation/config/fetch.txt
similarity index 100%
rename from Documentation/fetch-config.txt
rename to Documentation/config/fetch.txt
--
2.19.1.647.g708186aaf9
[PATCH 32/78] config.txt: move guitool.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 51 +--- Documentation/config/guitool.txt | 50 +++ 2 files changed, 51 insertions(+), 50 deletions(-) create mode 100644 Documentation/config/guitool.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 093a71e5d1..dda5812a8a 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -345,56 +345,7 @@ include::config/gpg.txt[] include::config/gui.txt[] -guitool..cmd:: - Specifies the shell command line to execute when the corresponding item - of the linkgit:git-gui[1] `Tools` menu is invoked. This option is - mandatory for every tool. The command is executed from the root of - the working directory, and in the environment it receives the name of - the tool as `GIT_GUITOOL`, the name of the currently selected file as - 'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if - the head is detached, 'CUR_BRANCH' is empty). - -guitool..needsFile:: - Run the tool only if a diff is selected in the GUI. It guarantees - that 'FILENAME' is not empty. - -guitool..noConsole:: - Run the command silently, without creating a window to display its - output. - -guitool..noRescan:: - Don't rescan the working directory for changes after the tool - finishes execution. - -guitool..confirm:: - Show a confirmation dialog before actually running the tool. - -guitool..argPrompt:: - Request a string argument from the user, and pass it to the tool - through the `ARGS` environment variable. Since requesting an - argument implies confirmation, the 'confirm' option has no effect - if this is enabled. If the option is set to 'true', 'yes', or '1', - the dialog uses a built-in generic prompt; otherwise the exact - value of the variable is used. - -guitool..revPrompt:: - Request a single valid revision from the user, and set the - `REVISION` environment variable. In other aspects this option - is similar to 'argPrompt', and can be used together with it. - -guitool..revUnmerged:: - Show only unmerged branches in the 'revPrompt' subdialog. - This is useful for tools similar to merge or rebase, but not - for things like checkout or reset. - -guitool..title:: - Specifies the title to use for the prompt dialog. The default - is the tool name. - -guitool..prompt:: - Specifies the general prompt string to display at the top of - the dialog, before subsections for 'argPrompt' and 'revPrompt'. - The default value includes the actual command. +include::config/guitool.txt[] help.browser:: Specify the browser that will be used to display help in the diff --git a/Documentation/config/guitool.txt b/Documentation/config/guitool.txt new file mode 100644 index 00..43fb9466ff --- /dev/null +++ b/Documentation/config/guitool.txt @@ -0,0 +1,50 @@ +guitool..cmd:: + Specifies the shell command line to execute when the corresponding item + of the linkgit:git-gui[1] `Tools` menu is invoked. This option is + mandatory for every tool. The command is executed from the root of + the working directory, and in the environment it receives the name of + the tool as `GIT_GUITOOL`, the name of the currently selected file as + 'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if + the head is detached, 'CUR_BRANCH' is empty). + +guitool..needsFile:: + Run the tool only if a diff is selected in the GUI. It guarantees + that 'FILENAME' is not empty. + +guitool..noConsole:: + Run the command silently, without creating a window to display its + output. + +guitool..noRescan:: + Don't rescan the working directory for changes after the tool + finishes execution. + +guitool..confirm:: + Show a confirmation dialog before actually running the tool. + +guitool..argPrompt:: + Request a string argument from the user, and pass it to the tool + through the `ARGS` environment variable. Since requesting an + argument implies confirmation, the 'confirm' option has no effect + if this is enabled. If the option is set to 'true', 'yes', or '1', + the dialog uses a built-in generic prompt; otherwise the exact + value of the variable is used. + +guitool..revPrompt:: + Request a single valid revision from the user, and set the + `REVISION` environment variable. In other aspects this option + is similar to 'argPrompt', and can be used together with it. + +guitool..revUnmerged:: + Show only unmerged branches in the 'revPrompt' subdialog. + This is useful for tools similar to merge or rebase, but not + for things like checkout or reset. + +guitool..title:: + Specifies the title to use for the prompt dialog. The default + is the tool na
[PATCH 09/78] config.txt: move branch.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 103 +--- Documentation/config/branch.txt | 102 +++ 2 files changed, 103 insertions(+), 102 deletions(-) create mode 100644 Documentation/config/branch.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 9ee989bc67..3dc7dd6cdb 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -301,108 +301,7 @@ include::config/apply.txt[] include::config/blame.txt[] -branch.autoSetupMerge:: - Tells 'git branch' and 'git checkout' to set up new branches - so that linkgit:git-pull[1] will appropriately merge from the - starting point branch. Note that even if this option is not set, - this behavior can be chosen per-branch using the `--track` - and `--no-track` options. The valid settings are: `false` -- no - automatic setup is done; `true` -- automatic setup is done when the - starting point is a remote-tracking branch; `always` -- - automatic setup is done when the starting point is either a - local branch or remote-tracking - branch. This option defaults to true. - -branch.autoSetupRebase:: - When a new branch is created with 'git branch' or 'git checkout' - that tracks another branch, this variable tells Git to set - up pull to rebase instead of merge (see "branch..rebase"). - When `never`, rebase is never automatically set to true. - When `local`, rebase is set to true for tracked branches of - other local branches. - When `remote`, rebase is set to true for tracked branches of - remote-tracking branches. - When `always`, rebase will be set to true for all tracking - branches. - See "branch.autoSetupMerge" for details on how to set up a - branch to track another branch. - This option defaults to never. - -branch.sort:: - This variable controls the sort ordering of branches when displayed by - linkgit:git-branch[1]. Without the "--sort=" option provided, the - value of this variable will be used as the default. - See linkgit:git-for-each-ref[1] field names for valid values. - -branch..remote:: - When on branch , it tells 'git fetch' and 'git push' - which remote to fetch from/push to. The remote to push to - may be overridden with `remote.pushDefault` (for all branches). - The remote to push to, for the current branch, may be further - overridden by `branch..pushRemote`. If no remote is - configured, or if you are not on any branch, it defaults to - `origin` for fetching and `remote.pushDefault` for pushing. - Additionally, `.` (a period) is the current local repository - (a dot-repository), see `branch..merge`'s final note below. - -branch..pushRemote:: - When on branch , it overrides `branch..remote` for - pushing. It also overrides `remote.pushDefault` for pushing - from branch . When you pull from one place (e.g. your - upstream) and push to another place (e.g. your own publishing - repository), you would want to set `remote.pushDefault` to - specify the remote to push to for all branches, and use this - option to override it for a specific branch. - -branch..merge:: - Defines, together with branch..remote, the upstream branch - for the given branch. It tells 'git fetch'/'git pull'/'git rebase' which - branch to merge and can also affect 'git push' (see push.default). - When in branch , it tells 'git fetch' the default - refspec to be marked for merging in FETCH_HEAD. The value is - handled like the remote part of a refspec, and must match a - ref which is fetched from the remote given by - "branch..remote". - The merge information is used by 'git pull' (which at first calls - 'git fetch') to lookup the default branch for merging. Without - this option, 'git pull' defaults to merge the first refspec fetched. - Specify multiple values to get an octopus merge. - If you wish to setup 'git pull' so that it merges into from - another branch in the local repository, you can point - branch..merge to the desired branch, and use the relative path - setting `.` (a period) for branch..remote. - -branch..mergeOptions:: - Sets default options for merging into branch . The syntax and - supported options are the same as those of linkgit:git-merge[1], but - option values containing whitespace characters are currently not - supported. - -branch..rebase:: - When true, rebase the branch on top of the fetched branch, - instead of merging the default branch from the default remote when - "git pull" is run. See "pull.rebase" for doing this in a non - branch-specific manner. -+ -When `merges`, pass the `--rebase-merges` option to 'git rebase' -so that the lo
[PATCH 19/78] config.txt: move difftool.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 15 +-- Documentation/config/difftool.txt | 14 ++ 2 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 Documentation/config/difftool.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 5693ce7654..f313c7da2e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -321,20 +321,7 @@ include::config/completion.txt[] include::config/diff.txt[] -difftool..path:: - Override the path for the given tool. This is useful in case - your tool is not in the PATH. - -difftool..cmd:: - Specify the command to invoke the specified diff tool. - The specified command is evaluated in shell with the following - variables available: 'LOCAL' is set to the name of the temporary - file containing the contents of the diff pre-image and 'REMOTE' - is set to the name of the temporary file containing the contents - of the diff post-image. - -difftool.prompt:: - Prompt before each invocation of the diff tool. +include::config/difftool.txt[] fastimport.unpackLimit:: If the number of objects imported by linkgit:git-fast-import[1] diff --git a/Documentation/config/difftool.txt b/Documentation/config/difftool.txt new file mode 100644 index 00..6762594480 --- /dev/null +++ b/Documentation/config/difftool.txt @@ -0,0 +1,14 @@ +difftool..path:: + Override the path for the given tool. This is useful in case + your tool is not in the PATH. + +difftool..cmd:: + Specify the command to invoke the specified diff tool. + The specified command is evaluated in shell with the following + variables available: 'LOCAL' is set to the name of the temporary + file containing the contents of the diff pre-image and 'REMOTE' + is set to the name of the temporary file containing the contents + of the diff post-image. + +difftool.prompt:: + Prompt before each invocation of the diff tool. -- 2.19.1.647.g708186aaf9
[PATCH 35/78] config.txt: move http.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 272 +- Documentation/config/http.txt | 271 + 2 files changed, 272 insertions(+), 271 deletions(-) create mode 100644 Documentation/config/http.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 60c2204fb4..11194e1851 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -349,277 +349,7 @@ include::config/guitool.txt[] include::config/help.txt[] -http.proxy:: - Override the HTTP proxy, normally configured using the 'http_proxy', - 'https_proxy', and 'all_proxy' environment variables (see `curl(1)`). In - addition to the syntax understood by curl, it is possible to specify a - proxy string with a user name but no password, in which case git will - attempt to acquire one in the same way it does for other credentials. See - linkgit:gitcredentials[7] for more information. The syntax thus is - '[protocol://][user[:password]@]proxyhost[:port]'. This can be overridden - on a per-remote basis; see remote..proxy - -http.proxyAuthMethod:: - Set the method with which to authenticate against the HTTP proxy. This - only takes effect if the configured proxy string contains a user name part - (i.e. is of the form 'user@host' or 'user@host:port'). This can be - overridden on a per-remote basis; see `remote..proxyAuthMethod`. - Both can be overridden by the `GIT_HTTP_PROXY_AUTHMETHOD` environment - variable. Possible values are: -+ --- -* `anyauth` - Automatically pick a suitable authentication method. It is - assumed that the proxy answers an unauthenticated request with a 407 - status code and one or more Proxy-authenticate headers with supported - authentication methods. This is the default. -* `basic` - HTTP Basic authentication -* `digest` - HTTP Digest authentication; this prevents the password from being - transmitted to the proxy in clear text -* `negotiate` - GSS-Negotiate authentication (compare the --negotiate option - of `curl(1)`) -* `ntlm` - NTLM authentication (compare the --ntlm option of `curl(1)`) --- - -http.emptyAuth:: - Attempt authentication without seeking a username or password. This - can be used to attempt GSS-Negotiate authentication without specifying - a username in the URL, as libcurl normally requires a username for - authentication. - -http.delegation:: - Control GSSAPI credential delegation. The delegation is disabled - by default in libcurl since version 7.21.7. Set parameter to tell - the server what it is allowed to delegate when it comes to user - credentials. Used with GSS/kerberos. Possible values are: -+ --- -* `none` - Don't allow any delegation. -* `policy` - Delegates if and only if the OK-AS-DELEGATE flag is set in the - Kerberos service ticket, which is a matter of realm policy. -* `always` - Unconditionally allow the server to delegate. --- - - -http.extraHeader:: - Pass an additional HTTP header when communicating with a server. If - more than one such entry exists, all of them are added as extra - headers. To allow overriding the settings inherited from the system - config, an empty value will reset the extra headers to the empty list. - -http.cookieFile:: - The pathname of a file containing previously stored cookie lines, - which should be used - in the Git http session, if they match the server. The file format - of the file to read cookies from should be plain HTTP headers or - the Netscape/Mozilla cookie file format (see `curl(1)`). - NOTE that the file specified with http.cookieFile is used only as - input unless http.saveCookies is set. - -http.saveCookies:: - If set, store cookies received during requests to the file specified by - http.cookieFile. Has no effect if http.cookieFile is unset. - -http.sslVersion:: - The SSL version to use when negotiating an SSL connection, if you - want to force the default. The available and default version - depend on whether libcurl was built against NSS or OpenSSL and the - particular configuration of the crypto library in use. Internally - this sets the 'CURLOPT_SSL_VERSION' option; see the libcurl - documentation for more details on the format of this option and - for the ssl version supported. Actually the possible values of - this option are: - - - sslv2 - - sslv3 - - tlsv1 - - tlsv1.0 - - tlsv1.1 - - tlsv1.2 - - tlsv1.3 - -+ -Can be overridden by the `GIT_SSL_VERSION` environment variable. -To force git to use libcurl's default ssl version and ignore any -explicit http.sslversion option, set `GIT_SSL_VERSION` to the -empty string. - -http.sslCipherList:: - A list of SSL ciphers to use when negotiating an SSL connection. - The availabl
[PATCH 36/78] config.txt: move i18n.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 11 +-- Documentation/config/i18n.txt | 10 ++ 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 Documentation/config/i18n.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 11194e1851..a44e717f30 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -351,16 +351,7 @@ include::config/help.txt[] include::config/http.txt[] -i18n.commitEncoding:: - Character encoding the commit messages are stored in; Git itself - does not care per se, but this information is necessary e.g. when - importing commits from emails or in the gitk graphical history - browser (and possibly at other places in the future or in other - porcelains). See e.g. linkgit:git-mailinfo[1]. Defaults to 'utf-8'. - -i18n.logOutputEncoding:: - Character encoding the commit messages are converted to when - running 'git log' and friends. +include::config/i18n.txt[] imap:: The configuration variables in the 'imap' section are described diff --git a/Documentation/config/i18n.txt b/Documentation/config/i18n.txt new file mode 100644 index 00..cc25621731 --- /dev/null +++ b/Documentation/config/i18n.txt @@ -0,0 +1,10 @@ +i18n.commitEncoding:: + Character encoding the commit messages are stored in; Git itself + does not care per se, but this information is necessary e.g. when + importing commits from emails or in the gitk graphical history + browser (and possibly at other places in the future or in other + porcelains). See e.g. linkgit:git-mailinfo[1]. Defaults to 'utf-8'. + +i18n.logOutputEncoding:: + Character encoding the commit messages are converted to when + running 'git log' and friends. -- 2.19.1.647.g708186aaf9
[PATCH 33/78] config.txt: move help.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 24 +--- Documentation/config/help.txt | 23 +++ 2 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 Documentation/config/help.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index dda5812a8a..ba3b775fb0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -347,29 +347,7 @@ include::config/gui.txt[] include::config/guitool.txt[] -help.browser:: - Specify the browser that will be used to display help in the - 'web' format. See linkgit:git-help[1]. - -help.format:: - Override the default help format used by linkgit:git-help[1]. - Values 'man', 'info', 'web' and 'html' are supported. 'man' is - the default. 'web' and 'html' are the same. - -help.autoCorrect:: - Automatically correct and execute mistyped commands after - waiting for the given number of deciseconds (0.1 sec). If more - than one command can be deduced from the entered text, nothing - will be executed. If the value of this option is negative, - the corrected command will be executed immediately. If the - value is 0 - the command will be just shown but not executed. - This is the default. - -help.htmlPath:: - Specify the path where the HTML documentation resides. File system paths - and URLs are supported. HTML pages will be prefixed with this path when - help is displayed in the 'web' format. This defaults to the documentation - path of your Git installation. +include::config/help.txt[] http.proxy:: Override the HTTP proxy, normally configured using the 'http_proxy', diff --git a/Documentation/config/help.txt b/Documentation/config/help.txt new file mode 100644 index 00..224bbf5a28 --- /dev/null +++ b/Documentation/config/help.txt @@ -0,0 +1,23 @@ +help.browser:: + Specify the browser that will be used to display help in the + 'web' format. See linkgit:git-help[1]. + +help.format:: + Override the default help format used by linkgit:git-help[1]. + Values 'man', 'info', 'web' and 'html' are supported. 'man' is + the default. 'web' and 'html' are the same. + +help.autoCorrect:: + Automatically correct and execute mistyped commands after + waiting for the given number of deciseconds (0.1 sec). If more + than one command can be deduced from the entered text, nothing + will be executed. If the value of this option is negative, + the corrected command will be executed immediately. If the + value is 0 - the command will be just shown but not executed. + This is the default. + +help.htmlPath:: + Specify the path where the HTML documentation resides. File system paths + and URLs are supported. HTML pages will be prefixed with this path when + help is displayed in the 'web' format. This defaults to the documentation + path of your Git installation. -- 2.19.1.647.g708186aaf9
Re: What's cooking in git.git (Oct 2018, #05; Fri, 26)
On Fri, Oct 26, 2018 at 04:57:26PM +0900, Junio C Hamano wrote: > * tb/filter-alternate-refs (2018-10-25) 2 commits > (merged to 'next' on 2018-10-26 at 887a7779a3) > + t5410: use longer path for sample script > + Documentation/config.txt: fix typo in core.alternateRefsCommand > > Test fix. > > Will merge to 'master'. There is an additional clean-up patch in [1] that I'm not sure if you have seen or not. Could you please queue that as a fixup to the above? Thanks, Taylor [1]: 6aabe7201dc81b98e404010b441fef8d582b0232.1540258140.git...@ttaylorr.com
[PATCH 3/3] commit-reach.h: add missing declarations (hdr-check)
Add the necessary #includes and forward declarations to allow the header
file to pass the 'hdr-check' target.
Note that, since this header includes the commit-slab implementation
header file (indirectly via commit-slab.h), some of the commit-slab
inline functions (e.g contains_cache_at_peek()) will not compile without
the complete type of 'struct commit'. Hence, we replace the forward
declaration of 'struct commit' with the an #include of the 'commit.h'
header file.
It is possible, using the 'commit-slab-{decl,impl}.h' files, to avoid
this inclusion of the 'commit.h' header. Commit a9f1f1f9f8 ("commit-slab.h:
code split", 2018-05-19) separated the commit-slab interface from its
implementation, to allow for the definition of a public commit-slab data
structure. This enabled us to avoid including the commit-slab implementation
in a header file, which could result in the replication of the commit-slab
functions in each compilation unit in which it was included.
Indeed, if you compile with optimizations disabled, then run this script:
$ cat -n dup-static.sh
1 #!/bin/sh
2
3 nm $1 | grep ' t ' | cut -d' ' -f3 | sort | uniq -c |
4sort -rn | grep -v ' 1'
$
$ ./dup-static.sh git | grep contains
24 init_contains_cache_with_stride
24 init_contains_cache
24 contains_cache_peek
24 contains_cache_at_peek
24 contains_cache_at
24 clear_contains_cache
$
you will find 24 copies of the commit-slab routines for the contains_cache.
Of course, when you enable optimizations again, these duplicate static
functions (mostly) disappear. Compiling with gcc at -O2, leaves two static
functions, thus:
$ nm commit-reach.o | grep contains_cache
0870 t contains_cache_at_peek.isra.1.constprop.6
$ nm ref-filter.o | grep contains_cache
02b0 t clear_contains_cache.isra.14
$
However, using a shared 'contains_cache' would result in all six of the
above functions as external public functions in the git binary. At present,
only three of these functions are actually called, so the trade-off
seems to favour letting the compiler inline the commit-slab functions.
Signed-off-by: Ramsay Jones
---
commit-reach.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/commit-reach.h b/commit-reach.h
index 7d313e2975..f41d8f6ba3 100644
--- a/commit-reach.h
+++ b/commit-reach.h
@@ -1,12 +1,13 @@
#ifndef __COMMIT_REACH_H__
#define __COMMIT_REACH_H__
+#include "commit.h"
#include "commit-slab.h"
-struct commit;
struct commit_list;
-struct contains_cache;
struct ref_filter;
+struct object_id;
+struct object_array;
struct commit_list *get_merge_bases_many(struct commit *one,
int n,
--
2.19.0
[PATCH 2/3] ewok_rlw.h: add missing 'inline' to function definition
The 'ewok_rlw.h' header file contains the rlw_get_run_bit() function
definition, which is marked as 'static' but not 'inline'. At least when
compiled by gcc, with the default -O2 optimization level, the function
is actually inlined and leaves no static version in the ewah_bitmap.o
and ewah_rlw.o object files. Despite this, add the missing 'inline'
keyword to better describe the intended behaviour.
Signed-off-by: Ramsay Jones
---
ewah/ewok_rlw.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ewah/ewok_rlw.h b/ewah/ewok_rlw.h
index d487966935..bafa24f4c3 100644
--- a/ewah/ewok_rlw.h
+++ b/ewah/ewok_rlw.h
@@ -31,7 +31,7 @@
#define RLW_RUNNING_LEN_PLUS_BIT (((eword_t)1 << (RLW_RUNNING_BITS + 1)) - 1)
-static int rlw_get_run_bit(const eword_t *word)
+static inline int rlw_get_run_bit(const eword_t *word)
{
return *word & (eword_t)1;
}
--
2.19.0
[PATCH 1/3] fetch-object.h: add missing declaration (hdr-check)
Signed-off-by: Ramsay Jones --- fetch-object.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fetch-object.h b/fetch-object.h index d2f996d4e8..d6444caa5a 100644 --- a/fetch-object.h +++ b/fetch-object.h @@ -1,6 +1,8 @@ #ifndef FETCH_OBJECT_H #define FETCH_OBJECT_H +struct object_id; + void fetch_objects(const char *remote_name, const struct object_id *oids, int oid_nr); -- 2.19.0
[PATCH 0/3] some more hdr-check clean headers
I have some changes to the hdr-check Makefile target in the works, but these clean-ups don't have to be held up by those changes. The 'fetch-object.h' patch is the same one I sent separately last time, since it only applied on 'next' at the time. The 'ewok_rlw.h' patch is just something I noticed while messing around the the Makefile changes. The 'commit-reach.h' patch is the patch #9 from the original series, but now with a commit message that explains the '#include "commit.h"' issue. These changes are on top of current master (@c670b1f876) and merge without conflict to 'next' and with a 'minor' conflict on 'pu'. Ramsay Jones (3): fetch-object.h: add missing declaration (hdr-check) ewok_rlw.h: add missing 'inline' to function definition commit-reach.h: add missing declarations (hdr-check) commit-reach.h | 5 +++-- ewah/ewok_rlw.h | 2 +- fetch-object.h | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) -- 2.19.0
Re: [PATCH v3 3/3] commit-slab: missing definitions and forward declarations (hdr-check)
On 26/10/2018 04:15, Carlo Arenas wrote: > On Thu, Oct 25, 2018 at 2:09 PM Ramsay Jones > wrote: >> Yes, this will 'fix' the 'commit-reach.h' header (not surprising), >> but I prefer my patch. ;-) > > I apologize, I joined the list recently and so might had missed a > reroll; the merged series in pu doesn't seem to include it and the > error was around the code I changed, so wanted to make sure it would > be addressed sooner rather than later. > > eitherway, I agree with you my patch (or something better) would fit > better in your topic branch than on mine and while I haven't seen your > patch I am sure is most likely better. Hmm, I don't know about that! Since the original series has progressed, any additions will now result in a new set of patches, rather than a re-roll. The original 'commit-reach.h' patch was not applied as part of the last series, since the commit message was felt to be lacking (well, it was actually non-existent!). ;-) I have been making some additional changes to the 'hdr-check' target in the Makefile, but I haven't quite finished. I will send the other (non-Makefile) changes soon. [These patches will make the 'master' and 'next' branches 'hdr-check' clean for me]. ATB, Ramsay Jones
[PATCH v3 3/8] push: improve the error shown on unqualified push
Improve the error message added in f8aae12034 ("push: allow
unqualified dest refspecs to DWIM", 2008-04-23), which before this
change looks like this:
$ git push avar v2.19.0^{commit}:newbranch -n
error: unable to push to unqualified destination: newbranch
The destination refspec neither matches an existing ref on the remote nor
begins with refs/, and we are unable to guess a prefix based on the source
ref.
error: failed to push some refs to 'g...@github.com:avar/git.git'
This message needed to be read very carefully to spot how to fix the
error, i.e. to push to refs/heads/newbranch. Now the message will look
like this instead:
$ ./git-push avar v2.19.0^{commit}:newbranch -n
error: The destination you provided is not a full refname (i.e.,
starting with "refs/"). We tried to guess what you meant by:
- Looking for a ref that matches 'newbranch' on the remote side.
- Checking if the being pushed ('v2.19.0^{commit}')
is a ref in "refs/{heads,tags}/". If so we add a
corresponding refs/{heads,tags}/ prefix on the remote side.
Neither worked, so we gave up. You must fully-qualify the ref.
error: failed to push some refs to 'g...@github.com:avar/git.git'
This improvement is the result of on-list discussion in [1] and [2],
as well as my own fixes / reformatting / phrasing on top.
The suggestion by Jeff on-list was to make that second bullet point
"Looking at the refname of the local source.". The version being added
here is more verbose, but also more accurate. saying "local source"
could refer to any ref in the local refstore, including something in
refs/remotes/*. A later change will teach guess_ref() to infer a ref
type from remote-tracking refs, so let's not confuse the two.
While I'm at it, add a "TRANSLATORS" comment since the message has
gotten more complex and it's not as clear what the two %s's refer to.
1. https://public-inbox.org/git/20181010205505.gb12...@sigill.intra.peff.net/
2. https://public-inbox.org/git/xmqqbm81lb7c@gitster-ct.c.googlers.com/
Signed-off-by: Ævar Arnfjörð Bjarmason
---
remote.c | 22 --
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/remote.c b/remote.c
index 5cb3d00bfb..f4b438ff74 100644
--- a/remote.c
+++ b/remote.c
@@ -1049,12 +1049,22 @@ static int match_explicit(struct ref *src, struct ref
*dst,
matched_dst = make_linked_ref(dst_guess, dst_tail);
free(dst_guess);
} else {
- error(_("unable to push to unqualified destination:
%s\n"
- "The destination refspec neither matches an "
- "existing ref on the remote nor\n"
- "begins with refs/, and we are unable to "
- "guess a prefix based on the source ref."),
- dst_value);
+ /*
+* TRANSLATORS: "matches '%s'%" is the
+* part of "git push :"
+* push, and "being pushed ('%s')" is the
+* .
+*/
+ error(_("The destination you provided is not a full
refname (i.e.,\n"
+ "starting with \"refs/\"). We tried to guess
what you meant by:\n"
+ "\n"
+ "- Looking for a ref that matches '%s' on the
remote side.\n"
+ "- Checking if the being pushed ('%s')\n"
+ " is a ref in \"refs/{heads,tags}/\". If so we
add a corresponding\n"
+ " refs/{heads,tags}/ prefix on the remote
side.\n"
+ "\n"
+ "Neither worked, so we gave up. You must
fully-qualify the ref."),
+ dst_value, matched_src->name);
}
break;
default:
--
2.19.1.759.g500967bb5e
[PATCH v3 4/8] push: move unqualified refname error into a function
A follow-up change will extend this error message with the advice
facility. Doing so would make the indentation too deeply nested for
comfort. So let's split this into a helper function.
There's no changes to the wording here. Just code moving &
re-indentation, and re-flowing the "TRANSLATORS" comment.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
remote.c | 38 ++
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/remote.c b/remote.c
index f4b438ff74..c7a0b9c46f 100644
--- a/remote.c
+++ b/remote.c
@@ -1005,6 +1005,26 @@ static int match_explicit_lhs(struct ref *src,
}
}
+static void show_push_unqualified_ref_name_error(const char *dst_value,
+const char *matched_src_name)
+{
+ /*
+* TRANSLATORS: "matches '%s'%" is the part of "git push
+* :" push, and "being pushed ('%s')" is
+* the .
+*/
+ error(_("The destination you provided is not a full refname (i.e.,\n"
+ "starting with \"refs/\"). We tried to guess what you meant
by:\n"
+ "\n"
+ "- Looking for a ref that matches '%s' on the remote side.\n"
+ "- Checking if the being pushed ('%s')\n"
+ " is a ref in \"refs/{heads,tags}/\". If so we add a
corresponding\n"
+ " refs/{heads,tags}/ prefix on the remote side.\n"
+ "\n"
+ "Neither worked, so we gave up. You must fully-qualify the
ref."),
+ dst_value, matched_src_name);
+}
+
static int match_explicit(struct ref *src, struct ref *dst,
struct ref ***dst_tail,
struct refspec_item *rs)
@@ -1049,22 +1069,8 @@ static int match_explicit(struct ref *src, struct ref
*dst,
matched_dst = make_linked_ref(dst_guess, dst_tail);
free(dst_guess);
} else {
- /*
-* TRANSLATORS: "matches '%s'%" is the
-* part of "git push :"
-* push, and "being pushed ('%s')" is the
-* .
-*/
- error(_("The destination you provided is not a full
refname (i.e.,\n"
- "starting with \"refs/\"). We tried to guess
what you meant by:\n"
- "\n"
- "- Looking for a ref that matches '%s' on the
remote side.\n"
- "- Checking if the being pushed ('%s')\n"
- " is a ref in \"refs/{heads,tags}/\". If so we
add a corresponding\n"
- " refs/{heads,tags}/ prefix on the remote
side.\n"
- "\n"
- "Neither worked, so we gave up. You must
fully-qualify the ref."),
- dst_value, matched_src->name);
+ show_push_unqualified_ref_name_error(dst_value,
+matched_src->name);
}
break;
default:
--
2.19.1.759.g500967bb5e
[PATCH v3 8/8] push doc: document the DWYM behavior pushing to unqualified
Document the DWYM behavior that kicks in when pushing to an
unqualified reference.
This behavior was added in f88395ac23 ("Renaming push.", 2005-08-03)
and f8aae12034 ("push: allow unqualified dest refspecs to DWIM",
2008-04-23), and somewhat documented in bb9fca80ce ("git-push: Update
description of refspecs and add examples", 2007-06-09), but has never
been fully documented.
The closest we got to having documented it was the description in the
commit message for f8aae12034, which I've borrowed from in writing
this documentation.
Let's also refer to this new documentation from the existing
documentation we had (added in bb9fca80ce).
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/git-push.txt | 27 +++
1 file changed, 27 insertions(+)
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index a5fc54aeab..fb95c2e395 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -73,6 +73,30 @@ be omitted--such a push will update a ref that ``
normally updates
without any `` on the command line. Otherwise, missing
`:` means to update the same ref as the ``.
+
+If doesn't start with `refs/` (e.g. `refs/heads/master`) we will
+try to infer where in `refs/*` on the destination it
+belongs based on the the type of being pushed and whether
+is ambiguous.
++
+--
+* If unambiguously refers to a ref on the remote,
+ then push to that ref.
+
+* If resolves to a ref starting with refs/heads/ or refs/tags/,
+ then prepend that to .
+
+* If starts with refs/remotes/ check if that reference refers to
+ a commit or tag, then refs/heads/ or refs/tags/ to as
+ appropriate.
+
+* Other ambiguity resolutions might be added in the future, but for
+ now any other cases will error out with an error indicating what we
+ tried, and depending on the `advice.pushUnqualifiedRefname`
+ configuration (see linkgit:git-config[1]) suggest what refs/
+ namespace you may have wanted to push to.
+
+--
++
The object referenced by is used to update the reference
on the remote side. Whether this is allowed depends on where in
`refs/*` the reference lives as described in detail below, in
@@ -591,6 +615,9 @@ the ones in the examples below) can be configured as the
default for
`refs/remotes/satellite/master`) in the `mothership` repository;
do the same for `dev` and `satellite/dev`.
+
+See the section describing `...` above for a discussion of
+the matching semantics.
++
This is to emulate `git fetch` run on the `mothership` using `git
push` that is run in the opposite direction in order to integrate
the work done on `satellite`, and is often necessary when you can
--
2.19.1.759.g500967bb5e
[PATCH v3 6/8] push: test that doesn't DWYM if is unqualified
Add a test asserting that "git push origin :" where is
a branch, tag, tree or blob in refs/remotes/* doesn't DWYM when
is unqualified. This has never worked, but there's been no test for
this behavior.
See f88395ac23 ("Renaming push.", 2005-08-03), bb9fca80ce ("git-push:
Update description of refspecs and add examples", 2007-06-09) and
f8aae12034 ("push: allow unqualified dest refspecs to DWIM",
2008-04-23) which are most relevant commits that have changed or
documented the behavior of this feature in the past.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t5505-remote.sh | 28
1 file changed, 28 insertions(+)
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 2e58721f98..979a13b415 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -1246,5 +1246,33 @@ test_expect_success 'unqualified refspec DWIM and
advice' '
)
'
+test_expect_success 'refs/remotes/* refspec and unqualified DWIM
and advice' '
+ (
+ cd two &&
+ git tag -a -m "Some tag" some-tag master &&
+ git update-ref refs/trees/my-head-tree HEAD^{tree} &&
+ git update-ref refs/blobs/my-file-blob HEAD:file
+ ) &&
+ (
+ cd test &&
+ git config --add remote.two.fetch
"+refs/tags/*:refs/remotes/two-tags/*" &&
+ git config --add remote.two.fetch
"+refs/trees/*:refs/remotes/two-trees/*" &&
+ git config --add remote.two.fetch
"+refs/blobs/*:refs/remotes/two-blobs/*" &&
+ git fetch --no-tags two &&
+
+ test_must_fail git push origin refs/remotes/two/another:dst
2>err &&
+ test_i18ngrep "error: The destination you" err &&
+
+ test_must_fail git push origin
refs/remotes/two-tags/some-tag:dst-tag 2>err &&
+ test_i18ngrep "error: The destination you" err &&
+
+ test_must_fail git push origin
refs/remotes/two-trees/my-head-tree:dst-tree 2>err &&
+ test_i18ngrep "error: The destination you" err &&
+
+ test_must_fail git push origin
refs/remotes/two-blobs/my-file-blob:dst-blob 2>err &&
+ test_i18ngrep "error: The destination you" err
+ )
+'
+
test_done
--
2.19.1.759.g500967bb5e
[PATCH v3 5/8] push: add an advice on unqualified push
Add an advice to the recently improved error message added in
f8aae12034 ("push: allow unqualified dest refspecs to DWIM",
2008-04-23).
Now with advice.pushUnqualifiedRefName=true (on by default) we show a
hint about how to proceed:
$ ./git-push avar v2.19.0^{commit}:newbranch -n
error: The destination you provided is not a full refname (i.e.,
starting with "refs/"). We tried to guess what you meant by:
- Looking for a ref that matches 'newbranch' on the remote side.
- Checking if the being pushed ('v2.19.0^{commit}')
is a ref in "refs/{heads,tags}/". If so we add a corresponding
refs/{heads,tags}/ prefix on the remote side.
Neither worked, so we gave up. You must fully-qualify the ref.
hint: The part of the refspec is a commit object.
hint: Did you mean to create a new branch by pushing to
hint: 'v2.19.0^{commit}:refs/heads/newbranch'?
error: failed to push some refs to 'g...@github.com:avar/git.git'
When trying to push a tag, tree or a blob we suggest that perhaps the
user meant to push them to refs/tags/ instead.
The if/else duplication for all of OBJ_{COMMIT,TAG,TREE,BLOB} is
unfortunate, but is required to correctly mark the messages for
translation. See the discussion in
<87r2gxebsi@evledraar.gmail.com> about that.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/config.txt | 7 +++
advice.c | 2 ++
advice.h | 1 +
remote.c | 37 +
t/t5505-remote.sh| 25 +
5 files changed, 72 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 552827935a..8ca465702e 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -320,6 +320,13 @@ advice.*::
tries to overwrite a remote ref that points at an
object that is not a commit-ish, or make the remote
ref point at an object that is not a commit-ish.
+ pushUnqualifiedRefname::
+ Shown when linkgit:git-push[1] gives up trying to
+ guess based on the source and destination refs what
+ remote ref namespace the source belongs in, but where
+ we can still suggest that the user push to either
+ refs/heads/* or refs/tags/* based on the type of the
+ source object.
statusHints::
Show directions on how to proceed from the current
state in the output of linkgit:git-status[1], in
diff --git a/advice.c b/advice.c
index 3561cd64e9..3089a4ca65 100644
--- a/advice.c
+++ b/advice.c
@@ -9,6 +9,7 @@ int advice_push_non_ff_matching = 1;
int advice_push_already_exists = 1;
int advice_push_fetch_first = 1;
int advice_push_needs_force = 1;
+int advice_push_unqualified_ref_name = 1;
int advice_status_hints = 1;
int advice_status_u_option = 1;
int advice_commit_before_merge = 1;
@@ -62,6 +63,7 @@ static struct {
{ "pushAlreadyExists", &advice_push_already_exists },
{ "pushFetchFirst", &advice_push_fetch_first },
{ "pushNeedsForce", &advice_push_needs_force },
+ { "pushUnqualifiedRefName", &advice_push_unqualified_ref_name },
{ "statusHints", &advice_status_hints },
{ "statusUoption", &advice_status_u_option },
{ "commitBeforeMerge", &advice_commit_before_merge },
diff --git a/advice.h b/advice.h
index ab24df0fd0..9a2f8b5226 100644
--- a/advice.h
+++ b/advice.h
@@ -9,6 +9,7 @@ extern int advice_push_non_ff_matching;
extern int advice_push_already_exists;
extern int advice_push_fetch_first;
extern int advice_push_needs_force;
+extern int advice_push_unqualified_ref_name;
extern int advice_status_hints;
extern int advice_status_u_option;
extern int advice_commit_before_merge;
diff --git a/remote.c b/remote.c
index c7a0b9c46f..93f802509d 100644
--- a/remote.c
+++ b/remote.c
@@ -13,6 +13,7 @@
#include "mergesort.h"
#include "argv-array.h"
#include "commit-reach.h"
+#include "advice.h"
enum map_direction { FROM_SRC, FROM_DST };
@@ -1008,6 +1009,9 @@ static int match_explicit_lhs(struct ref *src,
static void show_push_unqualified_ref_name_error(const char *dst_value,
const char *matched_src_name)
{
+ struct object_id oid;
+ enum object_type type;
+
/*
* TRANSLATORS: "matches '%s'%" is the part of "git push
* :" push, and "being pushed ('%s')" is
@@ -1023,6 +1027,39 @@ static void show_push_unqualified_ref_name_error(const
char *dst_value,
"\n"
"Neither worked, so we gave up. You must fully-qualify the
ref."),
dst_value, matched_src_name);
+
+ if (!advice_push_unqualified_ref_name)
+ return;
+
+ if (get_oid(matched_src_name, &oid))
+ BUG("'%s' is not a valid object, "
+ "match_explicit_lhs() should catch this!",
+
[PATCH v3 7/8] push: add DWYM support for "git push refs/remotes/...:"
Add DWYM support for pushing a ref in refs/remotes/* when the
ref is unqualified. Now instead of erroring out we support e.g.:
$ ./git-push avar refs/remotes/origin/master:upstream-master -n
To github.com:avar/git.git
* [new branch]origin/master -> upstream-master
Before this we wouldn't know what do do with
refs/remotes/origin/master, now we'll look it up and discover that
it's a commit (or tag) and add a refs/{heads,tags}/ prefix to as
appropriate.
The error message emitted when we still don't know what to do has been
amended to note that this is something we tried:
$ ./git-push avar v2.19.0^{commit}:newbranch -n
error: The destination you provided is not a full refname (i.e.,
starting with "refs/"). We tried to guess what you meant by:
- Looking for a ref that matches 'newbranch' on the remote side.
- Checking if the being pushed ('v2.19.0^{commit}')
is a ref in "refs/{heads,tags}/". If so we add a corresponding
refs/{heads,tags}/ prefix on the remote side.
- Checking if the being pushed ('v2.19.0^{commit}')
is a commit or tag in "refs/remotes/*". Then we infer a
corresponding refs/{heads,tags} on the remote side.
None of those worked, so we gave up. You must fully-qualify the ref.
hint: The part of the refspec is a commit object.
hint: Did you mean to create a new branch by pushing to
hint: 'v2.19.0^{commit}:refs/heads/newbranch'?
I'm bending over backwards and assuming that someone might have hacked
in remote tracking tags (see [1] for a discussion of how that can be
done), but punting on any tree or blob objects found under
refs/remotes/*.
This is the first use of the %N$ style of printf format in
the *.[ch] files in our codebase. It's supported by POSIX[2] and
there's existing uses for it in po/*.po files, so hopefully it won't
cause any trouble. It's more obvious for translators than to have a
3rd argument to the function identical to the 2nd, by re-using the 2nd
it's clear that we're continuing to talk about the part of the
refspec.
1. https://public-inbox.org/git/87zi1jxjqn@evledraar.gmail.com/
2. http://pubs.opengroup.org/onlinepubs/7908799/xsh/fprintf.html
Signed-off-by: Ævar Arnfjörð Bjarmason
---
remote.c | 20 +++-
t/t5505-remote.sh | 14 +-
2 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/remote.c b/remote.c
index 93f802509d..c243e3d89e 100644
--- a/remote.c
+++ b/remote.c
@@ -973,6 +973,21 @@ static char *guess_ref(const char *name, struct ref *peer)
strbuf_addstr(&buf, "refs/heads/");
} else if (starts_with(r, "refs/tags/")) {
strbuf_addstr(&buf, "refs/tags/");
+ } else if (starts_with(r, "refs/remotes/")) {
+ struct object_id oid;
+ enum object_type type;
+
+ if (get_oid(peer->name, &oid))
+ BUG("'%s' is not a valid object, "
+ "match_explicit_lhs() should catch this!",
+ peer->name);
+ type = oid_object_info(the_repository, &oid, NULL);
+ if (type == OBJ_COMMIT)
+ strbuf_addstr(&buf, "refs/heads/");
+ else if (type == OBJ_TAG)
+ strbuf_addstr(&buf, "refs/tags/");
+ else
+ return NULL;
} else {
return NULL;
}
@@ -1024,8 +1039,11 @@ static void show_push_unqualified_ref_name_error(const
char *dst_value,
"- Checking if the being pushed ('%s')\n"
" is a ref in \"refs/{heads,tags}/\". If so we add a
corresponding\n"
" refs/{heads,tags}/ prefix on the remote side.\n"
+ "- Checking if the being pushed ('%2$s')\n"
+ " is a commit or tag in \"refs/remotes/*\". Then we infer a\n"
+ " corresponding refs/{heads,tags} on the remote side.\n"
"\n"
- "Neither worked, so we gave up. You must fully-qualify the
ref."),
+ "None of those worked, so we gave up. You must fully-qualify
the ref."),
dst_value, matched_src_name);
if (!advice_push_unqualified_ref_name)
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 979a13b415..a6337b50e4 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -1260,11 +1260,15 @@ test_expect_success 'refs/remotes/* refspec and
unqualified DWIM and
git config --add remote.two.fetch
"+refs/blobs/*:refs/remotes/two-blobs/*" &&
git fetch --no-tags two &&
- test_must_fail git push origin refs/remotes/two/another:dst
2>err &&
- test_i18ngrep "error: The destination you" err &&
-
- test_must_fail git push origin
refs/remotes/two-tags/some-tag:dst-tag 2>err &&
- test_i18ngrep "error: The destination you" err &&
+ echo commit >expected
[PATCH v3 1/8] remote.c: add braces in anticipation of a follow-up change
The CodingGuidelines say "When there are multiple arms to a
conditional and some of them require braces, enclose even a single
line block in braces for consistency.". Fix the code in
match_explicit() to conform.
While I'm at it change the if/else if/else in guess_ref() to use
braces. This is not currently needed, but a follow-up change will add
a new multi-line condition to that logic.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
remote.c | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/remote.c b/remote.c
index 81f4f01b00..18cae48daa 100644
--- a/remote.c
+++ b/remote.c
@@ -968,12 +968,13 @@ static char *guess_ref(const char *name, struct ref *peer)
if (!r)
return NULL;
- if (starts_with(r, "refs/heads/"))
+ if (starts_with(r, "refs/heads/")) {
strbuf_addstr(&buf, "refs/heads/");
- else if (starts_with(r, "refs/tags/"))
+ } else if (starts_with(r, "refs/tags/")) {
strbuf_addstr(&buf, "refs/tags/");
- else
+ } else {
return NULL;
+ }
strbuf_addstr(&buf, name);
return strbuf_detach(&buf, NULL);
@@ -1038,21 +1039,22 @@ static int match_explicit(struct ref *src, struct ref
*dst,
case 1:
break;
case 0:
- if (starts_with(dst_value, "refs/"))
+ if (starts_with(dst_value, "refs/")) {
matched_dst = make_linked_ref(dst_value, dst_tail);
- else if (is_null_oid(&matched_src->new_oid))
+ } else if (is_null_oid(&matched_src->new_oid)) {
error("unable to delete '%s': remote ref does not
exist",
dst_value);
- else if ((dst_guess = guess_ref(dst_value, matched_src))) {
+ } else if ((dst_guess = guess_ref(dst_value, matched_src))) {
matched_dst = make_linked_ref(dst_guess, dst_tail);
free(dst_guess);
- } else
+ } else {
error("unable to push to unqualified destination: %s\n"
"The destination refspec neither matches an "
"existing ref on the remote nor\n"
"begins with refs/, and we are unable to "
"guess a prefix based on the source ref.",
dst_value);
+ }
break;
default:
matched_dst = NULL;
--
2.19.1.759.g500967bb5e
[PATCH v3 2/8] i18n: remote.c: mark error(...) messages for translation
Mark up the error(...) messages in remote.c for translation. The likes
of "unable to push to unqualified destination" are relatively big
parts of the UI, i.e. error messages shown when "git push" fails.
I don't think any of these are plumbing, an the entire test suite
passes when running the tests with GIT_GETTEXT_POISON=1 (after
building with GETTEXT_POISON).
Signed-off-by: Ævar Arnfjörð Bjarmason
---
remote.c | 35 ++-
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/remote.c b/remote.c
index 18cae48daa..5cb3d00bfb 100644
--- a/remote.c
+++ b/remote.c
@@ -406,7 +406,7 @@ static int handle_config(const char *key, const char
*value, void *cb)
if (!remote->receivepack)
remote->receivepack = v;
else
- error("more than one receivepack given, using the
first");
+ error(_("more than one receivepack given, using the
first"));
} else if (!strcmp(subkey, "uploadpack")) {
const char *v;
if (git_config_string(&v, key, value))
@@ -414,7 +414,7 @@ static int handle_config(const char *key, const char
*value, void *cb)
if (!remote->uploadpack)
remote->uploadpack = v;
else
- error("more than one uploadpack given, using the
first");
+ error(_("more than one uploadpack given, using the
first"));
} else if (!strcmp(subkey, "tagopt")) {
if (!strcmp(value, "--no-tags"))
remote->fetch_tags = -1;
@@ -707,7 +707,7 @@ static void query_refspecs_multiple(struct refspec *rs,
int find_src = !query->src;
if (find_src && !query->dst)
- error("query_refspecs_multiple: need either src or dst");
+ error(_("query_refspecs_multiple: need either src or dst"));
for (i = 0; i < rs->nr; i++) {
struct refspec_item *refspec = &rs->items[i];
@@ -735,7 +735,7 @@ int query_refspecs(struct refspec *rs, struct refspec_item
*query)
char **result = find_src ? &query->src : &query->dst;
if (find_src && !query->dst)
- return error("query_refspecs: need either src or dst");
+ return error(_("query_refspecs: need either src or dst"));
for (i = 0; i < rs->nr; i++) {
struct refspec_item *refspec = &rs->items[i];
@@ -996,12 +996,12 @@ static int match_explicit_lhs(struct ref *src,
* way to delete 'other' ref at the remote end.
*/
if (try_explicit_object_name(rs->src, match) < 0)
- return error("src refspec %s does not match any.",
rs->src);
+ return error(_("src refspec %s does not match any."),
rs->src);
if (allocated_match)
*allocated_match = 1;
return 0;
default:
- return error("src refspec %s matches more than one.", rs->src);
+ return error(_("src refspec %s matches more than one."),
rs->src);
}
}
@@ -1041,32 +1041,33 @@ static int match_explicit(struct ref *src, struct ref
*dst,
case 0:
if (starts_with(dst_value, "refs/")) {
matched_dst = make_linked_ref(dst_value, dst_tail);
+
} else if (is_null_oid(&matched_src->new_oid)) {
- error("unable to delete '%s': remote ref does not
exist",
+ error(_("unable to delete '%s': remote ref does not
exist"),
dst_value);
} else if ((dst_guess = guess_ref(dst_value, matched_src))) {
matched_dst = make_linked_ref(dst_guess, dst_tail);
free(dst_guess);
} else {
- error("unable to push to unqualified destination: %s\n"
- "The destination refspec neither matches an "
- "existing ref on the remote nor\n"
- "begins with refs/, and we are unable to "
- "guess a prefix based on the source ref.",
+ error(_("unable to push to unqualified destination:
%s\n"
+ "The destination refspec neither matches an "
+ "existing ref on the remote nor\n"
+ "begins with refs/, and we are unable to "
+ "guess a prefix based on the source ref."),
dst_value);
}
break;
default:
matched_dst = NULL;
- error("dst refspec %s matches more than one.",
+ error(_("dst refspec %s matches more than one."),
dst_value);
break;
}
[PATCH v3 0/8] fixes for unqualified push
After sending out v2 I noticed I didn't update the examples in a
couple of the commit messages, and figured I'd finish this up by
adding a patch to document how this works in the "git-push"
manpage. This behavior has never been properly documented. range-diff
with v2:
1: ca8eb6dc28 = 1: ca8eb6dc28 remote.c: add braces in anticipation of a
follow-up change
2: b0e15b6ff1 = 2: b0e15b6ff1 i18n: remote.c: mark error(...) messages
for translation
3: 052fc5860e = 3: 052fc5860e push: improve the error shown on
unqualified push
4: e6aa2e360f = 4: e6aa2e360f push: move unqualified refname error into a
function
5: 57840952b2 ! 5: dcf566e16e push: add an advice on unqualified
push
@@ -13,8 +13,10 @@
error: The destination you provided is not a full refname
(i.e.,
starting with "refs/"). We tried to guess what you meant by:
-- Looking for a ref that matches newbranch on the remote side.
-- Looking at the refname of the local source.
+- Looking for a ref that matches 'newbranch' on the remote
side.
+- Checking if the being pushed ('v2.19.0^{commit}')
+ is a ref in "refs/{heads,tags}/". If so we add a
corresponding
+ refs/{heads,tags}/ prefix on the remote side.
Neither worked, so we gave up. You must fully-qualify the ref.
hint: The part of the refspec is a commit object.
6: a2d98855cc = 6: 92ff753437 push: test that doesn't DWYM if
is unqualified
7: 4e1953da82 ! 7: 58eeb0f3f3 push: add DWYM support for "git push
refs/remotes/...:"
@@ -3,22 +3,44 @@
push: add DWYM support for "git push refs/remotes/...:"
Add DWYM support for pushing a ref in refs/remotes/* when the
-ref is unqualified, e.g.:
+ref is unqualified. Now instead of erroring out we support e.g.:
-git push origin refs/remotes/origin/master:upstream-master
+$ ./git-push avar refs/remotes/origin/master:upstream-master -n
+To github.com:avar/git.git
+ * [new branch]origin/master -> upstream-master
Before this we wouldn't know what do do with
refs/remotes/origin/master, now we'll look it up and discover that
it's a commit (or tag) and add a refs/{heads,tags}/ prefix to
as
appropriate.
+The error message emitted when we still don't know what to do has
been
+amended to note that this is something we tried:
+
+$ ./git-push avar v2.19.0^{commit}:newbranch -n
+error: The destination you provided is not a full refname
(i.e.,
+starting with "refs/"). We tried to guess what you meant by:
+
+- Looking for a ref that matches 'newbranch' on the remote
side.
+- Checking if the being pushed ('v2.19.0^{commit}')
+ is a ref in "refs/{heads,tags}/". If so we add a
corresponding
+ refs/{heads,tags}/ prefix on the remote side.
+- Checking if the being pushed ('v2.19.0^{commit}')
+ is a commit or tag in "refs/remotes/*". Then we infer a
+ corresponding refs/{heads,tags} on the remote side.
+
+None of those worked, so we gave up. You must fully-qualify
the ref.
+hint: The part of the refspec is a commit object.
+hint: Did you mean to create a new branch by pushing to
+hint: 'v2.19.0^{commit}:refs/heads/newbranch'?
+
I'm bending over backwards and assuming that someone might have
hacked
in remote tracking tags (see [1] for a discussion of how that can
be
done), but punting on any tree or blob objects found under
refs/remotes/*.
This is the first use of the %N$ style of printf format in
-the *.[ch] files in our codebase, but it's supported by POSIX[2]
and
+the *.[ch] files in our codebase. It's supported by POSIX[2] and
there's existing uses for it in po/*.po files, so hopefully it
won't
cause any trouble. It's more obvious for translators than to have a
3rd argument to the function identical to the 2nd, by re-using the
2nd
-: -- > 8: bc171b0312 push doc: document the DWYM behavior
pushing to unqualified
Ævar Arnfjörð Bjarmason (8):
remote.c: add braces in anticipation of a follow-up change
i18n: remote.c: mark error(...) messages for translation
push: improve the error shown on unqualified push
push: move unqualified refname error into a function
push: add an advice on unqualified push
push: test that doesn't DWYM if is unqualified
push: add DWYM
Re: [PATCH 06/10] repository: repo_submodule_init to take a submodule struct
On Fri, Oct 26, 2018 at 12:15 PM Jonathan Tan wrote: [snip] > The expected pattern. > > This patch looks good to me. I'll take this as a "Reviewed-by"? Thanks, Stefan
Re: [PATCH v2 1/7] remote.c: add braces in anticipation of a follow-up change
On Fri, Oct 26, 2018 at 12:27 PM Ævar Arnfjörð Bjarmason
wrote:
>
> The CodingGuidelines say "When there are multiple arms to a
> conditional and some of them require braces, enclose even a single
> line block in braces for consistency.". Fix the code in
> match_explicit() to conform.
A tangent from a bystander:
This sounds like a lovely transformation that we'd want to
apply to the whole tree (Who wouldn't want to conform to
our self-imposed coding guidelines?),
so I tried coming up with a coccinelle patch to do that,
but I did not manage to produce such a patch, yet.
So far I am at
@@
expression E1;
statement S1, S2;
@@
{<...
if (E1) {
S1;
-} else
+} else {
S2;
+}
...>}
but this doesn't transform the simple test program that I wrote.
> While I'm at it change the if/else if/else in guess_ref() to use
> braces. This is not currently needed, but a follow-up change will add
> a new multi-line condition to that logic.
The patch looks good.
Stefan
