From Lyrix Gold Mining Sarl

2017-01-27 Thread Raw Gold Aavailable
Dearest Gold Purchaser, We are Local Miners of Kenyeba and Tabakoto region in Mali who can visit us here for the TTM via face to face inspect of the product and confirmation of purity, We have gold in raw bars form, and we are looking for a serious buyers to buy our gold also sign a long term

Re: show all merge conflicts

2017-01-27 Thread G. Sylvie Davies
On Fri, Jan 27, 2017 at 9:51 AM, Jeff King wrote: > On Fri, Jan 27, 2017 at 11:56:08AM -0500, Michael Spiegel wrote: > >> I'm trying to determine whether a merge required a conflict to resolve >> after the merge has occurred. The git book has some advice >>

Re: [PATCH v5 1/3] color.c: fix color_parse_mem() with value_len == 0

2017-01-27 Thread Jeff King
On Thu, Jan 19, 2017 at 11:38:41AM -0500, Jeff King wrote: > On Thu, Jan 19, 2017 at 06:41:21PM +0700, Nguyễn Thái Ngọc Duy wrote: > > > In this code we want to match the word "reset". If len is zero, > > strncasecmp() will return zero and we incorrectly assume it's "reset" as > > a result. > >

Re: difflame

2017-01-27 Thread Jeff King
On Tue, Jan 17, 2017 at 11:24:02PM -0600, Edmundo Carmona Antoranz wrote: > For a very long time I had wanted to get the output of diff to include > blame information as well (to see when something was added/removed). This is something I've wanted, too. The trickiest part, though, is blaming

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

2017-01-27 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

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

2017-01-27 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 ---

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

2017-01-27 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

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

2017-01-27 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

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

2017-01-27 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

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

2017-01-27 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

[PATCH v3 25/27] attr: store attribute stack in attr_check structure

2017-01-27 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 stored locally in each attr_check instance. This opens up

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

2017-01-27 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

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

2017-01-27 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 v3 20/27] attr: change validity check for attribute names to use positive logic

2017-01-27 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

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

2017-01-27 Thread Brandon Williams
Signed-off-by: Brandon Williams --- attr.c | 12 ++-- attr.h | 2 +- builtin/check-attr.c | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/attr.c b/attr.c index 8f4402ef3..69643ae77 100644 --- a/attr.c +++ b/attr.c

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

2017-01-27 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

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

2017-01-27 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

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

2017-01-27 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

[PATCH v3 12/27] Documentation: fix a typo

2017-01-27 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

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

2017-01-27 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 +

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

2017-01-27 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

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

2017-01-27 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

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

2017-01-27 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

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

2017-01-27 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

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

2017-01-27 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:

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

2017-01-27 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

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

2017-01-27 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:

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

2017-01-27 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

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

2017-01-27 Thread Brandon Williams
Per some of the discussion online and off I locally broke up up the question and answer and I wasn't very thrilled with the outcome for a number of reasons. 1. The API is more complex. Callers needs to have two structures allocated instead of one, one can be shared read-only while the other

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

2017-01-27 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

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

2017-01-27 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

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

2017-01-27 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

Re: [PATCH 1/2] pack-objects: enforce --depth limit in reused deltas

2017-01-27 Thread Junio C Hamano
Jeff King writes: >> > +#On the receiving end, "index-pack --fix-thin" will >> > +#complete the pack with a base copy of tree X-1. >> >> blob? tree? I think the argument would work the same way for either >> type of objects, but the previous paragraph is using blob as the

Re: [PATCH v2 1/1] reset: support the --stdin option

2017-01-27 Thread Junio C Hamano
Jeff King writes: > I think a lot of the documentation uses to refer to pathspecs > (e.g., git-log(1), git-diff(1), etc). As long as we're consistent with > that convention, I don't think it's that big a deal. > > This spot needs a specific mention because it violates the

Re: [PATCH 1/2] pack-objects: enforce --depth limit in reused deltas

2017-01-27 Thread Jeff King
On Fri, Jan 27, 2017 at 03:31:36PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > Since 898b14c (pack-objects: rework check_delta_limit usage, > > 2007-04-16), we check the delta depth limit only when > > figuring out whether we should make a new delta. We don't > >

Re: Deadlock between git-remote-http and git fetch-pack

2017-01-27 Thread Junio C Hamano
tsuna writes: > While investigating a hung job in our CI system today, I think I found > a deadlock in git-remote-http > ... > Here PID 27319 (git fetch-pack) is stuck reading on stdin, while its > parent, PID 27317 (git-remote-http) is stuck reading on its child’s > stdout.

Re: [PATCH 1/2] pack-objects: enforce --depth limit in reused deltas

2017-01-27 Thread Junio C Hamano
Jeff King writes: > Since 898b14c (pack-objects: rework check_delta_limit usage, > 2007-04-16), we check the delta depth limit only when > figuring out whether we should make a new delta. We don't > consider it at all when reusing deltas, which means that > packing once with

Re: Deadlock between git-remote-http and git fetch-pack

2017-01-27 Thread Jonathan Tan
On 01/27/2017 02:31 PM, tsuna wrote: Hi there, While investigating a hung job in our CI system today, I think I found a deadlock in git-remote-http Git version: 2.9.3 Linux (amd64) kernel 4.9.0 Excerpt from the process list: jenkins 27316 0.0 0.0 18508 6024 ?S19:30 0:00 |

Deadlock between git-remote-http and git fetch-pack

2017-01-27 Thread tsuna
Hi there, While investigating a hung job in our CI system today, I think I found a deadlock in git-remote-http Git version: 2.9.3 Linux (amd64) kernel 4.9.0 Excerpt from the process list: jenkins 27316 0.0 0.0 18508 6024 ?S19:30 0:00 | \_ git -C

Re: [PATCH v2 1/1] reset: support the --stdin option

2017-01-27 Thread Jeff King
On Fri, Jan 27, 2017 at 10:30:48AM -0800, Junio C Hamano wrote: > > Is it worth clarifying that these are paths, not pathspecs? The word > > "paths" is used to refer to the pathspecs on the command-line elsewhere > > in the document. > > If the code forces literal pathspecs, then what the user

[PATCH 2/2] pack-objects: convert recursion to iteration in break_delta_chain()

2017-01-27 Thread Jeff King
The break_delta_chain() function is recursive over the depth of a given delta chain, which can lead to possibly running out of stack space. Normally delta depth is quite small, but if there _is_ a pathological case, this is where we would find and fix it, so we should be more careful. We can do

[PATCH 0/2] limit reused delta chains based on --depth

2017-01-27 Thread Jeff King
Back when we switched pack-objects to visiting packs in most-recently-used order last August, we realized that this could reuse cross-pack deltas, and that the result could have longer delta chains than any single pack contains. I produced a patch back then[1], but we decided not to follow

[PATCH 1/2] pack-objects: enforce --depth limit in reused deltas

2017-01-27 Thread Jeff King
Since 898b14c (pack-objects: rework check_delta_limit usage, 2007-04-16), we check the delta depth limit only when figuring out whether we should make a new delta. We don't consider it at all when reusing deltas, which means that packing once with --depth=250, and then again with --depth=50, the

Re: octopus merge --no-ff claims to fast-forward even though it doesn't

2017-01-27 Thread Junio C Hamano
Samuel Lijin writes: > I was doing an octopus merge earlier and noticed that it claims to > fast-forward when you specify --no-ff, even though it does actually > abide by --no-ff. This was intentional and hasn't changed since it was first designed; the octopus was to be used

Re: [PATCH] doc: clarify distinction between sign-off and pgp-signing

2017-01-27 Thread Junio C Hamano
Cornelius Weig writes: > Sorry, I forgot to mark this patch as follow-up to message > I appreciate that you are very considerate, but in practice, if you do not have too many topics in flight and your response time is

Re: [PATCH] doc: clarify distinction between sign-off and pgp-signing

2017-01-27 Thread Philip Oakley
From: "Stefan Beller" On Fri, Jan 27, 2017 at 12:01 PM, wrote: From: Cornelius Weig The documentation for submission discourages pgp-signing, but demands a proper sign-off by contributors. However, when skimming

[PATCH v2 0/7] completion: recognize more long-options

2017-01-27 Thread cornelius . weig
From: Cornelius Weig This revision addresses Johannes' concerns. Changes wrt v1: - fixed the commit message: two of the "dangerous" options erroneously ended up in the commit message. These options were already in the list of auto-completable options. -

[PATCH v2 7/7] completion: recognize more long-options

2017-01-27 Thread cornelius . weig
From: Cornelius Weig Recognize several new long-options for bash completion in the following commands: - apply: --recount --directory= - archive: --output - branch: --column --no-column --sort= --points-at - clone: --no-single-branch --shallow-submodules -

Re: [PATCH] doc: clarify distinction between sign-off and pgp-signing

2017-01-27 Thread Stefan Beller
On Fri, Jan 27, 2017 at 12:48 PM, Cornelius Weig wrote: >> >> So maybe s/signed-off-by/helped-by/? >> > > This is getting real complex :-/ uh; sorry for that. I do not mind the patch as posted, just in case you reroll for another reason, this is worth thinking about.

Re: [PATCH] test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/

2017-01-27 Thread Junio C Hamano
Junio C Hamano writes: > Johannes Schindelin writes: >> On Thu, 21 Jul 2016, Eric Wong wrote: >> >>> Thanks, t5003 now works out-of-the-box. >>> Tested with Info-ZIP unzip installed and uninstalled. >>> >>> Tested-by: Eric Wong >>

Re: [PATCH] doc: clarify distinction between sign-off and pgp-signing

2017-01-27 Thread Cornelius Weig
> > So maybe s/signed-off-by/helped-by/? > This is getting real complex :-/ As I said in the notes for the patch: >> As I don't know what is appropriate, I took the liberty to add >> everybody's >> sign-off who was involved in the discussion in alphabetic order. With your

octopus merge --no-ff claims to fast-forward even though it doesn't

2017-01-27 Thread Samuel Lijin
I was doing an octopus merge earlier and noticed that it claims to fast-forward when you specify --no-ff, even though it does actually abide by --no-ff. I can consistently reproduce as follows: $ git clone https://github.com/sxlijin/merge-octopus-experiment $ cd merge-octopus-experiment $ git

Re: [PATCH 11/12] receive-pack: treat namespace .have lines like alternates

2017-01-27 Thread Junio C Hamano
Jeff King writes: > On Fri, Jan 27, 2017 at 06:45:26PM +0100, Lukas Fleischer wrote: > >> I think this is already possible using receive.hideRefs (which causes >> the ref_is_hidden() branch above to return if applicable). >> ... > > Thanks for the pointers. I think a "turn off

Re: [PATCH] doc: clarify distinction between sign-off and pgp-signing

2017-01-27 Thread Stefan Beller
On Fri, Jan 27, 2017 at 12:01 PM, wrote: > From: Cornelius Weig > > The documentation for submission discourages pgp-signing, but demands > a proper sign-off by contributors. However, when skimming the headings, > the wording of the

[PATCH] doc: clarify distinction between sign-off and pgp-signing

2017-01-27 Thread cornelius . weig
From: Cornelius Weig The documentation for submission discourages pgp-signing, but demands a proper sign-off by contributors. However, when skimming the headings, the wording of the section for sign-off could mistakenly be understood as concerning pgp-signing. Thus,

Re: [PATCH] doc: clarify distinction between sign-off and pgp-signing

2017-01-27 Thread Cornelius Weig
Sorry, I forgot to mark this patch as follow-up to message

Re: [PATCH v4] t/Makefile: add a rule to re-run previously-failed tests

2017-01-27 Thread Junio C Hamano
Johannes Schindelin writes: > This patch automates the process of determining which tests failed > previously and re-running them. > ... > > Signed-off-by: Johannes Schindelin I stored both versions in files and compared them, and it

Re: [PATCH] test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/

2017-01-27 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Junio, > > On Thu, 21 Jul 2016, Eric Wong wrote: > >> Johannes Schindelin wrote: >> > The common work-around is to install Info-Zip on FreeBSD, into >> > /usr/local/bin/. >> > >> > Signed-off-by: Johannes

Re: [PATCH] help: correct behavior for is_executable on Windows

2017-01-27 Thread Junio C Hamano
Johannes Schindelin writes: > From: Heiko Voigt > > The previous implementation said that the filesystem information on > Windows is not reliable to determine whether a file is executable. To > gather this information it was peeking into the first

Re: [PATCH v2 1/1] reset: support the --stdin option

2017-01-27 Thread Junio C Hamano
Jeff King writes: > A few minor suggestions: > >> +--stdin:: >> +Instead of taking list of paths from the command line, >> +read list of paths from the standard input. Paths are >> +separated by LF (i.e. one path per line) by default. >> + >> +-z:: >> +Only

Re: [PATCH] mingw: allow hooks to be .exe files

2017-01-27 Thread Stefan Beller
On Fri, Jan 27, 2017 at 2:29 AM, Johannes Schindelin wrote: > Hi Junio, > > On Thu, 26 Jan 2017, Junio C Hamano wrote: > >> Johannes Schindelin writes: >> >> > On Wed, 25 Jan 2017, Jeff King wrote: >> > >> >> On Wed, Jan 25, 2017 at

Re: [PATCH 11/12] receive-pack: treat namespace .have lines like alternates

2017-01-27 Thread Jeff King
On Fri, Jan 27, 2017 at 06:45:26PM +0100, Lukas Fleischer wrote: > > This is an unrelated tangent, but there may want to be a knob to > > make the code return here without even showing, to make the > > advertisement even smaller and also to stop miniscule information > > leakage? If the

Re: [PATCH v2 3/3] connect: Add the envvar GIT_SSH_VARIANT and ssh.variant config

2017-01-27 Thread Junio C Hamano
Just to save us extra round-trip. Junio C Hamano writes: >> +`GIT_SSH_VARIANT`:: >> +If this environment variable is set, it overrides the autodetection >> +of plink/tortoiseplink in the SSH command that 'git fetch' and 'git >> +push' use. It can be set to either

Re: [PATCH 2/2] use absolute_pathdup()

2017-01-27 Thread Junio C Hamano
René Scharfe writes: > Hi Dscho, > > Am 27.01.2017 um 11:21 schrieb Johannes Schindelin: >> On Thu, 26 Jan 2017, René Scharfe wrote: >>> Apply the symantic patch for converting callers that duplicate the >> >> s/symantic/semantic/ > > thank you! I wonder where this came from. And

Re: [PATCH v3] t/Makefile: add a rule to re-run previously-failed tests

2017-01-27 Thread Johannes Schindelin
Hi Peff, On Fri, 27 Jan 2017, Jeff King wrote: > On Fri, Jan 27, 2017 at 03:17:36PM +0100, Johannes Schindelin wrote: > > > This patch automates the process of determinig which tests failed > > previously and re-running them. > > s/determinig/determining/ Fixed in v4, Johannes

Re: [PATCH v2 1/1] reset: support the --stdin option

2017-01-27 Thread Jeff King
On Fri, Jan 27, 2017 at 06:34:46PM +0100, Johannes Schindelin wrote: > > Is it worth clarifying that these are paths, not pathspecs? The word > > "paths" is used to refer to the pathspecs on the command-line elsewhere > > in the document. > > > > It might also be worth mentioning the quoting

Re: [PATCH 11/12] receive-pack: treat namespace .have lines like alternates

2017-01-27 Thread Lukas Fleischer
On Wed, 25 Jan 2017 at 20:51:17, Junio C Hamano wrote: > [...] > > diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c > > index 8f8762e4a..c55e2f993 100644 > > --- a/builtin/receive-pack.c > > +++ b/builtin/receive-pack.c > > @@ -251,8 +251,9 @@ static void show_ref(const char *path,

Re: [PATCH] fixup! worktree move: new command

2017-01-27 Thread Junio C Hamano
Johannes Schindelin writes: > always been discussed on the mailing list, I would like to kindly ask you > to please add this patch to the nd/worktree-move branch for the time being > (i.e. until Duy responds), The tip of 'pu' (or anything beyond the tip of 'jch') is

Re: show all merge conflicts

2017-01-27 Thread Jeff King
On Fri, Jan 27, 2017 at 11:56:08AM -0500, Michael Spiegel wrote: > I'm trying to determine whether a merge required a conflict to resolve > after the merge has occurred. The git book has some advice > (https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging) to use > `git show` on the merge

Re: [PATCH v3 4/4] urlmatch: allow globbing for the URL host part

2017-01-27 Thread Junio C Hamano
Patrick Steinhardt writes: >> This is probably a useful improvement. >> >> Having said that, when I mentioned "glob", I meant to also support >> something like this: >> >> https://www[1-4].ibm.com/ > > The problem with additional extended syntax like proposed

Re: SubmittingPatches: drop temporal reference for PGP signing

2017-01-27 Thread Junio C Hamano
Cornelius Weig writes: > -Do not PGP sign your patch, -at least for now-. Most likely, your (...) > +Do not PGP sign your patch. Most likely, your maintainer or other (...) It has been quite a while since we wrote that "at least for now", so it probably makes sense

[PATCH v3 0/1] Support `git reset --stdin`

2017-01-27 Thread Johannes Schindelin
This feature was missing, and made it cumbersome for third-party tools to reset a lot of paths in one go. Support for --stdin has been added, following builtin/checkout-index.c's example. Changes since v2: - the documentation clarifies that --stdin does not treat the input as pathspecs - the

Urgent Assistance

2017-01-27 Thread Tony Manssa
Meine Liebste, Ich bin Barrister Tony Manssa Rechtsanwalt, ich suche Ihr Vertrauen, um für die Hinterlegung Klage Erbschaftsgeld von meinem verstorbenen Klienten eine Staatsangehörigkeit Ihres Landes zu beantragen, die hier in Lome, Republik Togo lebte viele Jahre, bis er leider mit seinem

[PATCH v3 1/1] reset: support the --stdin option

2017-01-27 Thread Johannes Schindelin
Just like with other Git commands, this option makes it read the paths from the standard input. It comes in handy when resetting many, many paths at once and wildcards are not an option (e.g. when the paths are generated by a tool). Note: we first parse the entire list and perform the actual

show all merge conflicts

2017-01-27 Thread Michael Spiegel
Hi folks, I'm trying to determine whether a merge required a conflict to resolve after the merge has occurred. The git book has some advice (https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging) to use `git show` on the merge commit or use `git log --cc -p -1`. These strategies work when the

[PATCH v4] t/Makefile: add a rule to re-run previously-failed tests

2017-01-27 Thread Johannes Schindelin
This patch automates the process of determining which tests failed previously and re-running them. While developing patch series, it is a good practice to run the test suite from time to time, just to make sure that obvious bugs are caught early. With complex patch series, it is common to run

Re: [PATCH v2] git-p4: Fix git-p4.mapUser on Windows

2017-01-27 Thread Junio C Hamano
George Vanburgh writes: > From: George Vanburgh > > When running git-p4 on Windows, with multiple git-p4.mapUser entries in > git config - no user mappings are applied to the generated repository. > ... > Using splitlines solves this issue, by

Re: [PATCH v2 1/1] reset: support the --stdin option

2017-01-27 Thread Johannes Schindelin
Hi Peff, On Fri, 27 Jan 2017, Jeff King wrote: > On Fri, Jan 27, 2017 at 01:38:55PM +0100, Johannes Schindelin wrote: > > A few minor suggestions: > > > +--stdin:: > > + Instead of taking list of paths from the command line, > > + read list of paths from the standard input. Paths are > >

Re: [PATCH v3] t/Makefile: add a rule to re-run previously-failed tests

2017-01-27 Thread Jeff King
On Fri, Jan 27, 2017 at 03:17:36PM +0100, Johannes Schindelin wrote: > This patch automates the process of determinig which tests failed > previously and re-running them. s/determinig/determining/ Patch otherwise looks good, and I'm happy to be rid of the sed complexity from v2. -Peff

Re: [PATCH v2 1/1] reset: support the --stdin option

2017-01-27 Thread Jeff King
On Fri, Jan 27, 2017 at 01:38:55PM +0100, Johannes Schindelin wrote: > Just like with other Git commands, this option makes it read the paths > from the standard input. It comes in handy when resetting many, many > paths at once and wildcards are not an option (e.g. when the paths are > generated

Re: [PATCH 2/2] use absolute_pathdup()

2017-01-27 Thread René Scharfe
Hi Dscho, Am 27.01.2017 um 11:21 schrieb Johannes Schindelin: On Thu, 26 Jan 2017, René Scharfe wrote: Apply the symantic patch for converting callers that duplicate the s/symantic/semantic/ thank you! I wonder where this came from. And where my spellchecker went without as much as a

[PATCH v3] t/Makefile: add a rule to re-run previously-failed tests

2017-01-27 Thread Johannes Schindelin
This patch automates the process of determinig which tests failed previously and re-running them. While developing patch series, it is a good practice to run the test suite from time to time, just to make sure that obvious bugs are caught early. With complex patch series, it is common to run

Re: [PATCH] test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/

2017-01-27 Thread Johannes Schindelin
Hi Junio, On Thu, 21 Jul 2016, Eric Wong wrote: > Johannes Schindelin wrote: > > The common work-around is to install Info-Zip on FreeBSD, into > > /usr/local/bin/. > > > > Signed-off-by: Johannes Schindelin > > Thanks, t5003 now works

[PATCH] help: correct behavior for is_executable on Windows

2017-01-27 Thread Johannes Schindelin
From: Heiko Voigt The previous implementation said that the filesystem information on Windows is not reliable to determine whether a file is executable. To gather this information it was peeking into the first two bytes of a file to see whether it looks executable. Apart from

[PATCH v2 0/1] Support `git reset --stdin`

2017-01-27 Thread Johannes Schindelin
This feature was missing, and made it cumbersome for third-party tools to reset a lot of paths in one go. Support for --stdin has been added, following builtin/checkout-index.c's example. Changes since v1: - adjusted commit message to explain why we read everything before resetting - fixed

[PATCH v2 1/1] reset: support the --stdin option

2017-01-27 Thread Johannes Schindelin
Just like with other Git commands, this option makes it read the paths from the standard input. It comes in handy when resetting many, many paths at once and wildcards are not an option (e.g. when the paths are generated by a tool). Note: we first parse the entire list and perform the actual

Re: [PATCH] fixup! worktree move: new command

2017-01-27 Thread Johannes Schindelin
Hi Junio, On Wed, 25 Jan 2017, Johannes Schindelin wrote: > This is required for the test to pass on Windows, where $TRASH_DIRECTORY > is a POSIX path, while Git works with Windows paths instead. Using > `$(pwd)` is the common workaround: it reports a Windows path (while `$PWD` > would report

Re: [PATCH v2 1/1] status: be prepared for not-yet-started interactive rebase

2017-01-27 Thread Johannes Schindelin
Hi Stefan, On Thu, 26 Jan 2017, Stefan Beller wrote: > On Thu, Jan 26, 2017 at 8:08 AM, Johannes Schindelin > wrote: > > - if (!f) > > + if (!f) { > > + if (errno == ENOENT) > > + return -1; > >

Re: SubmittingPatches: drop temporal reference for PGP signing

2017-01-27 Thread Cornelius Weig
On 01/26/2017 09:58 PM, Philip Oakley wrote: > From: "Junio C Hamano" >> Cornelius Weig writes: >> >>> How about something along these lines? Does the forward reference >>> break the main line of thought too severly? >> >> I find it a bit

Re: [PATCH v2 3/3] connect: Add the envvar GIT_SSH_VARIANT and ssh.variant config

2017-01-27 Thread Johannes Schindelin
Hi Junio, On Thu, 26 Jan 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > diff --git a/connect.c b/connect.c > > index 9f750eacb6..7b4437578b 100644 > > --- a/connect.c > > +++ b/connect.c > > @@ -691,6 +691,24 @@ static const char

[PATCH v4 5/5] urlmatch: allow globbing for the URL host part

2017-01-27 Thread Patrick Steinhardt
The URL matching function computes for two URLs whether they match not. The match is performed by splitting up the URL into different parts and then doing an exact comparison with the to-be-matched URL. The main user of `urlmatch` is the configuration subsystem. It allows to set certain

[PATCH v4 2/5] urlmatch: enable normalization of URLs with globs

2017-01-27 Thread Patrick Steinhardt
The `url_normalize` function is used to validate and normalize URLs. As such, it does not allow for some special characters to be part of the URLs that are to be normalized. As we want to allow using globs in some configuration keys making use of URLs, namely `http..`, but still normalize them, we

[PATCH v4 4/5] urlmatch: include host and port in urlmatch length

2017-01-27 Thread Patrick Steinhardt
In order to be able to rank positive matches by `urlmatch`, we inspect the path length and user part to decide whether a match is better than another match. As all other parts are matched exactly between both URLs, this is the right thing to do right now. In the future, though, we want to

[PATCH v4 3/5] urlmatch: split host and port fields in `struct url_info`

2017-01-27 Thread Patrick Steinhardt
The `url_info` structure contains information about a normalized URL with the URL's components being represented by different fields. The host and port part though are to be accessed by the same `host` field, so that getting the host and/or port separately becomes more involved than really

[PATCH v4 0/5] urlmatch: allow wildcard-based matches

2017-01-27 Thread Patrick Steinhardt
Hi, so this is part four of my patch series. The previous version can be found at [1]. The use case is to be able to configure an HTTP proxy for all subdomains of a domain where there are hundreds of subdomains. Changes to the previous version: - applied Junio's proposed patch to replace

[PATCH v4 1/5] mailmap: add Patrick Steinhardt's work address

2017-01-27 Thread Patrick Steinhardt
Signed-off-by: Patrick Steinhardt --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 9c87a3840..ea59205b9 100644 --- a/.mailmap +++ b/.mailmap @@ -177,6 +177,7 @@ Paolo Bonzini

Re: [PATCH] mingw: allow hooks to be .exe files

2017-01-27 Thread Johannes Schindelin
Hi Junio, On Thu, 26 Jan 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Wed, 25 Jan 2017, Jeff King wrote: > > > >> On Wed, Jan 25, 2017 at 05:58:42PM +0100, Johannes Schindelin wrote: > >> > >> > -if (access(path.buf, X_OK) < 0) > >> >

[PATCH v3 1/3] config: add markup to core.logAllRefUpdates doc

2017-01-27 Thread cornelius . weig
From: Cornelius Weig Signed-off-by: Cornelius Weig --- Notes: Changes wrt v2: Remove duplicated line. Documentation/config.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

[PATCH v3 2/3] refs: add option core.logAllRefUpdates = always

2017-01-27 Thread cornelius . weig
From: Cornelius Weig When core.logallrefupdates is true, we only create a new reflog for refs that are under certain well-known hierarchies. The reason is that we know that some hierarchies (like refs/tags) are not meant to change, and that unknown hierarchies might

Re: [PATCH 2/2] use absolute_pathdup()

2017-01-27 Thread Johannes Schindelin
Hi René, On Thu, 26 Jan 2017, René Scharfe wrote: > Apply the symantic patch for converting callers that duplicate the s/symantic/semantic/ Ciao, Dscho

  1   2   >