Re: [PATCH 5/5] describe: teach describe negative pattern matches

2017-01-12 Thread Jacob Keller
On Thu, Jan 12, 2017 at 10:43 PM, Johannes Sixt wrote: > Am 13.01.2017 um 01:59 schrieb Jacob Keller: >> >> I think that --exclude makes sense, but the current implementation >> does not differentiate ordering, since both are merely accumulated >> into string_lists and then matched together. I'm n

Re: [PATCH 5/5] describe: teach describe negative pattern matches

2017-01-12 Thread Johannes Sixt
Am 13.01.2017 um 01:59 schrieb Jacob Keller: I think that --exclude makes sense, but the current implementation does not differentiate ordering, since both are merely accumulated into string_lists and then matched together. I'm not sure how order would impact things here? In the current implement

Re: [PATCH 2/2] Use 'env' to find perl instead of fixed path

2017-01-12 Thread Eric Wong
Pat Pannuto wrote: > You may still want the 1/2 patch in this series, just to make things > internally consistent with "-w" vs "use warnings;" inside git's perl > scripts. No, that is a step back. "-w" affects the entire process, so it spots more potential problems. The "warnings" pragma is sco

[RFC-PATCH] lib-submodule-update.sh: define tests for recursing into submodules

2017-01-12 Thread Stefan Beller
Currently lib-submodule-update.sh provides 2 functions test_submodule_switch and test_submodule_forced_switch that are used by a variety of tests to ensure that submodules behave as expected. The current expected behavior is that submodules are not touched at all. (See 42639d2317a for the exact set

Re: Bug report: Documentation error in git-bisect man description

2017-01-12 Thread Manuel Ullmann
> On Fri, Jan 13, 2017 at 12:42 AM, Junio C Hamano wrote: >> Junio C Hamano writes: >> >>> Manuel Ullmann writes: >>> >>> Hmmm, I tend to agree, modulo a minor fix. >>> >>> If the description were in a context inside a paragraph like this: >>> >>> When you want to tell 'git bisect' that a

Re: Bug report: Documentation error in git-bisect man description

2017-01-12 Thread Christian Couder
On Fri, Jan 13, 2017 at 12:42 AM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Manuel Ullmann writes: >> >> Hmmm, I tend to agree, modulo a minor fix. >> >> If the description were in a context inside a paragraph like this: >> >> When you want to tell 'git bisect' that a belongs to

Re: [PATCH 5/5] describe: teach describe negative pattern matches

2017-01-12 Thread Jacob Keller
On Thu, Jan 12, 2017 at 5:45 AM, Johannes Sixt wrote: > Am 12.01.2017 um 01:17 schrieb Jacob Keller: >> >> From: Jacob Keller >> >> Teach git-describe the `--discard` option which will allow specifying >> a glob pattern of tags to ignore. This can be combined with the >> `--match` patterns to ena

Re: [PATCH 3/5] name-rev: add support to discard refs by pattern match

2017-01-12 Thread Jacob Keller
On Thu, Jan 12, 2017 at 1:57 AM, Johannes Schindelin wrote: > Hi Jake, > > On Wed, 11 Jan 2017, Jacob Keller wrote: > >> From: Jacob Keller >> >> Extend name-rev further to support matching refs by adding `--discard` >> patterns. > > Same comment applies as for 5/5: `--exclude-refs` may be a bett

Re: [PATCH 2/5] name-rev: extend --refs to accept multiple patterns

2017-01-12 Thread Jacob Keller
On Thu, Jan 12, 2017 at 1:56 AM, Johannes Schindelin wrote: > Hi Jake, > > On Wed, 11 Jan 2017, Jacob Keller wrote: > >> diff --git a/t/t6007-rev-list-cherry-pick-file.sh >> b/t/t6007-rev-list-cherry-pick-file.sh >> index 1408b608eb03..d072ec43b016 100755 >> --- a/t/t6007-rev-list-cherry-pick-fil

Re: [PATCH 1/5] doc: add documentation for OPT_STRING_LIST

2017-01-12 Thread Jacob Keller
On Thu, Jan 12, 2017 at 1:47 AM, Johannes Schindelin wrote: > Hi Jake, > > On Wed, 11 Jan 2017, Jacob Keller wrote: > >> diff --git a/Documentation/technical/api-parse-options.txt >> b/Documentation/technical/api-parse-options.txt >> index 27bd701c0d68..15e876e4c804 100644 >> --- a/Documentation/

Re: Bug report: Documentation error in git-bisect man description

2017-01-12 Thread Manuel Ullmann
I see. Thanks for the clarification. The pairing not being pairs of opposites was indeed, what confused me. So that description was not meant in the sense, that you use these pairs when working with bisect, but instead they are ordered according to the argument possibilities. Sorry for spreading c

[PATCH 03/27] attr.c: update a stale comment on "struct match_attr"

2017-01-12 Thread Brandon Williams
From: Junio C Hamano When 82dce998 (attr: more matching optimizations from .gitignore, 2012-10-15) changed a pointer to a string "*pattern" into an embedded "struct pattern" in struct match_attr, it forgot to update the comment that describes the structure. Signed-off-by: Junio C Hamano Signed-

[PATCH 05/27] attr.c: complete a sentence in a comment

2017-01-12 Thread Brandon Williams
From: Junio C Hamano Signed-off-by: Junio C Hamano Signed-off-by: Stefan Beller Signed-off-by: Brandon Williams --- attr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attr.c b/attr.c index 6b55a57ef..9bdf87a6f 100644 --- a/attr.c +++ b/attr.c @@ -300,7 +300,7 @@ static

[PATCH 09/27] attr.c: plug small leak in parse_attr_line()

2017-01-12 Thread Brandon Williams
From: Junio C Hamano If any error is noticed after the match_attr structure is allocated, we shouldn't just return NULL from this function. Add a fail_return label that frees the allocated structure and returns NULL, and consistently jump there when we want to return NULL after cleaning up. Sig

[PATCH 04/27] attr.c: explain the lack of attr-name syntax check in parse_attr()

2017-01-12 Thread Brandon Williams
From: Junio C Hamano Signed-off-by: Junio C Hamano Signed-off-by: Stefan Beller Signed-off-by: Brandon Williams --- attr.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/attr.c b/attr.c index 007f1a299..6b55a57ef 100644 --- a/attr.c +++ b/attr.c @@ -183,6 +183,12 @@ static const ch

[PATCH 14/27] attr: rename function and struct related to checking attributes

2017-01-12 Thread Brandon Williams
From: Junio C Hamano The traditional API to check attributes is to prepare an N-element array of "struct git_attr_check" and pass N and the array to the function "git_check_attr()" as arguments. In preparation to revamp the API to pass a single structure, in which these N elements are held, rena

[PATCH 07/27] attr.c: simplify macroexpand_one()

2017-01-12 Thread Brandon Williams
From: Junio C Hamano The double-loop wants to do an early return immediately when one matching macro is found. Eliminate the extra variable 'a' used for that purpose and rewrite the "assign the found item to 'a' to make it non-NULL and force the loop(s) to terminate" with a direct return from th

[PATCH 10/27] attr: support quoting pathname patterns in C style

2017-01-12 Thread Brandon Williams
From: Nguyễn Thái Ngọc Duy Full pattern must be quoted. So 'pat"t"ern attr' will give exactly 'pat"t"ern', not 'pattern'. Also clarify that leading whitespaces are not part of the pattern and document comment syntax. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano Signed-off-

[PATCH 06/27] attr.c: mark where #if DEBUG ends more clearly

2017-01-12 Thread Brandon Williams
From: Junio C Hamano Signed-off-by: Junio C Hamano Signed-off-by: Stefan Beller Signed-off-by: Brandon Williams --- attr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attr.c b/attr.c index 9bdf87a6f..17297fffe 100644 --- a/attr.c +++ b/attr.c @@ -469,7 +469,7 @@ static

[PATCH 13/27] attr.c: outline the future plans by heavily commenting

2017-01-12 Thread Brandon Williams
From: Junio C Hamano Signed-off-by: Junio C Hamano Signed-off-by: Stefan Beller Signed-off-by: Brandon Williams --- attr.c | 40 +++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/attr.c b/attr.c index 8026d68bd..50e5ee393 100644 --- a/attr.

[PATCH 11/27] attr.c: add push_stack() helper

2017-01-12 Thread Brandon Williams
From: Junio C Hamano There are too many repetitious "I have this new attr_stack element; push it at the top of the stack" sequence. The new helper function push_stack() gives us a way to express what is going on at these places, and as a side effect, halves the number of times we mention the att

[PATCH 01/27] commit.c: use strchrnul() to scan for one line

2017-01-12 Thread Brandon Williams
From: Junio C Hamano Signed-off-by: Junio C Hamano Signed-off-by: Stefan Beller Signed-off-by: Brandon Williams --- commit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/commit.c b/commit.c index 2cf85158b..0c4ee3de4 100644 --- a/commit.c +++ b/commit.c @@ -415,8 +415

[PATCH 00/27] Revamp the attribute system; another round

2017-01-12 Thread Brandon Williams
This series has been bounced around a bit (from Junio to Stefan) and finally landed in my lap. The end result of Stefan's attempt at the series still had a couple of things that needed more tweaking. It also has a few patches on top which added functionality to pathspecs to be able to query into

[PATCH 08/27] attr.c: tighten constness around "git_attr" structure

2017-01-12 Thread Brandon Williams
From: Junio C Hamano It holds an interned string, and git_attr_name() is a way to peek into it. Make sure the involved pointer types are pointer-to-const. Signed-off-by: Junio C Hamano Signed-off-by: Stefan Beller Signed-off-by: Brandon Williams --- attr.c | 2 +- attr.h | 4 ++-- 2 files c

[PATCH 02/27] attr.c: use strchrnul() to scan for one line

2017-01-12 Thread Brandon Williams
From: Junio C Hamano Signed-off-by: Junio C Hamano Signed-off-by: Stefan Beller Signed-off-by: Brandon Williams --- attr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/attr.c b/attr.c index 1fcf042b8..04d24334e 100644 --- a/attr.c +++ b/attr.c @@ -402,8 +402,8 @@ st

[PATCH 12/27] Documentation: fix a typo

2017-01-12 Thread Brandon Williams
From: Stefan Beller Signed-off-by: Stefan Beller Signed-off-by: Brandon Williams --- Documentation/gitattributes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 3173dee7e..a53d093ca 100644 --- a/Doc

[PATCH 21/27] attr: use hashmap for attribute dictionary

2017-01-12 Thread Brandon Williams
The current implementation of the attribute dictionary uses a custom hashtable. This modernizes the dictionary by converting it to the builtin 'hashmap' structure. Also, in order to enable a threaded API in the future add an accompanying mutex which must be acquired prior to accessing the diction

[PATCH 22/27] attr: eliminate global check_all_attr array

2017-01-12 Thread Brandon Williams
Currently there is a reliance on 'check_all_attr' which is a global array of 'attr_check_item' items which is used to store the value of each attribute during the collection process. This patch eliminates this global and instead creates an array per 'attr_check' instance which is then used in the

[PATCH 26/27] attr: push the bare repo check into read_attr()

2017-01-12 Thread Brandon Williams
Push the bare repository check into the 'read_attr()' function. This avoids needing to have extra logic which creates an empty stack frame when inside a bare repo as a similar bit of logic already exists in the 'read_attr()' function. Signed-off-by: Brandon Williams --- attr.c | 40

[PATCH 24/27] attr: tighten const correctness with git_attr and match_attr

2017-01-12 Thread Brandon Williams
Signed-off-by: Brandon Williams --- attr.c | 14 +++--- attr.h | 2 +- builtin/check-attr.c | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/attr.c b/attr.c index 633a12cc3..90f576044 100644 --- a/attr.c +++ b/attr.c @@ -209,7 +209,7 @

[PATCH 27/27] attr: reformat git_attr_set_direction() function

2017-01-12 Thread Brandon Williams
Move the 'git_attr_set_direction()' up to be closer to the variables that it modifies as well as a small formatting by renaming the variable 'new' to 'new_direction' so that it is more descriptive. Update the comment about how 'direction' is used to read the state of the world. It should be noted

[PATCH 25/27] attr: store attribute stacks in hashmap

2017-01-12 Thread Brandon Williams
The last big hurdle towards a thread-safe API for the attribute system is the reliance on a global attribute stack that is modified during each call into the attribute system. This patch removes this global stack and instead a stack is retrieved or constructed locally. Since each of these stacks

[PATCH 20/27] attr: change validity check for attribute names to use positive logic

2017-01-12 Thread Brandon Williams
From: Junio C Hamano Convert 'invalid_attr_name()' to 'attr_name_valid()' and use positive logic for the return value. In addition create a helper function that prints out an error message when an invalid attribute name is used. We could later update the message to exactly spell out what the ru

[PATCH 16/27] attr: convert git_all_attrs() to use "struct attr_check"

2017-01-12 Thread Brandon Williams
From: Junio C Hamano This updates the other two ways the attribute check is done via an array of "struct attr_check_item" elements. These two niches appear only in "git check-attr". * The caller does not know offhand what attributes it wants to ask about and cannot use attr_check_initl() to

[PATCH 23/27] attr: remove maybe-real, maybe-macro from git_attr

2017-01-12 Thread Brandon Williams
Whether or not a git attribute is real or a macro isn't a property of the attribute but rather it depends on the attribute stack (which .gitattribute files were read). This patch removes the 'maybe_real' and 'maybe_macro' fields in a git_attr and instead adds the 'macro' field to a attr_check_item

[PATCH 18/27] attr: retire git_check_attrs() API

2017-01-12 Thread Brandon Williams
From: Junio C Hamano Since nobody uses the old API, make it file-scope static, and update the documentation to describe the new API. Signed-off-by: Junio C Hamano Signed-off-by: Stefan Beller Signed-off-by: Brandon Williams --- Documentation/technical/api-gitattributes.txt | 86 +

[PATCH 19/27] attr: pass struct attr_check to collect_some_attrs

2017-01-12 Thread Brandon Williams
The old callchain used to take an array of attr_check_item items. Instead pass the 'attr_check' container object to 'collect_some_attrs()' and access the fields in the data structure directly. Signed-off-by: Brandon Williams --- attr.c | 33 + 1 file changed, 13 i

[PATCH 17/27] attr: convert git_check_attrs() callers to use the new API

2017-01-12 Thread Brandon Williams
From: Junio C Hamano The remaining callers are all simple "I have N attributes I am interested in. I'll ask about them with various paths one by one". After this step, no caller to git_check_attrs() remains. After removing it, we can extend "struct attr_check" struct with data that can be used

[PATCH 15/27] attr: (re)introduce git_check_attr() and struct attr_check

2017-01-12 Thread Brandon Williams
From: Junio C Hamano A common pattern to check N attributes for many paths is to (1) prepare an array A of N attr_check_item items; (2) call git_attr() to intern the N attribute names and fill A; (3) repeatedly call git_check_attrs() for path with N and A; A look-up for these N attributes fo

Re: Bug report: Documentation error in git-bisect man description

2017-01-12 Thread Junio C Hamano
Junio C Hamano writes: > Manuel Ullmann writes: > > Hmmm, I tend to agree, modulo a minor fix. > > If the description were in a context inside a paragraph like this: > > When you want to tell 'git bisect' that a belongs to > the newer half of the history, you say > > g

Re: Bug report: Documentation error in git-bisect man description

2017-01-12 Thread Junio C Hamano
Manuel Ullmann writes: > Hi, > > there is a mistake in the git-bisect description. > The second paragraph of it says ‘the terms "old" and "new" can be used > in place of "good" and "bad"’. So from a logical point of view the > description part stating the usage syntax should be: > > git bisect (b

[PATCH] worktree: fix an 'using plain integer as NULL pointer' warning

2017-01-12 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Duy, If you need to re-roll your 'nd/worktree-move' branch, could you please squash this into the relevant patch. (commit 62985f75c1 "worktree move: refuse to move worktrees with submodules", 08-01-2017). [BTW, this is a sparse warning, just in case you were

Bug report: Documentation error in git-bisect man description

2017-01-12 Thread Manuel Ullmann
Hi, there is a mistake in the git-bisect description. The second paragraph of it says ‘the terms "old" and "new" can be used in place of "good" and "bad"’. So from a logical point of view the description part stating the usage syntax should be: git bisect (bad|good) [] git bisect (old|new) [...]

Re: [PATCH/RFC 5/4] Redefine core.bare in multiple working tree setting

2017-01-12 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > With per-worktree configuration in place, core.bare is moved to main > worktree's private config file. But it does not really make sense > because this is about _repository_. Instead we could leave core.bare in > the per-repo config and change/extend its definition

Re: [PATCH 1/3] doc: gitk: remove gitview reference

2017-01-12 Thread Stefan Beller
On Thu, Jan 12, 2017 at 1:32 PM, Philip Oakley wrote: > contrib/gitview has been removed. Remove the reference. Thanks for this cleanup.

Re: [PATCHv2 4/4] unpack-trees: support super-prefix option

2017-01-12 Thread Stefan Beller
On Thu, Jan 12, 2017 at 1:40 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> This is only patchv4 that is rerolled, patches 1-3 remain as is. > > Good timing, as I was about to send a reminder to suggest rerolling > 4/4 alone ;-) > >> +static const char *super_prefixed(const char *path) >>

Re: [PATCH 5/5] describe: teach describe negative pattern matches

2017-01-12 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Jake, > > On Wed, 11 Jan 2017, Jacob Keller wrote: > >> From: Jacob Keller >> >> Teach git-describe the `--discard` option which will allow specifying >> a glob pattern of tags to ignore. > > IMHO "discard" is the wrong word, it almost sounds as if the matching

Re: [PATCH 2/2] Use 'env' to find perl instead of fixed path

2017-01-12 Thread Junio C Hamano
Pat Pannuto writes: > You may still want the 1/2 patch in this series, just to make things > internally consistent with "-w" vs "use warnings;" inside git's perl > scripts. I do not think so. 1/2 is justified as a prerequisite of 2/2 and needs a different log message, so cannot be used as is.

Re: [PATCHv2 4/4] unpack-trees: support super-prefix option

2017-01-12 Thread Junio C Hamano
Stefan Beller writes: > This is only patchv4 that is rerolled, patches 1-3 remain as is. Good timing, as I was about to send a reminder to suggest rerolling 4/4 alone ;-) > +static const char *super_prefixed(const char *path) > +{ There used to be a comment that explains why we keep two static

[PATCH 1/3] doc: gitk: remove gitview reference

2017-01-12 Thread Philip Oakley
contrib/gitview has been removed. Remove the reference. Signed-off-by: Philip Oakley --- cc: Paul Mackerras --- Documentation/gitk.txt | 4 1 file changed, 4 deletions(-) diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index e382dd9..73c02b9 100644 --- a/Documentation/gitk.tx

[PATCH 3/3] doc: git-gui browser does not default to HEAD

2017-01-12 Thread Philip Oakley
37cd4f7 ("Document git-gui, git-citool as mainporcelain manual pages", 2007-06-21) documented the default, but was shortly followed by c52c945 ("git-gui: Allow blame/browser subcommands on bare repositories", 2007-07-17) which, it would appear, as a side effect, removed that default. Finally docum

[PATCH 2/3] doc: gitk: add the upstream repo location

2017-01-12 Thread Philip Oakley
Match the 'git gui' information regarding the graphical browser and its upstream location. Signed-off-by: Philip Oakley --- cc: Paul Mackerras --- Documentation/gitk.txt | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Documentation/gitk.txt b/Documentation/gitk.tx

[PATCH 0/3] updates to gitk & git-gui doc now gitview has gone

2017-01-12 Thread Philip Oakley
gitview was removed recently. > Sent: Tuesday, January 10, 2017 11:48 PM > Subject: What's cooking in git.git (Jan 2017, #01; Tue, 10) > * sb/remove-gitview (2017-01-07) 1 commit > (merged to 'next' on 2017-01-10 at dcb3abd146) > + contrib: remove gitview > Will merge to 'master'. Lets remo

Re: Bug report: Git pull hang occasionally

2017-01-12 Thread Kai Zhang
> On Jan 12, 2017, at 1:12 PM, Junio C Hamano wrote: > > Kai Zhang writes: > >>> On Dec 21, 2016, at 1:32 PM, Junio C Hamano wrote: >>> >>> Junio C Hamano writes: >>> ... >>> >>> I wonder if the latter is solved by recent patch 296b847c0d >>> ("remote-curl: don't hang when a server dies be

Re: Bug report: Git pull hang occasionally

2017-01-12 Thread Junio C Hamano
Kai Zhang writes: >> On Dec 21, 2016, at 1:32 PM, Junio C Hamano wrote: >> >> Junio C Hamano writes: >> ... >> >> I wonder if the latter is solved by recent patch 296b847c0d >> ("remote-curl: don't hang when a server dies before any output", >> 2016-11-18) on the client side. >> ... > After

Re: [PATCH 2/2] Use 'env' to find perl instead of fixed path

2017-01-12 Thread Pat Pannuto
I'm happy to let this drop. I've filed the missing perl library as a homebrew issue [1], so hopefully this won't be an issue for folks in the future. You may still want the 1/2 patch in this series, just to make things internally consistent with "-w" vs "use warnings;" inside git's perl scripts.

Re: [PATCH v2] diff: add interhunk context config option

2017-01-12 Thread Junio C Hamano
Vegard Nossum writes: > diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt > index 58f4bd6..d8cd854 100644 > --- a/Documentation/diff-config.txt > +++ b/Documentation/diff-config.txt > @@ -60,6 +60,12 @@ diff.context:: > Generate diffs with lines of context instead

Re: git clone failing when used through bundler on Docker for Windows with a shared volume

2017-01-12 Thread Philip Oakley
From: "Omar Qureshi" Hi there, I'm not sure this is the best place for this, but, this seems to be an issue with Git when used through Docker on Windows when there is a shared volume. The issue is documented at https://github.com/bundler/bundler/issues/5322 and I've provided a git I think thi

Re: [PATCH 2/2] Use 'env' to find perl instead of fixed path

2017-01-12 Thread Junio C Hamano
Johannes Schindelin writes: > So if this patch would make it into upstream Git, I would *have* to revert > it in Git for Windows, adding to my already considerable maintenance burden. I do not think we want "#!/usr/bin/env $language" in the upstream, either.

Re: [PATCH 2/2] mailinfo: Understand forwarded patches

2017-01-12 Thread Junio C Hamano
Matthew Wilcox writes: > From: Matthew Wilcox > > Extend the --scissors mechanism to strip off the preamble created by > forwarding a patch. There are a couple of extra headers ("Sent" and > "To") added by forwarding, but other than that, the --scissors option > will now remove patches forwarde

RE: [PATCH 2/2] mailinfo: Understand forwarded patches

2017-01-12 Thread Matthew Wilcox
From: Jonathan Tan [mailto:jonathanta...@google.com] > On 01/12/2017 01:20 AM, Matthew Wilcox wrote: > > From: Matthew Wilcox > > > > Extend the --scissors mechanism to strip off the preamble created by > > forwarding a patch. There are a couple of extra headers ("Sent" and > > "To") added by for

Re: [PATCH 1/2] asciidoctor: fix user-manual to be built by `asciidoctor`

2017-01-12 Thread Junio C Hamano
Johannes Schindelin writes: >> And I tend to agree that the silliness you observed (like a t-o-c >> for a one-section "chapter") is not quite welcome. >> >> For now I queued only 2/2 which looked good. I won't object if >> somebody else rerolls 1/2 to appease AsciiDoctor, but let's take an >> o

RE: [PATCH 1/2] mailinfo: Add support for keep_cr

2017-01-12 Thread Matthew Wilcox
From: Jonathan Tan [mailto:jonathanta...@google.com] > On 01/12/2017 01:20 AM, Matthew Wilcox wrote: > A test exercising the new functionality would be nice. Roger. > Also, maybe a more descriptive title like "mailinfo: also respect > keep_cr after base64 decode" (50 characters) is better. No pr

Re: [PATCH v3 06/38] sequencer (rebase -i): implement the 'edit' command

2017-01-12 Thread Junio C Hamano
Johannes Schindelin writes: > +static int make_patch(struct commit *commit, struct replay_opts *opts) > +{ > + struct strbuf buf = STRBUF_INIT; > + struct rev_info log_tree_opt; > + const char *subject, *p; > + int res = 0; > + > + p = short_commit_name(commit); > + if (wr

Re: [PATCH v3 02/38] sequencer: move "else" keyword onto the same line as preceding brace

2017-01-12 Thread Junio C Hamano
Johannes Schindelin writes: > It is the current coding style of the Git project to write > > if (...) { > ... > } else { > ... > } > > instead of putting the closing brace and the "else" keyword on separate > lines. > > Pointed out by Junio Hamano. F

Re: [PATCH v3 03/38] sequencer: use a helper to find the commit message

2017-01-12 Thread Junio C Hamano
Johannes Schindelin writes: > It is actually not safe to look for a commit message by looking for the > first empty line and skipping it. > > The find_commit_subject() function looks more carefully, so let's use > it. Since we are interested in the entire commit message, we re-compute > the strin

Re: [PATCH v3 01/38] sequencer: avoid unnecessary curly braces

2017-01-12 Thread Junio C Hamano
Johannes Schindelin writes: > > - if (!commit->parents) { > + if (!commit->parents) > parent = NULL; > - } > else if (commit->parents->next) { > /* Reverting or cherry-picking a merge commit */ > int cnt; The result becomes i

Re: Bug report: Git pull hang occasionally

2017-01-12 Thread Kai Zhang
Hi Junio, After apply this patch, hanging did not happen again. Would this patch go to release in near future? Thanks. Regards, Kai > On Dec 21, 2016, at 1:32 PM, Junio C Hamano wrote: > > Junio C Hamano writes: > >> And the unexpected discrepancy is reported by find_symref() as >> fatal.

Re: [PATCH 2/2] mailinfo: Understand forwarded patches

2017-01-12 Thread Jonathan Tan
On 01/12/2017 01:20 AM, Matthew Wilcox wrote: From: Matthew Wilcox Extend the --scissors mechanism to strip off the preamble created by forwarding a patch. There are a couple of extra headers ("Sent" and "To") added by forwarding, but other than that, the --scissors option will now remove patc

Re: [PATCH 1/2] mailinfo: Add support for keep_cr

2017-01-12 Thread Jonathan Tan
On 01/12/2017 01:20 AM, Matthew Wilcox wrote: From: Matthew Wilcox If you have a base-64 encoded patch with CRLF endings (as produced by forwarding a patch from Outlook to a Linux machine, for example), the keep_cr setting is not honoured because keep_cr is only passed to mailsplit, which does

Re: [PATCH] imap-send.c: Avoid deprecated openssl 1.1.0 API

2017-01-12 Thread Jack Bates
You might need the following, to still build with LibreSSL. That was my experience anyway, when I recently prepared similar fixes for OpenSSL 1.1 and Apache Traffic Server. #if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER) On 12/01/17 03:42 AM, eroen wrote: Library

Re: [PATCH] imap-send.c: Avoid deprecated openssl 1.1.0 API

2017-01-12 Thread Jack Bates
You might need the following, to still build with LibreSSL. That was my experience anyway, when I recently prepared similar fixes for OpenSSL 1.1 and Apache Traffic Server. #if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER) On 12/01/17 03:42 AM, eroen wrote: Library

problem with insider build for windows and git

2017-01-12 Thread Michael Gooch
when running commands like pull and clone I get the following message: Cygwin WARNING: Couldn't compute FAST_CWD pointer. This typically occurs if you're using an older Cygwin version on a newer Windows. Please update to the latest available Cygwin version from https://cygwin.com/. If th

Re: [PATCH 5/5] describe: teach describe negative pattern matches

2017-01-12 Thread Johannes Sixt
Am 12.01.2017 um 01:17 schrieb Jacob Keller: From: Jacob Keller Teach git-describe the `--discard` option which will allow specifying a glob pattern of tags to ignore. This can be combined with the `--match` patterns to enable more flexibility in determining which tags to consider. For example

[PATCH v2] diff: add interhunk context config option

2017-01-12 Thread Vegard Nossum
The --inter-hunk-context= option was added in commit 6d0e674a5754 ("diff: add option to show context between close hunks"). This patch allows configuring a default for this option. Cc: René Scharfe Cc: Pranit Bauva Signed-off-by: Vegard Nossum --- v2: - Update Documentation/diff-config.txt, s

Re: [PATCH v4] log --graph: customize the graph lines with config log.graphColors

2017-01-12 Thread Duy Nguyen
Just FYI. The broken internet cables in Vietnam seem to hit my ISP really hard. It's nearly impossible to make a TCP connection. So I'm basically off the grid, hopefully not longer than two weeks. On 1/10/17, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> +end = string + strlen(s

git clone failing when used through bundler on Docker for Windows with a shared volume

2017-01-12 Thread Omar Qureshi
Hi there, I'm not sure this is the best place for this, but, this seems to be an issue with Git when used through Docker on Windows when there is a shared volume. The issue is documented at https://github.com/bundler/bundler/issues/5322 and I've provided a git repository that allows you to simulat

Re: [PATCH 1/2] asciidoctor: fix user-manual to be built by `asciidoctor`

2017-01-12 Thread Johannes Schindelin
Hi Junio, On Tue, 10 Jan 2017, Junio C Hamano wrote: > Jeff King writes: > > > On Sat, Jan 07, 2017 at 02:03:30PM -0800, Junio C Hamano wrote: > > > >> Is that a longer way to say that the claim "... is designed as a > >> book" is false? > >> > >> > So I dunno. I really do think "article" is c

[PATCH] imap-send.c: Avoid deprecated openssl 1.1.0 API

2017-01-12 Thread eroen
Library initialization functions are deprecated in openssl 1.1.0 API, as initialization is handled by openssl internally. Symbols for deprecated functions are not exported if openssl is built with `--api=1.1 disable-deprecated`, so their use will cause a build failure. Reported-by: Lars Wendler (

Re: [PATCH 2/2] Use 'env' to find perl instead of fixed path

2017-01-12 Thread Johannes Schindelin
Hi Pat, On Thu, 12 Jan 2017, Pat Pannuto wrote: > I'm not at all attached to changing all of them, just figured it made > sense while I was here. > > Would a patch that changes only: > > git-add--interactive.perl | 2 +- > git-archimport.perl | 2 +

Re: [PATCH 0/5] extend git-describe pattern matching

2017-01-12 Thread Johannes Schindelin
Hi Jake, On Wed, 11 Jan 2017, Jacob Keller wrote: > From: Jacob Keller > > Teach git describe and git name-rev the ability to match multiple > patterns inclusively. Additionally, teach these commands to also accept > negative patterns to discard any refs which match. I like the idea, and I thi

Re: [PATCH 3/5] name-rev: add support to discard refs by pattern match

2017-01-12 Thread Johannes Schindelin
Hi Jake, On Wed, 11 Jan 2017, Jacob Keller wrote: > From: Jacob Keller > > Extend name-rev further to support matching refs by adding `--discard` > patterns. Same comment applies as for 5/5: `--exclude-refs` may be a better name than `--discard`. Ciao, Dscho

Re: [PATCH 2/5] name-rev: extend --refs to accept multiple patterns

2017-01-12 Thread Johannes Schindelin
Hi Jake, On Wed, 11 Jan 2017, Jacob Keller wrote: > diff --git a/t/t6007-rev-list-cherry-pick-file.sh > b/t/t6007-rev-list-cherry-pick-file.sh > index 1408b608eb03..d072ec43b016 100755 > --- a/t/t6007-rev-list-cherry-pick-file.sh > +++ b/t/t6007-rev-list-cherry-pick-file.sh > @@ -99,6 +99,36 @@

Re: [PATCH 1/5] doc: add documentation for OPT_STRING_LIST

2017-01-12 Thread Johannes Schindelin
Hi Jake, On Wed, 11 Jan 2017, Jacob Keller wrote: > diff --git a/Documentation/technical/api-parse-options.txt > b/Documentation/technical/api-parse-options.txt > index 27bd701c0d68..15e876e4c804 100644 > --- a/Documentation/technical/api-parse-options.txt > +++ b/Documentation/technical/api-par

Re: [PATCH 5/5] describe: teach describe negative pattern matches

2017-01-12 Thread Johannes Schindelin
Hi Jake, On Wed, 11 Jan 2017, Jacob Keller wrote: > From: Jacob Keller > > Teach git-describe the `--discard` option which will allow specifying > a glob pattern of tags to ignore. IMHO "discard" is the wrong word, it almost sounds as if the matching tags would be *deleted*. Maybe `--exclude`

git fast-import crashing on big imports

2017-01-12 Thread Ulrich Spörlein
Hey, the FreeBSD svn2git conversion is crashing somewhat non-deterministically during its long conversion process. From memory, this was not as bad is it is with more recent versions of git (but I can't be sure, really). I have a dump file that you can grab at http://scan.spoerlein.net/pub/freebs

Re: [PATCH 0/2] Use env for all perl invocations

2017-01-12 Thread Junio C Hamano
Pat Pannuto writes: > It feels weird to me that the perl path is fixed at > compile/install-time as opposed to run-time discovery -- this means > users can't change their perl install without breaking git? Among the software packages that use interpreters like perl, python, ruby, etc., there are