Re: [PATCH v4] gpg-interface.c: detect and reject multiple signatures on commits
Michał Górny writes:
> GnuPG supports creating signatures consisting of multiple signature
> packets. If such a signature is verified, it outputs all the status
> messages for each signature separately. However, git currently does not
> account for such scenario and gets terribly confused over getting
> multiple *SIG statuses.
>
> For example, if a malicious party alters a signed commit and appends
> a new untrusted signature, git is going to ignore the original bad
> signature and report untrusted commit instead. However, %GK and %GS
> format strings may still expand to the data corresponding
> to the original signature, potentially tricking the scripts into
> trusting the malicious commit.
>
> Given that the use of multiple signatures is quite rare, git does not
> support creating them without jumping through a few hoops, and finally
> supporting them properly would require extensive API improvement, it
> seems reasonable to just reject them at the moment.
>
> Signed-off-by: Michał Górny
> ---
> gpg-interface.c | 90 +++-
> t/t7510-signed-commit.sh | 26
> 2 files changed, 87 insertions(+), 29 deletions(-)
>
> Changes in v4:
> * switched to using skip_prefix(),
> * renamed the variable to seen_exclusive_status,
> * made the loop terminate early on first duplicate status seen.
Thanks for sticking to the topic and polishing it further. Looks
very good.
Will replace.
> + int seen_exclusive_status = 0;
> +
> + /* Iterate over all lines */
> + for (line = buf; *line; line = strchrnul(line+1, '\n')) {
> + while (*line == '\n')
> + line++;
> + /* Skip lines that don't start with GNUPG status */
> + if (!skip_prefix(line, "[GNUPG:] ", ))
> + continue;
> +
> + /* Iterate over all search strings */
> + for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_status); i++) {
> + if (skip_prefix(line, sigcheck_gpg_status[i].check,
> )) {
> + if (sigcheck_gpg_status[i].flags &
> GPG_STATUS_EXCLUSIVE) {
> + if (++seen_exclusive_status > 1)
> + goto found_duplicate_status;
Very minor point but by not using pre-increment, i.e.
if (seen_exclusive_status++)
goto found_duplicate_status;
you can use the expression as a "have we already seen?" boolean,
whic may probably be more idiomatic.
The patch is good in the way written as-is, and this is so minor
that it is not worth rerolling to only update this part.
Thanks.
Re: What's cooking in git.git (Oct 2018, #04; Fri, 19)
Alban Gruin writes:
> The error comes from the call to `git stash apply $stash_id' in
> builtin/rebase.c:261. When $stash_id only contains decimals and no
> letters, git-stash tries to apply stash@{$stash_id}[0][1]. Thas was not
> a real problem with the shell script, because it did not abbreviate the
> object id of the stashed commit, so it was very unlikely that the oid
> would contain only digits. builtin/rebase.c shortens the oid[2], making
> this problem more likely to occur.
OK, so make "rebase in C" a faithful conversion of the original, the
code that lead to builtin/rebase.c:261 must be fixed not to pass a
shortened oid. I suspect that internally it has a full object name,
so not shortening would be the right thing anyway, so regaredless of
this bug, it probably makes sense to do the fix.
But as you said, even the scripted version that passed the full
object name had a (10/16^40) chance of using a 40-hex that only has
[0-9] and caused the same breakage, so such a change to "rebase in
C" is sweeping the age old bug under the same rug, in the context of
discussing this particular bug.
I agree with you that it is a better fix to the problem to allow the
caller to say "I am giving an oid---it may (or may not---I do not
even bother to check) consist of only digits, but do not treat it as
an index to the stash reflog."
Re: [PATCH 00/59] Split config.txt
Ævar Arnfjörð Bjarmason writes:
> I had a slight bias against this when you started this, since I'm one of
> these odd people who don't mind ~20k line files if the line count isn't
> contributing to inherent complexity, e.g. in the case of config.txt you
> could just use the search function all in one file.
After typing "less Documentation/config.txt" and realizing that I
have to open another file (which one?) to find how we described the
push.default config, I am already experiencing a lot stronger bias
against this.
But I know it will pass. Once this ~60 patch series completes, my
irritation would peak, because at that point I would not be able to
even do "git grep push.config Documentation/config*", but I would no
longer be reaching for "less Documentation/config.txt" anymore at
that point. Once Documentation/$group-config.txt (which I think is
a mistake) are renamed to Documentation/$something/$group.txt, then
I know I can do "less Doc/$some/$gro" to get my ease
of use back. There will still be an annoyance caused by having to
open another file when reading description of branch..merge in
branch-config.txt and seeing a reference to push.default, though.
And the end result makes it impossible to place a description of a
new variable in a wrong section. It still is possible to mistakenly
insert a variable in a wrong place in the right section that
requires a fix like 8578037b ("config.txt: reorder blame stuff to
keep config keys sorted", 2018-08-04), but we do not fix all the
problems under the sky in one series ;-).
So after saying all of the above, I am moderately supportive of this
series.
Re: [PATCH 00/59] Split config.txt
On Sat, Oct 20 2018, Duy Nguyen wrote: > On Sat, Oct 20, 2018 at 9:25 PM Ævar Arnfjörð Bjarmason > wrote: >> And sometimes like in the case of git-gc(1) we have gc.* config >> documented in two places with different prose that needs to be updated >> in two places in a CONFIGURATION section. This series allows us to just >> unify the two and do an "include" in two places, and more generally have >> the convention that a given command that uses configuration could have >> that config both documented in git-config(1), and the same docs in its >> own manpage. >> >> Is doing some post-cleanup like that your eventual goal after this >> series? > > I did see the possibility of including command-specific config in > individual command man page. But I'm not planning on doing it myself. > Some command man page is already pretty long, plus sometimes we rely > on the core.* part which should not be included in per-command man > page... I might follow-up with some of that after this lands then. We wouldn't include all config (including core.*) that affects the command, but just command-specific stuff like gc.* or worktree.*. Due to limitations of ASCIIDOC link syntax we often just mention "blah blah can be also configured as somecmd.config, see linkgit:git-config[1]", e.g. one example I recently added is at: https://git-scm.com/docs/git-fetch#_pruning Then the user clicks on that, and ends up in this giant manpage and they need to use their browser search. Both far that web experience and for reading with "man" it would be nicer to be able to say "see the CONFIGURATION section below" which would have that included. But arguably better would be consistently being able to know where the primary documentation is. E.g. for worktree.guessRemote (not picking on you in particular, it was just easy because worktree.* is only one config var) we have: in git-config(1): 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. In git-worktree(1) --[no-]guess-remote:: With `worktree add `, without ``, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of ``, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as "upstream" from the new branch. + This can also be set up as the default behaviour by using the `worktree.guessRemote` config option. Mostly they're saying the same, but all in different words, so you need to carefully read both to really make sure you got it. There's many of those cases, would be good if we could unify all or most of them.
[PATCH v4] gpg-interface.c: detect and reject multiple signatures on commits
GnuPG supports creating signatures consisting of multiple signature
packets. If such a signature is verified, it outputs all the status
messages for each signature separately. However, git currently does not
account for such scenario and gets terribly confused over getting
multiple *SIG statuses.
For example, if a malicious party alters a signed commit and appends
a new untrusted signature, git is going to ignore the original bad
signature and report untrusted commit instead. However, %GK and %GS
format strings may still expand to the data corresponding
to the original signature, potentially tricking the scripts into
trusting the malicious commit.
Given that the use of multiple signatures is quite rare, git does not
support creating them without jumping through a few hoops, and finally
supporting them properly would require extensive API improvement, it
seems reasonable to just reject them at the moment.
Signed-off-by: Michał Górny
---
gpg-interface.c | 90 +++-
t/t7510-signed-commit.sh | 26
2 files changed, 87 insertions(+), 29 deletions(-)
Changes in v4:
* switched to using skip_prefix(),
* renamed the variable to seen_exclusive_status,
* made the loop terminate early on first duplicate status seen.
diff --git a/gpg-interface.c b/gpg-interface.c
index db17d65f8..efe2c0d38 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -75,48 +75,80 @@ void signature_check_clear(struct signature_check *sigc)
FREE_AND_NULL(sigc->key);
}
+/* An exclusive status -- only one of them can appear in output */
+#define GPG_STATUS_EXCLUSIVE (1<<0)
+
static struct {
char result;
const char *check;
+ unsigned int flags;
} sigcheck_gpg_status[] = {
- { 'G', "\n[GNUPG:] GOODSIG " },
- { 'B', "\n[GNUPG:] BADSIG " },
- { 'U', "\n[GNUPG:] TRUST_NEVER" },
- { 'U', "\n[GNUPG:] TRUST_UNDEFINED" },
- { 'E', "\n[GNUPG:] ERRSIG "},
- { 'X', "\n[GNUPG:] EXPSIG "},
- { 'Y', "\n[GNUPG:] EXPKEYSIG "},
- { 'R', "\n[GNUPG:] REVKEYSIG "},
+ { 'G', "GOODSIG ", GPG_STATUS_EXCLUSIVE },
+ { 'B', "BADSIG ", GPG_STATUS_EXCLUSIVE },
+ { 'U', "TRUST_NEVER", 0 },
+ { 'U', "TRUST_UNDEFINED", 0 },
+ { 'E', "ERRSIG ", GPG_STATUS_EXCLUSIVE },
+ { 'X', "EXPSIG ", GPG_STATUS_EXCLUSIVE },
+ { 'Y', "EXPKEYSIG ", GPG_STATUS_EXCLUSIVE },
+ { 'R', "REVKEYSIG ", GPG_STATUS_EXCLUSIVE },
};
static void parse_gpg_output(struct signature_check *sigc)
{
const char *buf = sigc->gpg_status;
+ const char *line, *next;
int i;
-
- /* Iterate over all search strings */
- for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_status); i++) {
- const char *found, *next;
-
- if (!skip_prefix(buf, sigcheck_gpg_status[i].check + 1,
)) {
- found = strstr(buf, sigcheck_gpg_status[i].check);
- if (!found)
- continue;
- found += strlen(sigcheck_gpg_status[i].check);
- }
- sigc->result = sigcheck_gpg_status[i].result;
- /* The trust messages are not followed by key/signer
information */
- if (sigc->result != 'U') {
- next = strchrnul(found, ' ');
- sigc->key = xmemdupz(found, next - found);
- /* The ERRSIG message is not followed by signer
information */
- if (*next && sigc-> result != 'E') {
- found = next + 1;
- next = strchrnul(found, '\n');
- sigc->signer = xmemdupz(found, next - found);
+ int seen_exclusive_status = 0;
+
+ /* Iterate over all lines */
+ for (line = buf; *line; line = strchrnul(line+1, '\n')) {
+ while (*line == '\n')
+ line++;
+ /* Skip lines that don't start with GNUPG status */
+ if (!skip_prefix(line, "[GNUPG:] ", ))
+ continue;
+
+ /* Iterate over all search strings */
+ for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_status); i++) {
+ if (skip_prefix(line, sigcheck_gpg_status[i].check,
)) {
+ if (sigcheck_gpg_status[i].flags &
GPG_STATUS_EXCLUSIVE) {
+ if (++seen_exclusive_status > 1)
+ goto found_duplicate_status;
+ }
+
+ sigc->result = sigcheck_gpg_status[i].result;
+ /* The trust messages are not followed by
key/signer information */
+ if (sigc->result != 'U') {
+ next = strchrnul(line, ' ');
+ free(sigc->key);
+
Re: [PATCH 00/59] Split config.txt
On Sat, Oct 20, 2018 at 9:25 PM Ævar Arnfjörð Bjarmason wrote: > And sometimes like in the case of git-gc(1) we have gc.* config > documented in two places with different prose that needs to be updated > in two places in a CONFIGURATION section. This series allows us to just > unify the two and do an "include" in two places, and more generally have > the convention that a given command that uses configuration could have > that config both documented in git-config(1), and the same docs in its > own manpage. > > Is doing some post-cleanup like that your eventual goal after this > series? I did see the possibility of including command-specific config in individual command man page. But I'm not planning on doing it myself. Some command man page is already pretty long, plus sometimes we rely on the core.* part which should not be included in per-command man page... -- Duy
Re: [PATCH 00/59] Split config.txt
On Sat, Oct 20 2018, Nguyễn Thái Ngọc Duy wrote: > I started this a couple months back, moving a couple big config > sections out of config.txt to make it more manageable. This series > almost completes that. It moves all configs (except http.* which have > changes on 'pu') out of config.txt. config.txt is now about the > syntax, and a list of config sections. http section can be moved out > later. > > I did a doc-diff on this series and the only change is ssh.variant is > moved down a bit to keep it in order, which is intended. > > I thought of grouping all these config files in a separate directory > Documentation/config to avoid cluttering Documentation/ too much but > let's wait and see if people really find Documentation growing too > large first. I had a slight bias against this when you started this, since I'm one of these odd people who don't mind ~20k line files if the line count isn't contributing to inherent complexity, e.g. in the case of config.txt you could just use the search function all in one file. But FWIW I've changed my mind to as strong opinion in favor this series, because an actual annoyance of mine has been how inconsistently we document config variables affecting individual commands. I.e. in some cases we have somecmd.switch=xyz that's also a --switch described in git-somecmd(1), and the --switch docs are more exhaustive, or the other way around. And sometimes like in the case of git-gc(1) we have gc.* config documented in two places with different prose that needs to be updated in two places in a CONFIGURATION section. This series allows us to just unify the two and do an "include" in two places, and more generally have the convention that a given command that uses configuration could have that config both documented in git-config(1), and the same docs in its own manpage. Is doing some post-cleanup like that your eventual goal after this series?
Re: [PATCH] alias: detect loops in mixed execution mode
On Sat, Oct 20 2018, Jeff King wrote:
> On Sat, Oct 20, 2018 at 01:14:28PM +0200, Ævar Arnfjörð Bjarmason wrote:
>
>> > I'd guess this sort of thing is pretty rare. But I wonder if we're
>> > crossing the line of trying to assume too much about what the user's
>> > arbitrary code does.
>> >
>> > A simple depth counter can limit the fork bomb, and with a high enough
>> > depth would be unlikely to trigger a false positive. It could also
>> > protect non-aliases more reasonably, too (e.g., if you have a 1000-deep
>> > git process hierarchy, there's a good chance you've found an infinite
>> > loop in git itself).
>>
>> I don't think this edge case you're describing is very plausible, and I
>> doubt it exists in the wild.
>>
>> But going by my personal incredulity and a git release breaking code in
>> the wild would suck, so agree that I need to re-roll this to anticipate
>> that.
>
> I agree it's probably quite rare, if it exists at all. But I also wonder
> how important looping alias protection is. It's also rare, and the
> outcome is usually "gee, I wonder why this is taking so long? ^C".
>
> At least that's my instinct. I don't remember having run into this at
> all myself (though certainly I have written my fair share of infinite
> loops in other systems, like bash aliases, and that is what happened).
>
>> I don't have time to write it now, but what do you think about a version
>> of this where we introduce a core.recursionLimit setting, and by default
>> set it to "1" (for one recursion), so by default die just as we do now,
>> but with some advice() saying that we've bailed out early because this
>> looks crazy, but you can set it to e.g. "1000" if you think you know
>> what you're doing, or "0" for no limit.
>>
>> The reason I'd like to do that is because I think it's *way* more common
>> to do this accidentally than intentionally, and by having a default
>> limit of 1000 we'd print a really long error message, or alternatively
>> would have to get into the mess of de-duplicating the callstack as we
>> print the error.
>
> Would we print a long error message? I'd assume that we'd just recurse
> for longer and print one error message that says:
>
> fatal: woah, you're 1000-levels deep in Git commands!
>
> That doesn't help the user find the recursion, but re-running with
> GIT_TRACE=1 would make it pretty clear, I'd think.
Yeah the reason I'd like the core.recursionLimit=1 setting by default is
so that we can also print the same pretty and easy to grok error message
we do now for non-! aliases by default without spewing out ~3-4k lines
of mostly duplicate output (with a default limit of 1000).
We didn't support chained aliases at all before, so I think the odds
that people will run into this now will increase as they add "!" to
existing aliases, and I'd like to have git's UI friendly enough to tell
users what went wrong by default, and not have to resort to the likes of
GIT_TRACE=1 which really should be left to powerusers.
>> It also has the advantage that if people in the wild really use this
>> they'll chime in about this new annoying core.recursionLimit=1 setting,
>> at the cost of me having annoyed them all by breaking their working
>> code.
>
> Right, I'm not too happy about that annoyance. But it seems clear that I
> think the loop protection is way less important than you do, so I'm
> willing to sacrifice (or more accurately, risk the possibility of
> sacrificing) a lot less for it. :)
>
> I dunno. I doubt it is likely to help or hinder that many people either
> way.
>
>> >> + cmd_history = strbuf_split_buf(old, strlen(old), ' ', 0);
>> >> + for (ptr = cmd_history; *ptr; ptr++) {
>> >> + strbuf_rtrim(*ptr);
>> >> + string_list_append(cmd_list, (*ptr)->buf);
>> >> + }
>> >> + strbuf_list_free(cmd_history);
>> >
>> > Maybe string_list_split() would be a little simpler?
>>
>> Yeah looks like it. I cargo-culted this from elsewhere without looking
>> at that API. I'll look into it.
>
> I cheated before writing that and confirmed that it does seem to work. ;)
>
> Here's the patch in case it is useful. IMHO we should be trying to get
> rid of strbuf_split, because it's a pretty crappy interface.
>
> diff --git a/git.c b/git.c
> index cba242836c..9d1b66a1fa 100644
> --- a/git.c
> +++ b/git.c
> @@ -675,7 +675,6 @@ static void execv_dashed_external(const char **argv)
> static void init_cmd_history(struct strbuf *env, struct string_list
> *cmd_list)
> {
> const char *old = getenv(COMMAND_HISTORY_ENVIRONMENT);
> - struct strbuf **cmd_history, **ptr;
>
> if (!old || !*old)
> return;
> @@ -683,12 +682,7 @@ static void init_cmd_history(struct strbuf *env, struct
> string_list *cmd_list)
> strbuf_addstr(env, old);
> strbuf_rtrim(env);
>
> - cmd_history = strbuf_split_buf(old, strlen(old), ' ', 0);
> - for (ptr = cmd_history; *ptr; ptr++) {
> - strbuf_rtrim(*ptr);
> - string_list_append(cmd_list, (*ptr)->buf);
Re: [PATCH] alias: detect loops in mixed execution mode
On Sat, Oct 20, 2018 at 01:14:28PM +0200, Ævar Arnfjörð Bjarmason wrote:
> > I'd guess this sort of thing is pretty rare. But I wonder if we're
> > crossing the line of trying to assume too much about what the user's
> > arbitrary code does.
> >
> > A simple depth counter can limit the fork bomb, and with a high enough
> > depth would be unlikely to trigger a false positive. It could also
> > protect non-aliases more reasonably, too (e.g., if you have a 1000-deep
> > git process hierarchy, there's a good chance you've found an infinite
> > loop in git itself).
>
> I don't think this edge case you're describing is very plausible, and I
> doubt it exists in the wild.
>
> But going by my personal incredulity and a git release breaking code in
> the wild would suck, so agree that I need to re-roll this to anticipate
> that.
I agree it's probably quite rare, if it exists at all. But I also wonder
how important looping alias protection is. It's also rare, and the
outcome is usually "gee, I wonder why this is taking so long? ^C".
At least that's my instinct. I don't remember having run into this at
all myself (though certainly I have written my fair share of infinite
loops in other systems, like bash aliases, and that is what happened).
> I don't have time to write it now, but what do you think about a version
> of this where we introduce a core.recursionLimit setting, and by default
> set it to "1" (for one recursion), so by default die just as we do now,
> but with some advice() saying that we've bailed out early because this
> looks crazy, but you can set it to e.g. "1000" if you think you know
> what you're doing, or "0" for no limit.
>
> The reason I'd like to do that is because I think it's *way* more common
> to do this accidentally than intentionally, and by having a default
> limit of 1000 we'd print a really long error message, or alternatively
> would have to get into the mess of de-duplicating the callstack as we
> print the error.
Would we print a long error message? I'd assume that we'd just recurse
for longer and print one error message that says:
fatal: woah, you're 1000-levels deep in Git commands!
That doesn't help the user find the recursion, but re-running with
GIT_TRACE=1 would make it pretty clear, I'd think.
> It also has the advantage that if people in the wild really use this
> they'll chime in about this new annoying core.recursionLimit=1 setting,
> at the cost of me having annoyed them all by breaking their working
> code.
Right, I'm not too happy about that annoyance. But it seems clear that I
think the loop protection is way less important than you do, so I'm
willing to sacrifice (or more accurately, risk the possibility of
sacrificing) a lot less for it. :)
I dunno. I doubt it is likely to help or hinder that many people either
way.
> >> + cmd_history = strbuf_split_buf(old, strlen(old), ' ', 0);
> >> + for (ptr = cmd_history; *ptr; ptr++) {
> >> + strbuf_rtrim(*ptr);
> >> + string_list_append(cmd_list, (*ptr)->buf);
> >> + }
> >> + strbuf_list_free(cmd_history);
> >
> > Maybe string_list_split() would be a little simpler?
>
> Yeah looks like it. I cargo-culted this from elsewhere without looking
> at that API. I'll look into it.
I cheated before writing that and confirmed that it does seem to work. ;)
Here's the patch in case it is useful. IMHO we should be trying to get
rid of strbuf_split, because it's a pretty crappy interface.
diff --git a/git.c b/git.c
index cba242836c..9d1b66a1fa 100644
--- a/git.c
+++ b/git.c
@@ -675,7 +675,6 @@ static void execv_dashed_external(const char **argv)
static void init_cmd_history(struct strbuf *env, struct string_list *cmd_list)
{
const char *old = getenv(COMMAND_HISTORY_ENVIRONMENT);
- struct strbuf **cmd_history, **ptr;
if (!old || !*old)
return;
@@ -683,12 +682,7 @@ static void init_cmd_history(struct strbuf *env, struct
string_list *cmd_list)
strbuf_addstr(env, old);
strbuf_rtrim(env);
- cmd_history = strbuf_split_buf(old, strlen(old), ' ', 0);
- for (ptr = cmd_history; *ptr; ptr++) {
- strbuf_rtrim(*ptr);
- string_list_append(cmd_list, (*ptr)->buf);
- }
- strbuf_list_free(cmd_history);
+ string_list_split(cmd_list, env->buf, ' ', -1);
}
static void add_cmd_history(struct strbuf *env, struct string_list *cmd_list,
-Peff
Re: [PATCH] builtin/receive-pack: dead initializer for retval in check_nonce
On Sat, Oct 20, 2018 at 12:08:59AM -0700, Carlo Marcelo Arenas Belón wrote:
> NONCE_BAD is explicitly set when needed with the fallback
> instead as NONCE_SLOP
>
> Signed-off-by: Carlo Marcelo Arenas Belón
> ---
> builtin/receive-pack.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
> index 95740f4f0e..ecce3d4043 100644
> --- a/builtin/receive-pack.c
> +++ b/builtin/receive-pack.c
> @@ -507,7 +507,7 @@ static const char *check_nonce(const char *buf, size_t
> len)
> char *nonce = find_header(buf, len, "nonce", NULL);
> timestamp_t stamp, ostamp;
> char *bohmac, *expect = NULL;
> - const char *retval = NONCE_BAD;
> + const char *retval;
>
> if (!nonce) {
> retval = NONCE_MISSING;
Thanks for the patch.
The motivation feels a little bit weak, at least to me.
Initializing a variable to "BAD" in the beginning can be a good thing
for two reasons:
- There is a complex if-elseif chain, which should set retval
in any case, this is at least what I expect taking a very quick look at the
code:
const char *retval = NONCE_BAD;
if (!nonce) {
retval = NONCE_MISSING;
goto leave;
} else if (!push_cert_nonce) {
retval = NONCE_UNSOLICITED;
goto leave;
} else if (!strcmp(push_cert_nonce, nonce)) {
retval = NONCE_OK;
goto leave;
}
# And here I started to wonder if we should have an else or not.
# Having retval NONCE_BAD set to NONCE:BAD in the beginning makes
# it clear, that we are save without the else.
# As an alternative, we could have coded like this:
const char *retval;
if (!nonce) {
retval = NONCE_MISSING;
goto leave;
} else if (!push_cert_nonce) {
retval = NONCE_UNSOLICITED;
goto leave;
} else if (!strcmp(push_cert_nonce, nonce)) {
retval = NONCE_OK;
goto leave;
} else {
/* Set to BAD, until we know better further down */
retval = NONCE_BAD;
}
# The second reason is that some compilers don't understand this complex
# stuff either, and through out a warning, like
# "retval may be uninitialized" or something in that style.
# This is very compiler dependent.
So yes, the current code may seem to be over-eager and ask for optimization,
but we don't gain more that a couple of nano-seconds or so.
The good thing is that we have the code a little bit more robust, when changes
are done
in the future.
Re: [PATCH] read-cache: use of memory after it is freed
On Sat, Oct 20, 2018 at 9:33 AM Carlo Marcelo Arenas Belón
wrote:
>
> introduced with c46c406ae1e (trace.h: support nested performance tracing)
> on Aug 18, 2018 but not affecting maint
>
> Signed-off-by: Carlo Marcelo Arenas Belón
> ---
> read-cache.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/read-cache.c b/read-cache.c
> index 1df5c16dbc..78f47d2f50 100644
> --- a/read-cache.c
> +++ b/read-cache.c
> @@ -2297,8 +2297,8 @@ int read_index_from(struct index_state *istate, const
> char *path,
> freshen_shared_index(base_path, 0);
> merge_base_index(istate);
> post_read_index_from(istate);
> - free(base_path);
> trace_performance_leave("read cache %s", base_path);
> + free(base_path);
Oops. Ack.
> return ret;
> }
>
> --
> 2.19.1
>
--
Duy
Re: What's cooking in git.git (Oct 2018, #04; Fri, 19)
Le 19/10/2018 à 20:05, Alban Gruin a écrit :
> Le 19/10/2018 à 14:46, SZEDER Gábor a écrit :
>> On Fri, Oct 19, 2018 at 03:02:22PM +0900, Junio C Hamano wrote:
>>> Two large set of topics on "rebase in C" and "rebase -i in C" are
>>> now in 'next'.
>>
>> I see occasional failures in 't5520-pull.sh':
>>
>> […]
>>
>> When running t5520 in a loop, it tends to fail between 10-40
>> iterations, even when the machine is not under heavy load.
>>
>> It appears that these failures started with commit 5541bd5b8f (rebase:
>> default to using the builtin rebase, 2018-08-08), i.e. tip of
>> 'pk/rebase-in-c-6-final', but it's a "flip the big switch" commit, so
>> not very useful...
>>
The bug can be bisected by prepending the command chain of 5520.25 with
`git config --bool rebase.usebuiltin true &&`. Commit 7debdaa4ad
(“builtin rebase: support `--autostash` option”) is the culprit, but
some commits that cause this test to fail with a different error (ie.
“TODO”…) must be marked as good.
The error comes from the call to `git stash apply $stash_id' in
builtin/rebase.c:261. When $stash_id only contains decimals and no
letters, git-stash tries to apply stash@{$stash_id}[0][1]. Thas was not
a real problem with the shell script, because it did not abbreviate the
object id of the stashed commit, so it was very unlikely that the oid
would contain only digits. builtin/rebase.c shortens the oid[2], making
this problem more likely to occur.
We could add a switch to git-stash to tell it that the parameter is an
oid, not anything else.
[0] https://github.com/git/git/blob/master/git-stash.sh#L514-L520
[1] https://github.com/git/git/blob/pu/builtin/stash.c#L167-L168
[2] https://github.com/git/git/blob/next/builtin/rebase.c#L1373
Cheers,
Alban
[PATCH 54/59] config.txt: move uploadpack.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 66 + Documentation/uploadpack-config.txt | 65 2 files changed, 66 insertions(+), 65 deletions(-) create mode 100644 Documentation/uploadpack-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index fef310d47d..f2c3c12ded 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -674,71 +674,7 @@ include::transfer-config.txt[] include::uploadarchive-config.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::uploadpack-config.txt[] url..insteadOf:: Any URL that starts with this value will be rewritten to diff --git a/Documentation/uploadpack-config.txt b/Documentation/uploadpack-config.txt new file mode 100644 index 00..ed1c835695 --- /dev/null +++ b/Documentation/uploadpack-config.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
[PATCH 57/59] config.txt: move versionsort.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 34 +--- Documentation/versionsort-config.txt | 33 +++ 2 files changed, 34 insertions(+), 33 deletions(-) create mode 100644 Documentation/versionsort-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 3ccf88ea4c..05fb670be2 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -680,39 +680,7 @@ include::url-config.txt[] include::user-config.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::versionsort-config.txt[] web.browser:: Specify a web browser that may be used by some commands. diff --git a/Documentation/versionsort-config.txt b/Documentation/versionsort-config.txt new file mode 100644 index 00..6c7cc054fa --- /dev/null +++ b/Documentation/versionsort-config.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 58/59] config.txt: move web.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 5 + Documentation/web-config.txt | 4 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 Documentation/web-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 05fb670be2..76a0e3ed90 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -682,10 +682,7 @@ include::user-config.txt[] include::versionsort-config.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::web-config.txt[] worktree.guessRemote:: With `add`, if no branch argument, and neither of `-b` nor diff --git a/Documentation/web-config.txt b/Documentation/web-config.txt new file mode 100644 index 00..beec8d1303 --- /dev/null +++ b/Documentation/web-config.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 53/59] config.txt: move uploadarchive.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 7 +-- Documentation/uploadarchive-config.txt | 6 ++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 Documentation/uploadarchive-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index b70f98baba..fef310d47d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -672,12 +672,7 @@ include::tag-config.txt[] include::transfer-config.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::uploadarchive-config.txt[] uploadpack.hideRefs:: This variable is the same as `transfer.hideRefs`, but applies diff --git a/Documentation/uploadarchive-config.txt b/Documentation/uploadarchive-config.txt new file mode 100644 index 00..e0698e8c1d --- /dev/null +++ b/Documentation/uploadarchive-config.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 55/59] config.txt: move url.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 31 +-- Documentation/url-config.txt | 30 ++ 2 files changed, 31 insertions(+), 30 deletions(-) create mode 100644 Documentation/url-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index f2c3c12ded..9f38178220 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -676,36 +676,7 @@ include::uploadarchive-config.txt[] include::uploadpack-config.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::url-config.txt[] user.email:: Your email address to be recorded in any newly created commits. diff --git a/Documentation/url-config.txt b/Documentation/url-config.txt new file mode 100644 index 00..e5566c371d --- /dev/null +++ b/Documentation/url-config.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 36/59] config.txt: move man.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 13 + Documentation/man-config.txt | 12 2 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 Documentation/man-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index c057a290a4..7c113f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -620,18 +620,7 @@ include::mailinfo-config.txt[] include::mailmap-config.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::man-config.txt[] include::merge-config.txt[] diff --git a/Documentation/man-config.txt b/Documentation/man-config.txt new file mode 100644 index 00..a727d987a8 --- /dev/null +++ b/Documentation/man-config.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 33/59] config.txt: move log.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 44 +--- Documentation/log-config.txt | 43 +++ 2 files changed, 44 insertions(+), 43 deletions(-) create mode 100644 Documentation/log-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 03d91ef5b9..8d9423beca 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -614,49 +614,7 @@ include::instaweb-config.txt[] include::interactive-config.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::log-config.txt[] mailinfo.scissors:: If true, makes linkgit:git-mailinfo[1] (and therefore diff --git a/Documentation/log-config.txt b/Documentation/log-config.txt new file mode 100644 index 00..78d9e4453a --- /dev/null +++ b/Documentation/log-config.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 56/59] config.txt: move user.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 27 +-- Documentation/user-config.txt | 26 ++ 2 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 Documentation/user-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 9f38178220..3ccf88ea4c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -678,32 +678,7 @@ include::uploadpack-config.txt[] include::url-config.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::user-config.txt[] versionsort.prereleaseSuffix (deprecated):: Deprecated alias for `versionsort.suffix`. Ignored if diff --git a/Documentation/user-config.txt b/Documentation/user-config.txt new file mode 100644 index 00..b5b2ba1199 --- /dev/null +++ b/Documentation/user-config.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 34/59] config.txt: move mailinfo.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 7 +-- Documentation/mailinfo-config.txt | 6 ++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 Documentation/mailinfo-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 8d9423beca..ca178e2651 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -616,12 +616,7 @@ include::interactive-config.txt[] include::log-config.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::mailinfo-config.txt[] mailmap.file:: The location of an augmenting mailmap file. The default diff --git a/Documentation/mailinfo-config.txt b/Documentation/mailinfo-config.txt new file mode 100644 index 00..3854d4ae37 --- /dev/null +++ b/Documentation/mailinfo-config.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 48/59] config.txt: move showBranch.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 4 +--- Documentation/showbranch-config.txt | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Documentation/showbranch-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index e5454df2f8..6136c5638c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -656,9 +656,7 @@ include::sendemail-config.txt[] include::sequencer-config.txt[] -showBranch.default:: - The default set of branches for linkgit:git-show-branch[1]. - See linkgit:git-show-branch[1]. +include::showbranch-config.txt[] splitIndex.maxPercentChange:: When the split index feature is used, this specifies the diff --git a/Documentation/showbranch-config.txt b/Documentation/showbranch-config.txt new file mode 100644 index 00..e79ecd9ee9 --- /dev/null +++ b/Documentation/showbranch-config.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 35/59] config.txt: move mailmap.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 16 +--- Documentation/mailmap-config.txt | 15 +++ 2 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 Documentation/mailmap-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index ca178e2651..c057a290a4 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -618,21 +618,7 @@ include::log-config.txt[] include::mailinfo-config.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::mailmap-config.txt[] man.viewer:: Specify the programs that may be used to display help in the diff --git a/Documentation/mailmap-config.txt b/Documentation/mailmap-config.txt new file mode 100644 index 00..48cbc30722 --- /dev/null +++ b/Documentation/mailmap-config.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 49/59] config.txt: move splitIndex.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 25 + Documentation/splitindex-config.txt | 24 2 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 Documentation/splitindex-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 6136c5638c..2330acd840 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -658,30 +658,7 @@ include::sequencer-config.txt[] include::showbranch-config.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::splitindex-config.txt[] include::ssh-config.txt[] diff --git a/Documentation/splitindex-config.txt b/Documentation/splitindex-config.txt new file mode 100644 index 00..afdb186df8 --- /dev/null +++ b/Documentation/splitindex-config.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 44/59] config.txt: move remotes.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 4 +--- Documentation/remotes-config.txt | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Documentation/remotes-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 71844cf8e3..ec8b61e1ba 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -646,9 +646,7 @@ include::receive-config.txt[] include::remote-config.txt[] -remotes.:: - The list of remotes which are fetched by "git remote update - ". See linkgit:git-remote[1]. +include::remotes-config.txt[] repack.useDeltaBaseOffset:: By default, linkgit:git-repack[1] creates packs that use diff --git a/Documentation/remotes-config.txt b/Documentation/remotes-config.txt new file mode 100644 index 00..4cfe03221e --- /dev/null +++ b/Documentation/remotes-config.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 50/59] config.txt: move status.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 73 + Documentation/status-config.txt | 72 2 files changed, 73 insertions(+), 72 deletions(-) create mode 100644 Documentation/status-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 2330acd840..b7df6a8311 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -662,78 +662,7 @@ include::splitindex-config.txt[] include::ssh-config.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::status-config.txt[] stash.showPatch:: If this is set to true, the `git stash show` command without an diff --git a/Documentation/status-config.txt b/Documentation/status-config.txt new file mode 100644 index 00..ed72fa7dae --- /dev/null +++ b/Documentation/status-config.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 47/59] config.txt: move sequencer.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 6 +- Documentation/sequencer-config.txt | 5 + 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 Documentation/sequencer-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index f42b69f3b0..e5454df2f8 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -654,11 +654,7 @@ include::rerere-config.txt[] include::sendemail-config.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::sequencer-config.txt[] showBranch.default:: The default set of branches for linkgit:git-show-branch[1]. diff --git a/Documentation/sequencer-config.txt b/Documentation/sequencer-config.txt new file mode 100644 index 00..b48d532a96 --- /dev/null +++ b/Documentation/sequencer-config.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 59/59] config.txt: move worktree.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 10 +- Documentation/worktree-config.txt | 9 + 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 Documentation/worktree-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 76a0e3ed90..9e2a2e0f90 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -684,12 +684,4 @@ include::versionsort-config.txt[] include::web-config.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::worktree-config.txt[] diff --git a/Documentation/worktree-config.txt b/Documentation/worktree-config.txt new file mode 100644 index 00..b853798fc2 --- /dev/null +++ b/Documentation/worktree-config.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 51/59] config.txt: move tag.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 27 ++- Documentation/stash-config.txt | 9 + Documentation/tag-config.txt | 16 3 files changed, 27 insertions(+), 25 deletions(-) create mode 100644 Documentation/stash-config.txt create mode 100644 Documentation/tag-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index b7df6a8311..4b1efe0a95 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -664,34 +664,11 @@ include::ssh-config.txt[] include::status-config.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::stash-config.txt[] include::submodule-config.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::tag-config.txt[] transfer.fsckObjects:: When `fetch.fsckObjects` or `receive.fsckObjects` are diff --git a/Documentation/stash-config.txt b/Documentation/stash-config.txt new file mode 100644 index 00..c583d46d6b --- /dev/null +++ b/Documentation/stash-config.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]. diff --git a/Documentation/tag-config.txt b/Documentation/tag-config.txt new file mode 100644 index 00..663663bdec --- /dev/null +++ b/Documentation/tag-config.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 26/59] config.txt: move help.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 24 +--- Documentation/help-config.txt | 23 +++ 2 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 Documentation/help-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 93ec85ab6e..bb49f4c894 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -347,29 +347,7 @@ include::gui-config.txt[] include::guitool-config.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::help-config.txt[] http.proxy:: Override the HTTP proxy, normally configured using the 'http_proxy', diff --git a/Documentation/help-config.txt b/Documentation/help-config.txt new file mode 100644 index 00..224bbf5a28 --- /dev/null +++ b/Documentation/help-config.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
[PATCH 32/59] config.txt: move interactive.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 17 + Documentation/interactive-config.txt | 16 2 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 Documentation/interactive-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 2d60aead5d..03d91ef5b9 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -612,22 +612,7 @@ include::init-config.txt[] include::instaweb-config.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::interactive-config.txt[] log.abbrevCommit:: If true, makes linkgit:git-log[1], linkgit:git-show[1], and diff --git a/Documentation/interactive-config.txt b/Documentation/interactive-config.txt new file mode 100644 index 00..ad846dd7c9 --- /dev/null +++ b/Documentation/interactive-config.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 42/59] config.txt: move protocol.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 65 +-- Documentation/protocol-config.txt | 64 ++ 2 files changed, 65 insertions(+), 64 deletions(-) create mode 100644 Documentation/protocol-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 364e5fdbf1..f57b494041 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -634,70 +634,7 @@ include::pager-config.txt[] include::pretty-config.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::protocol-config.txt[] include::pull-config.txt[] diff --git a/Documentation/protocol-config.txt b/Documentation/protocol-config.txt new file mode 100644 index 00..bfccc07491 --- /dev/null +++ b/Documentation/protocol-config.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 23/59] config.txt: move grep.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 25 + Documentation/grep-config.txt | 24 2 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 Documentation/grep-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 6898c9f567..3065520a7f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -339,30 +339,7 @@ include::gitcvs-config.txt[] include::gitweb-config.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::grep-config.txt[] gpg.program:: Use this custom program instead of "`gpg`" found on `$PATH` when diff --git a/Documentation/grep-config.txt b/Documentation/grep-config.txt new file mode 100644 index 00..44abe45a7c --- /dev/null +++ b/Documentation/grep-config.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 43/59] config.txt: move remote.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 79 + Documentation/remote-config.txt | 78 2 files changed, 79 insertions(+), 78 deletions(-) create mode 100644 Documentation/remote-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index f57b494041..71844cf8e3 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -644,84 +644,7 @@ include::rebase-config.txt[] include::receive-config.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::remote-config.txt[] remotes.:: The list of remotes which are fetched by "git remote update diff --git a/Documentation/remote-config.txt b/Documentation/remote-config.txt new file mode 100644 index 00..6c4cad83a2 --- /dev/null +++ b/Documentation/remote-config.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
[PATCH 39/59] config.txt: move pack.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 121 +- Documentation/pack-config.txt | 120 + 2 files changed, 121 insertions(+), 120 deletions(-) create mode 100644 Documentation/pack-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index d1de7ccc89..45b184b247 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -628,126 +628,7 @@ include::mergetool-config.txt[] include::notes-config.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,
[PATCH 27/59] config.txt: move ssh.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 38 ++-- Documentation/ssh-config.txt | 35 + 2 files changed, 37 insertions(+), 36 deletions(-) create mode 100644 Documentation/ssh-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index bb49f4c894..da97097805 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -600,42 +600,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 @@ -1274,6 +1238,8 @@ splitIndex.sharedIndexExpire:: either created based on it or read from it. See linkgit:git-update-index[1]. +include::ssh-config.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/ssh-config.txt b/Documentation/ssh-config.txt new file mode 100644 index 00..2ca4bf93e1 --- /dev/null +++ b/Documentation/ssh-config.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 46/59] config.txt: move rerere.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 13 + Documentation/rerere-config.txt | 12 2 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 Documentation/rerere-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index c3618b00a4..f42b69f3b0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -650,18 +650,7 @@ include::remotes-config.txt[] include::repack-config.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::rerere-config.txt[] include::sendemail-config.txt[] diff --git a/Documentation/rerere-config.txt b/Documentation/rerere-config.txt new file mode 100644 index 00..40abdf6a6b --- /dev/null +++ b/Documentation/rerere-config.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 31/59] config.txt: move instaweb.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 21 + Documentation/instaweb-config.txt | 20 2 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 Documentation/instaweb-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index c91dc2ceef..2d60aead5d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -610,26 +610,7 @@ include::index-config.txt[] include::init-config.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::instaweb-config.txt[] interactive.singleKey:: In interactive commands, allow the user to provide one-letter diff --git a/Documentation/instaweb-config.txt b/Documentation/instaweb-config.txt new file mode 100644 index 00..50cb2f7d62 --- /dev/null +++ b/Documentation/instaweb-config.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 07/59] config.txt: move blame.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/blame-config.txt | 21 + Documentation/config.txt | 22 +- 2 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 Documentation/blame-config.txt diff --git a/Documentation/blame-config.txt b/Documentation/blame-config.txt new file mode 100644 index 00..67b5c1d1e0 --- /dev/null +++ b/Documentation/blame-config.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. diff --git a/Documentation/config.txt b/Documentation/config.txt index db259129b0..910dcf1c25 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -299,27 +299,7 @@ include::am-config.txt[] include::apply-config.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::blame-config.txt[] branch.autoSetupMerge:: Tells 'git branch' and 'git checkout' to set up new branches -- 2.19.1.647.g708186aaf9
[PATCH 25/59] config.txt: move guitool.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 51 +--- Documentation/guitool-config.txt | 50 +++ 2 files changed, 51 insertions(+), 50 deletions(-) create mode 100644 Documentation/guitool-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index adab71fd94..93ec85ab6e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -345,56 +345,7 @@ include::gpg-config.txt[] include::gui-config.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::guitool-config.txt[] help.browser:: Specify the browser that will be used to display help in the diff --git a/Documentation/guitool-config.txt b/Documentation/guitool-config.txt new file mode 100644 index 00..43fb9466ff --- /dev/null +++ b/Documentation/guitool-config.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
[PATCH 40/59] config.txt: move pager.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 9 + Documentation/pager-config.txt | 8 2 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 Documentation/pager-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 45b184b247..656ae3158c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -630,14 +630,7 @@ include::notes-config.txt[] include::pack-config.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::pager-config.txt[] pretty.:: Alias for a --pretty= format string, as specified in diff --git a/Documentation/pager-config.txt b/Documentation/pager-config.txt new file mode 100644 index 00..d3731cf66c --- /dev/null +++ b/Documentation/pager-config.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 41/59] config.txt: move pretty.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 10 +- Documentation/pretty-config.txt | 9 + 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 Documentation/pretty-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 656ae3158c..364e5fdbf1 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -632,15 +632,7 @@ include::pack-config.txt[] include::pager-config.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::pretty-config.txt[] protocol.allow:: If set, provide a user defined default policy for all protocols which diff --git a/Documentation/pretty-config.txt b/Documentation/pretty-config.txt new file mode 100644 index 00..063c6b63d9 --- /dev/null +++ b/Documentation/pretty-config.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 38/59] config.txt: move notes.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 60 +- Documentation/notes-config.txt | 59 + 2 files changed, 60 insertions(+), 59 deletions(-) create mode 100644 Documentation/notes-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 9acc42e3c2..d1de7ccc89 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -626,65 +626,7 @@ include::merge-config.txt[] include::mergetool-config.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::notes-config.txt[] pack.window:: The size of the window used by linkgit:git-pack-objects[1] when no diff --git a/Documentation/notes-config.txt b/Documentation/notes-config.txt new file mode 100644 index 00..aeef56d49a --- /dev/null +++ b/Documentation/notes-config.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`)
[PATCH 45/59] config.txt: move repack.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 28 +--- Documentation/repack-config.txt | 27 +++ 2 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 Documentation/repack-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index ec8b61e1ba..c3618b00a4 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -648,33 +648,7 @@ include::remote-config.txt[] include::remotes-config.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::repack-config.txt[] rerere.autoUpdate:: When set to true, `git-rerere` updates the index with the diff --git a/Documentation/repack-config.txt b/Documentation/repack-config.txt new file mode 100644 index 00..a5c37813fd --- /dev/null +++ b/Documentation/repack-config.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 37/59] config.txt: move mergetool.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 54 +- Documentation/mergetool-config.txt | 53 + 2 files changed, 54 insertions(+), 53 deletions(-) create mode 100644 Documentation/mergetool-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 7c113f..9acc42e3c2 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -624,59 +624,7 @@ include::man-config.txt[] include::merge-config.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::mergetool-config.txt[] notes.mergeStrategy:: Which merge strategy to choose by default when resolving notes diff --git a/Documentation/mergetool-config.txt b/Documentation/mergetool-config.txt new file mode 100644 index 00..09ed31dbfa --- /dev/null +++ b/Documentation/mergetool-config.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 24/59] config.txt: move gpg.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 21 + Documentation/gpg-config.txt | 20 2 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 Documentation/gpg-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 3065520a7f..adab71fd94 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -341,26 +341,7 @@ include::gitweb-config.txt[] include::grep-config.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::gpg-config.txt[] include::gui-config.txt[] diff --git a/Documentation/gpg-config.txt b/Documentation/gpg-config.txt new file mode 100644 index 00..590fe0d4ba --- /dev/null +++ b/Documentation/gpg-config.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 52/59] config.txt: move transfer.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 72 +-- Documentation/transfer-config.txt | 71 ++ 2 files changed, 72 insertions(+), 71 deletions(-) create mode 100644 Documentation/transfer-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 4b1efe0a95..b70f98baba 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -670,77 +670,7 @@ include::submodule-config.txt[] include::tag-config.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::transfer-config.txt[] uploadarchive.allowUnreachable:: If true, allow clients to use `git archive --remote` to request diff --git a/Documentation/transfer-config.txt b/Documentation/transfer-config.txt new file mode 100644 index 00..4a5dfe2fc1 --- /dev/null +++ b/Documentation/transfer-config.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
[PATCH 02/59] config.txt: move core.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 595 +- Documentation/core-config.txt | 594 + 2 files changed, 595 insertions(+), 594 deletions(-) create mode 100644 Documentation/core-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index a0b0ef582f..27c2a211c0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -289,600 +289,7 @@ other popular tools, and describe them in your documentation. include::advice-config.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
[PATCH 00/59] Split config.txt
I started this a couple months back, moving a couple big config sections out of config.txt to make it more manageable. This series almost completes that. It moves all configs (except http.* which have changes on 'pu') out of config.txt. config.txt is now about the syntax, and a list of config sections. http section can be moved out later. I did a doc-diff on this series and the only change is ssh.variant is moved down a bit to keep it in order, which is intended. I thought of grouping all these config files in a separate directory Documentation/config to avoid cluttering Documentation/ too much but let's wait and see if people really find Documentation growing too large first. Nguyễn Thái Ngọc Duy (59): 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 difftool.* to a separate file config.txt: move fastimport.* to a separate file config.txt: move filter.* to a separate file config.txt: move fsck.* to a separate file config.txt: move gc.* to a separate file 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 guitool.* to a separate file config.txt: move help.* to a separate file config.txt: move ssh.* to a separate file config.txt: move i18n.* to a separate file config.txt: move i18n.* 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 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 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 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 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 Documentation/add-config.txt |7 + Documentation/advice-config.txt| 82 + Documentation/alias-config.txt | 18 + Documentation/am-config.txt| 14 + Documentation/apply-config.txt | 11 + Documentation/blame-config.txt | 21 + Documentation/branch-config.txt| 102 + Documentation/browser-config.txt |9 + Documentation/checkout-config.txt | 23 + Documentation/clean-config.txt |3 + Documentation/color-config.txt | 201 ++ Documentation/column-config.txt| 55 + Documentation/commit-config.txt| 29 + Documentation/completion-config.txt|7 + Documentation/config.txt | 2640 +--- Documentation/core-config.txt | 594 ++ Documentation/credential-config.txt| 26 + Documentation/difftool-config.txt | 14 + Documentation/fastimport-config.txt|8 + Documentation/filter-config.txt|9 + Documentation/fsck-config.txt | 67 + Documentation/gc-config.txt| 108 + Documentation/gitweb-config.txt| 16 + Documentation/gpg-config.txt | 20 + Documentation/grep-config.txt | 24 + Documentation/guitool-config.txt | 50 + Documentation/help-config.txt | 23 + Documentation/i18n-config.txt | 10 + Documentation/index-config.txt | 10 + Documentation/init-config.txt |3 +
[PATCH 30/59] config.txt: move init.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 4 +--- Documentation/init-config.txt | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Documentation/init-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 5ba7975837..c91dc2ceef 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -608,9 +608,7 @@ imap:: include::index-config.txt[] -init.templateDir:: - Specify the directory from which templates will be copied. - (See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].) +include::init-config.txt[] instaweb.browser:: Specify the program that will be used to browse your working diff --git a/Documentation/init-config.txt b/Documentation/init-config.txt new file mode 100644 index 00..46fa8c6a08 --- /dev/null +++ b/Documentation/init-config.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 08/59] config.txt: move branch.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/branch-config.txt | 102 +++ Documentation/config.txt| 103 +--- 2 files changed, 103 insertions(+), 102 deletions(-) create mode 100644 Documentation/branch-config.txt diff --git a/Documentation/branch-config.txt b/Documentation/branch-config.txt new file mode 100644 index 00..019d60ede2 --- /dev/null +++ b/Documentation/branch-config.txt @@ -0,0 +1,102 @@ +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 local merge commits are included in the rebase
[PATCH 12/59] config.txt: move color.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/color-config.txt | 201
Documentation/config.txt | 202 +
2 files changed, 202 insertions(+), 201 deletions(-)
create mode 100644 Documentation/color-config.txt
diff --git a/Documentation/color-config.txt b/Documentation/color-config.txt
new file mode 100644
index 00..8375596c44
--- /dev/null
+++ b/Documentation/color-config.txt
@@ -0,0 +1,201 @@
+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`;;
+ filename prefix (when not using `-h`)
[PATCH 29/59] config.txt: move i18n.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 11 +-- Documentation/index-config.txt | 10 ++ 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 Documentation/index-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index ec0f4e2161..5ba7975837 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -606,16 +606,7 @@ imap:: The configuration variables in the 'imap' section are described in linkgit:git-imap-send[1]. -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::index-config.txt[] init.templateDir:: Specify the directory from which templates will be copied. diff --git a/Documentation/index-config.txt b/Documentation/index-config.txt new file mode 100644 index 00..4b94b6bedc --- /dev/null +++ b/Documentation/index-config.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 21/59] config.txt: move gc.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 109 +--- Documentation/gc-config.txt | 108 +++ 2 files changed, 109 insertions(+), 108 deletions(-) create mode 100644 Documentation/gc-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index fa26cb1090..ebef3c867a 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -333,114 +333,7 @@ include::filter-config.txt[] include::fsck-config.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
[PATCH 14/59] config.txt: move commit.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/commit-config.txt | 29 + Documentation/config.txt| 30 +- 2 files changed, 30 insertions(+), 29 deletions(-) create mode 100644 Documentation/commit-config.txt diff --git a/Documentation/commit-config.txt b/Documentation/commit-config.txt new file mode 100644 index 00..2c95573930 --- /dev/null +++ b/Documentation/commit-config.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]. diff --git a/Documentation/config.txt b/Documentation/config.txt index 48ce01f596..59cae6a895 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -313,35 +313,7 @@ include::color-config.txt[] include::column-config.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::commit-config.txt[] credential.helper:: Specify an external helper to be called when a username or -- 2.19.1.647.g708186aaf9
[PATCH 15/59] config.txt: move credential.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 27 +-- Documentation/credential-config.txt | 26 ++ 2 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 Documentation/credential-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 59cae6a895..36a8d120be 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -315,32 +315,7 @@ include::column-config.txt[] include::commit-config.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::credential-config.txt[] completion.commands:: This is only used by git-completion.bash to add or remove diff --git a/Documentation/credential-config.txt b/Documentation/credential-config.txt new file mode 100644 index 00..60fb3189e1 --- /dev/null +++ b/Documentation/credential-config.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 06/59] config.txt: move apply.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/apply-config.txt | 11 +++ Documentation/config.txt | 12 +--- 2 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 Documentation/apply-config.txt diff --git a/Documentation/apply-config.txt b/Documentation/apply-config.txt new file mode 100644 index 00..8fb8ef763d --- /dev/null +++ b/Documentation/apply-config.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]. diff --git a/Documentation/config.txt b/Documentation/config.txt index 29dd694438..db259129b0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -297,17 +297,7 @@ include::alias-config.txt[] include::am-config.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::apply-config.txt[] blame.blankBoundary:: Show blank commit object name for boundary commits in -- 2.19.1.647.g708186aaf9
[PATCH 22/59] config.txt: move gitweb.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 17 + Documentation/gitweb-config.txt | 16 2 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 Documentation/gitweb-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index ebef3c867a..6898c9f567 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -337,22 +337,7 @@ include::gc-config.txt[] include::gitcvs-config.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::gitweb-config.txt[] grep.lineNumber:: If set to true, enable `-n` option by default. diff --git a/Documentation/gitweb-config.txt b/Documentation/gitweb-config.txt new file mode 100644 index 00..1b51475108 --- /dev/null +++ b/Documentation/gitweb-config.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 28/59] config.txt: move i18n.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 11 +-- Documentation/i18n-config.txt | 10 ++ 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 Documentation/i18n-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index da97097805..ec0f4e2161 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -600,16 +600,7 @@ 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. -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::i18n-config.txt[] imap:: The configuration variables in the 'imap' section are described diff --git a/Documentation/i18n-config.txt b/Documentation/i18n-config.txt new file mode 100644 index 00..cc25621731 --- /dev/null +++ b/Documentation/i18n-config.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 09/59] config.txt: move browser.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/browser-config.txt | 9 +
Documentation/config.txt | 10 +-
2 files changed, 10 insertions(+), 9 deletions(-)
create mode 100644 Documentation/browser-config.txt
diff --git a/Documentation/browser-config.txt b/Documentation/browser-config.txt
new file mode 100644
index 00..195df207a6
--- /dev/null
+++ b/Documentation/browser-config.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]).
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 249b90b107..407fd390a2 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -303,15 +303,7 @@ include::blame-config.txt[]
include::branch-config.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::browser-config.txt[]
checkout.defaultRemote::
When you run 'git checkout ' and only have one
--
2.19.1.647.g708186aaf9
[PATCH 20/59] config.txt: move fsck.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/config.txt | 68 +--
Documentation/fsck-config.txt | 67 ++
2 files changed, 68 insertions(+), 67 deletions(-)
create mode 100644 Documentation/fsck-config.txt
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 7c7dde188c..fa26cb1090 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -331,73 +331,7 @@ include::format-config.txt[]
include::filter-config.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::fsck-config.txt[]
gc.aggressiveDepth::
The depth parameter used in the delta compression
diff --git a/Documentation/fsck-config.txt b/Documentation/fsck-config.txt
new file mode 100644
index 00..879c5a29c4
--- /dev/null
+++ b/Documentation/fsck-config.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.`
[PATCH 11/59] config.txt: move clean.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/clean-config.txt | 3 +++ Documentation/config.txt | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Documentation/clean-config.txt diff --git a/Documentation/clean-config.txt b/Documentation/clean-config.txt new file mode 100644 index 00..a807c925b9 --- /dev/null +++ b/Documentation/clean-config.txt @@ -0,0 +1,3 @@ +clean.requireForce:: + A boolean to make git-clean do nothing unless given -f, + -i or -n. Defaults to true. diff --git a/Documentation/config.txt b/Documentation/config.txt index 8d890cc22a..77acf785d1 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -307,9 +307,7 @@ include::browser-config.txt[] include::checkout-config.txt[] -clean.requireForce:: - A boolean to make git-clean do nothing unless given -f, - -i or -n. Defaults to true. +include::clean-config.txt[] color.advice:: A boolean to enable/disable color in hints (e.g. when a push -- 2.19.1.647.g708186aaf9
[PATCH 13/59] config.txt: move column.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/column-config.txt | 55 Documentation/config.txt| 56 + 2 files changed, 56 insertions(+), 55 deletions(-) create mode 100644 Documentation/column-config.txt diff --git a/Documentation/column-config.txt b/Documentation/column-config.txt new file mode 100644 index 00..76aa2f29dc --- /dev/null +++ b/Documentation/column-config.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. diff --git a/Documentation/config.txt b/Documentation/config.txt index 9e2c6c292b..48ce01f596 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -311,61 +311,7 @@ include::clean-config.txt[] include::color-config.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::column-config.txt[] commit.cleanup:: This setting overrides the default of the `--cleanup` option in -- 2.19.1.647.g708186aaf9
[PATCH 18/59] config.txt: move fastimport.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 9 + Documentation/fastimport-config.txt | 8 2 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 Documentation/fastimport-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index f38e0a8334..66791f0918 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -323,14 +323,7 @@ include::diff-config.txt[] include::difftool-config.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::fastimport-config.txt[] include::fetch-config.txt[] diff --git a/Documentation/fastimport-config.txt b/Documentation/fastimport-config.txt new file mode 100644 index 00..c1166e330d --- /dev/null +++ b/Documentation/fastimport-config.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 17/59] config.txt: move difftool.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 15 +-- Documentation/difftool-config.txt | 14 ++ 2 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 Documentation/difftool-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index d1509dd25e..f38e0a8334 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -321,20 +321,7 @@ include::completion-config.txt[] include::diff-config.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::difftool-config.txt[] fastimport.unpackLimit:: If the number of objects imported by linkgit:git-fast-import[1] diff --git a/Documentation/difftool-config.txt b/Documentation/difftool-config.txt new file mode 100644 index 00..6762594480 --- /dev/null +++ b/Documentation/difftool-config.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 16/59] config.txt: move completion.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/completion-config.txt | 7 +++ Documentation/config.txt| 8 +--- 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 Documentation/completion-config.txt diff --git a/Documentation/completion-config.txt b/Documentation/completion-config.txt new file mode 100644 index 00..4d99bf33c9 --- /dev/null +++ b/Documentation/completion-config.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. diff --git a/Documentation/config.txt b/Documentation/config.txt index 36a8d120be..d1509dd25e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -317,13 +317,7 @@ include::commit-config.txt[] include::credential-config.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::completion-config.txt[] include::diff-config.txt[] -- 2.19.1.647.g708186aaf9
[PATCH 19/59] config.txt: move filter.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt| 10 +- Documentation/filter-config.txt | 9 + 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 Documentation/filter-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 66791f0918..7c7dde188c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -329,15 +329,7 @@ include::fetch-config.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::filter-config.txt[] fsck.:: During fsck git may find issues with legacy data which diff --git a/Documentation/filter-config.txt b/Documentation/filter-config.txt new file mode 100644 index 00..90dfe0ba5a --- /dev/null +++ b/Documentation/filter-config.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 03/59] config.txt: move add.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/add-config.txt | 7 +++ Documentation/config.txt | 8 +--- 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 Documentation/add-config.txt diff --git a/Documentation/add-config.txt b/Documentation/add-config.txt new file mode 100644 index 00..4d753f006e --- /dev/null +++ b/Documentation/add-config.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. diff --git a/Documentation/config.txt b/Documentation/config.txt index 27c2a211c0..a52e0b3592 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -291,13 +291,7 @@ include::advice-config.txt[] include::core-config.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::add-config.txt[] alias.*:: Command aliases for the linkgit:git[1] command wrapper - e.g. -- 2.19.1.647.g708186aaf9
[PATCH 04/59] config.txt: move alias.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/alias-config.txt | 18 ++ Documentation/config.txt | 19 +-- 2 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 Documentation/alias-config.txt diff --git a/Documentation/alias-config.txt b/Documentation/alias-config.txt new file mode 100644 index 00..0b14178314 --- /dev/null +++ b/Documentation/alias-config.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]. diff --git a/Documentation/config.txt b/Documentation/config.txt index a52e0b3592..5b46310dd4 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -293,24 +293,7 @@ include::core-config.txt[] include::add-config.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::alias-config.txt[] am.keepcr:: If true, git-am will call git-mailsplit for patches in mbox format -- 2.19.1.647.g708186aaf9
[PATCH 01/59] config.txt: move advice.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/advice-config.txt | 82 Documentation/config.txt| 84 + 2 files changed, 83 insertions(+), 83 deletions(-) create mode 100644 Documentation/advice-config.txt diff --git a/Documentation/advice-config.txt b/Documentation/advice-config.txt new file mode 100644 index 00..7f80cddcd4 --- /dev/null +++ b/Documentation/advice-config.txt @@ -0,0 +1,82 @@ +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. + 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. + waitingForEditor:: + Print a message to the terminal whenever Git is waiting for + editor input from the user. +-- diff --git a/Documentation/config.txt b/Documentation/config.txt index 552827935a..a0b0ef582f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -287,89 +287,7 @@ inventing new variables for use in your own tool, make sure their names do not
[PATCH 10/59] config.txt: move checkout.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/checkout-config.txt | 23 +++ Documentation/config.txt | 24 +--- 2 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 Documentation/checkout-config.txt diff --git a/Documentation/checkout-config.txt b/Documentation/checkout-config.txt new file mode 100644 index 00..c4118fa196 --- /dev/null +++ b/Documentation/checkout-config.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. diff --git a/Documentation/config.txt b/Documentation/config.txt index 407fd390a2..8d890cc22a 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -305,29 +305,7 @@ include::branch-config.txt[] include::browser-config.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::checkout-config.txt[] clean.requireForce:: A boolean to make git-clean do nothing unless given -f, -- 2.19.1.647.g708186aaf9
[PATCH 05/59] config.txt: move am.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/am-config.txt | 14 ++ Documentation/config.txt| 15 +-- 2 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 Documentation/am-config.txt diff --git a/Documentation/am-config.txt b/Documentation/am-config.txt new file mode 100644 index 00..5bcad2efb1 --- /dev/null +++ b/Documentation/am-config.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]. diff --git a/Documentation/config.txt b/Documentation/config.txt index 5b46310dd4..29dd694438 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -295,20 +295,7 @@ include::add-config.txt[] include::alias-config.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::am-config.txt[] apply.ignoreWhitespace:: When set to 'change', tells 'git apply' to ignore changes in -- 2.19.1.647.g708186aaf9
Re: [PATCH] alias: detect loops in mixed execution mode
On Fri, Oct 19 2018, Jeff King wrote:
> On Thu, Oct 18, 2018 at 10:57:39PM +, Ævar Arnfjörð Bjarmason wrote:
>
>> Add detection for aliasing loops in cases where one of the aliases
>> re-invokes git as a shell command. This catches cases like:
>>
>> [alias]
>> foo = !git bar
>> bar = !git foo
>>
>> Before this change running "git {foo,bar}" would create a
>> forkbomb. Now using the aliasing loop detection and call history
>> reporting added in 82f71d9a5a ("alias: show the call history when an
>> alias is looping", 2018-09-16) and c6d75bc17a ("alias: add support for
>> aliases of an alias", 2018-09-16) we'll instead report:
>>
>> fatal: alias loop detected: expansion of 'foo' does not terminate:
>> foo <==
>> bar ==>
>
> The regular alias expansion can generally assume that there's no
> conditional recursion going on, because it's expanding everything
> itself. But when we involve multiple processes, things get trickier.
>
> For instance, I could do this:
>
> [alias]
> countdown = "!f() { echo \"$@\"; test \"$1\" -gt 0 && git countdown
> $(($1-1)); }; f"
>
> which works now, but not with your patch.
>
> Now obviously that's a silly toy example, but are there real cases which
> might trigger this? Some plausible ones I can think of:
>
> - an alias which handles some special cases, then chains to itself for
> the simpler one (or to another alias or script, which ends up
> chaining back to the original)
>
> - an alias that runs a git command, which then spawns a hook or other
> user-controlled script, which incidentally uses that same alias
>
> I'd guess this sort of thing is pretty rare. But I wonder if we're
> crossing the line of trying to assume too much about what the user's
> arbitrary code does.
>
> A simple depth counter can limit the fork bomb, and with a high enough
> depth would be unlikely to trigger a false positive. It could also
> protect non-aliases more reasonably, too (e.g., if you have a 1000-deep
> git process hierarchy, there's a good chance you've found an infinite
> loop in git itself).
I don't think this edge case you're describing is very plausible, and I
doubt it exists in the wild.
But going by my personal incredulity and a git release breaking code in
the wild would suck, so agree that I need to re-roll this to anticipate
that.
I don't have time to write it now, but what do you think about a version
of this where we introduce a core.recursionLimit setting, and by default
set it to "1" (for one recursion), so by default die just as we do now,
but with some advice() saying that we've bailed out early because this
looks crazy, but you can set it to e.g. "1000" if you think you know
what you're doing, or "0" for no limit.
The reason I'd like to do that is because I think it's *way* more common
to do this accidentally than intentionally, and by having a default
limit of 1000 we'd print a really long error message, or alternatively
would have to get into the mess of de-duplicating the callstack as we
print the error.
It also has the advantage that if people in the wild really use this
they'll chime in about this new annoying core.recursionLimit=1 setting,
at the cost of me having annoyed them all by breaking their working
code.
>> +static void init_cmd_history(struct strbuf *env, struct string_list
>> *cmd_list)
>> +{
>> +const char *old = getenv(COMMAND_HISTORY_ENVIRONMENT);
>> +struct strbuf **cmd_history, **ptr;
>> +
>> +if (!old || !*old)
>> +return;
>> +
>> +strbuf_addstr(env, old);
>> +strbuf_rtrim(env);
>> +
>> +cmd_history = strbuf_split_buf(old, strlen(old), ' ', 0);
>> +for (ptr = cmd_history; *ptr; ptr++) {
>> +strbuf_rtrim(*ptr);
>> +string_list_append(cmd_list, (*ptr)->buf);
>> +}
>> +strbuf_list_free(cmd_history);
>
> Maybe string_list_split() would be a little simpler?
Yeah looks like it. I cargo-culted this from elsewhere without looking
at that API. I'll look into it.
Re: [PATCH] alias: detect loops in mixed execution mode
On Fri, Oct 19 2018, Jeff King wrote: > On Fri, Oct 19, 2018 at 10:28:22AM +0200, Ævar Arnfjörð Bjarmason wrote: > >> > - string_list_append(_list, *argv[0]); >> > + add_cmd_history(, _list, *argv[0]); >> > >> >/* >> > * It could be an alias -- this works around the insanity >> >> Just to sanity check an assumption of mine: One thing I didn't do is use >> sq_quote_buf() and sq_dequote_to_argv() like we do for >> CONFIG_DATA_ENVIRONMENT. This is because in the case of config we need >> to deal with: >> >> $ git config alias.cfgdump >> !env >> $ git -c x.y=z -c "foo.bar='baz'" cfgdump|grep baz >> GIT_CONFIG_PARAMETERS='x.y=z' 'foo.bar='\''baz'\''' >> >> But in this case I don't see how a command-name would ever contain >> whitespace. So we skip quoting and just delimit by space. > > Alias names cannot currently contain whitespace, because it's not > allowed in the key. However, we've discussed making the syntax > alias..command, which would then make it possible. > > Whether anyone would use that is a different question, but hey, > apparently some people think "My Documents" is a good name for a > directory. ;) I'll just leave this part as it is for now. If we ever have commands with whitespace this'll be the least of our worries.
dear partner
Dear partner, consider this mail real despite you are not expecting it,i Alhaji Wafu the head operational manager of a well known bank in burkina faso i brought a risk free business of $9.4million to you,i strongly believe that there will be no betrayal along the line.please inbox me here for more details alhajiwafu@gmail. com Urgent reply is needed Waiting for your email Alhaji Wafu
[PATCH] read-cache: use of memory after it is freed
introduced with c46c406ae1e (trace.h: support nested performance tracing)
on Aug 18, 2018 but not affecting maint
Signed-off-by: Carlo Marcelo Arenas Belón
---
read-cache.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/read-cache.c b/read-cache.c
index 1df5c16dbc..78f47d2f50 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -2297,8 +2297,8 @@ int read_index_from(struct index_state *istate, const
char *path,
freshen_shared_index(base_path, 0);
merge_base_index(istate);
post_read_index_from(istate);
- free(base_path);
trace_performance_leave("read cache %s", base_path);
+ free(base_path);
return ret;
}
--
2.19.1
[PATCH] builtin/receive-pack: dead initializer for retval in check_nonce
NONCE_BAD is explicitly set when needed with the fallback
instead as NONCE_SLOP
Signed-off-by: Carlo Marcelo Arenas Belón
---
builtin/receive-pack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 95740f4f0e..ecce3d4043 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -507,7 +507,7 @@ static const char *check_nonce(const char *buf, size_t len)
char *nonce = find_header(buf, len, "nonce", NULL);
timestamp_t stamp, ostamp;
char *bohmac, *expect = NULL;
- const char *retval = NONCE_BAD;
+ const char *retval;
if (!nonce) {
retval = NONCE_MISSING;
--
2.19.1
Re: How to start contributing
Hi, On Thu, Oct 18, 2018 at 2:51 PM Πλάτων Κιορπελίδης wrote: > > Hello, > > I’m a computer science student and I’m interested in contributing to git. > I’ve read the GSoC git page with the ideas and micro-projects as I’m > interested in participating next summer. > I’ve also read the Documentation at the GitHub mirror. > I’ve never worked on such large project and I don’t know where to start from. > I’ve picked this microproject from the GSoC page: > > Make “git tag –contains ” less chatty if is invalid > “git tag – contains ” prints the whole help text if is > invalid. It should only show the error message instead. > Thread: > https://public-inbox.org/git/20160118215433.gb24...@sigill.intra.peff.net/ > > This bug is solved using the 3rd option, but I suspect that it’s still > here because the 2nd option is preferred. I think it should probably have been removed from the micro-project list. I am CC'ing Peff as he wrote the email listing the different options to solve the original issue and may think otherwise. > How should I tackle this? It's a good first step to ask first on the list as you did if it is a good micro-project or not. Unfortunately in this case I think you might want to try to find another micro-project. Thanks, Christian.
Re: [BUG] gitignore documentation inconsistent with actual behaviour
On 20 Oct 2018, at 01:03, Duy Nguyen wrote: >foo**bar would match foobar as well as foo/bar, foo/x/bar and >foo/x/y/bar... Its behavior is error prone in my opinion. There's also >some concerns in early iterations of this "**" support that we would >need to revisit if we want 'rsync' behavior. I'm not very excited >about doing that. That's fair. I guess another point in favour of your second option is that it's essentially the same behaviour used by bash (with the `globstar` option) and zsh (with the default options); they also give `**` special recursion powers only when used in a path component by itself, otherwise it acts like `*`. So there's precedent there. dana
Re: [BUG] gitignore documentation inconsistent with actual behaviour
On Sat, Oct 20, 2018 at 7:53 AM dana wrote: > > On 20 Oct 2018, at 00:26, Duy Nguyen wrote: > >Which way should we go? I'm leaning towards the second one... > > Not sure how much my opinion is worth, but the second option does feel more > friendly (from a usage perspective) as well as more straight-forward (from a > re-implementation perspective). Yeah. And not having to describe all the corner cases is a plus. Too many corner cases are a sign of bad implementation anyway. I'll wait some more time for the others to speak up before I cook a proper patch. > There's a third option too, though, right? The 'rsync' behaviour mentioned > earlier? It wouldn't matter either way in any of the examples i listed, but is > there ever a conceivable use case for something like `foo**bar`, where the > `**` > matches across slashes? (I can't think of any reason i'd need that personally, > but then again i don't understand why these people are using `**` the way they > are in the first place.) foo**bar would match foobar as well as foo/bar, foo/x/bar and foo/x/y/bar... Its behavior is error prone in my opinion. There's also some concerns in early iterations of this "**" support that we would need to revisit if we want 'rsync' behavior. I'm not very excited about doing that. -- Duy
