[PATCH] Makefile: put LIBS after LDFLAGS for imap-send

2017-01-07 Thread Steven Penny
This matches up with the targets git-%, git-http-fetch, git-http-push and git-remote-testsvn. It must be done this way on Windows else lcrypto cannot find lgdi32 and lws2_32 Signed-off-by: Steven Penny --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

Re: "git fsck" not detecting garbage at the end of blob object files...

2017-01-07 Thread Jeff King
On Sat, Jan 07, 2017 at 10:47:03PM +0100, Dennis Kaarsemaker wrote: > On Sat, 2017-01-07 at 07:50 -0500, John Szakmeister wrote: > > I was perusing StackOverflow this morning and ran across this > > question: > >

Re: [PATCH 0/3] fixing some random blame corner cases

2017-01-07 Thread Junio C Hamano
Jeff King writes: > [1/3]: blame: fix alignment with --abbrev=40 > [2/3]: blame: handle --no-abbrev > [3/3]: blame: output porcelain "previous" header for each file Thanks. 1 & 2 obviously look correct. I'd need to look at 3 when I am not exhausted, even though I expect it

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

2017-01-07 Thread Jeff King
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 conceptually the most > > appropriate style, but I agree that there are some book-like things > >

Re: [PATCH] rebase--interactive: count squash commits above 10 correctly

2017-01-07 Thread Junio C Hamano
Jeff King writes: > git-rebase--interactive.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > index b0a6f2b7ba..4734094a3f 100644 > --- a/git-rebase--interactive.sh > +++

Re: [PATCH v5 0/5] road to reentrant real_path

2017-01-07 Thread Junio C Hamano
Brandon Williams writes: > changes in v5: > * set errno to ELOOP when MAXSYMLINKS is exceded. > * revert to use MAXSYMLINKS instead of MAXDEPTH. > * If the OS hasn't defined MAXSYMLINKS, use a fallback value of 32. > > Brandon Williams (4): > real_path: resolve symlinks by

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

2017-01-07 Thread Junio C Hamano
Pranit Bauva writes: >> diff --git a/diff.c b/diff.c >> index 84dba60c4..40b4e6afe 100644 >> --- a/diff.c >> +++ b/diff.c >> @@ -33,6 +33,7 @@ static int diff_rename_limit_default = 400; >> static int diff_suppress_blank_empty; >> static int diff_use_color_default = -1;

Re: [PATCH] connect: handle putty/plink also in GIT_SSH_COMMAND

2017-01-07 Thread Junio C Hamano
Johannes Schindelin writes: > + if (ssh) { > + char *split_ssh = xstrdup(ssh); > + const char **ssh_argv; > + > + if (split_cmdline(split_ssh, _argv)) > +

Re: [PATCH v2 05/34] sequencer (rebase -i): learn about the 'verbose' mode

2017-01-07 Thread Junio C Hamano
Junio C Hamano writes: > Johannes Schindelin writes: > > ... >> >> I guess my only defence is that I tried to be a little lazy. > > I actually was alluding to going the other way around, spawning > "diff-tree -p" in the other codepath like this one

Re: [PATCH 0/3] fix ^C killing pager when running alias

2017-01-07 Thread Jacob Keller
On Sat, Jan 7, 2017 at 3:26 PM, Jacob Keller wrote: > On Fri, Jan 6, 2017 at 5:14 PM, Jeff King wrote: >> On Fri, Jan 06, 2017 at 06:20:42PM -0500, Jeff King wrote: >> >>> > In general, I think it is wrong to wait for child processes when a signal >>> > was

Re: [PATCH 0/3] fix ^C killing pager when running alias

2017-01-07 Thread Jacob Keller
On Fri, Jan 6, 2017 at 5:14 PM, Jeff King wrote: > On Fri, Jan 06, 2017 at 06:20:42PM -0500, Jeff King wrote: > >> > In general, I think it is wrong to wait for child processes when a signal >> > was received. After all, it is the purpose of a (deadly) signal to have the >> >

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

2017-01-07 Thread brian m. carlson
On Thu, Jan 05, 2017 at 11:45:57AM -0500, Jeff King wrote: > On Thu, Jan 05, 2017 at 11:05:29AM +0100, Lars Schneider wrote: > > > > The git-scm.com site uses asciidoctor, too, and I think I have seen some > > > oddness with the rendering though. So in general I am in favor of making > > > things

Re: [PATCH 2/2] giteveryday: unbreak rendering with AsciiDoctor

2017-01-07 Thread Junio C Hamano
Jeff King writes: > On Mon, Jan 02, 2017 at 05:04:05PM +0100, Johannes Schindelin wrote: > >> The "giteveryday" document has a callout list that contains a code >> block. This is not a problem for AsciiDoc, but AsciiDoctor sadly was >> explicitly designed *not* to render this

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

2017-01-07 Thread Junio C Hamano
Jeff King writes: > On Mon, Jan 02, 2017 at 05:03:57PM +0100, Johannes Schindelin wrote: > >> From: =?UTF-8?q?=EB=A7=88=EB=88=84=EC=97=98?= >> >> The `user-manual.txt` is designed as a `book` but the `Makefile` wants >> to build it as an `article`. This

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

2017-01-07 Thread Junio C Hamano
Jeff King writes: > As far as CI goes, I am not altogether convinced of the usefulness of > building the documentation. It's very expensive, and the failure mode is > rarely "whoops, running `make doc` failed". It's almost always that the > output looks subtly wrong, but that's

Re: [PATCH v2 05/34] sequencer (rebase -i): learn about the 'verbose' mode

2017-01-07 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Junio, > > On Tue, 13 Dec 2016, Junio C Hamano wrote: > >> Johannes Schindelin writes: >> >> > @@ -1493,9 +1498,26 @@ static int pick_commits(struct todo_list >> > *todo_list, struct replay_opts *opts) >>

Re: "git fsck" not detecting garbage at the end of blob object files...

2017-01-07 Thread Dennis Kaarsemaker
On Sat, 2017-01-07 at 07:50 -0500, John Szakmeister wrote: > I was perusing StackOverflow this morning and ran across this > question: > http://stackoverflow.com/questions/41521143/git-fsck-full-only-checking-directories/ > > It was a simple question about why "checking objects" was not >

Re: [PATCH v3 14/21] read-cache: touch shared index files when used

2017-01-07 Thread Junio C Hamano
Christian Couder writes: > So what should we do if freshen_file() returns 0 which means that the > freshening failed? You tell me ;-) as you are the one who is proposing this feature. Isn't a failure to freshen it a grave error? We are letting a base/shared index

[PATCH] Makefile: POSIX windres

2017-01-07 Thread Steven Penny
When environment variable POSIXLY_CORRECT is set, the "input -o output" syntax is not supported. http://cygwin.com/ml/cygwin/2017-01/msg00036.html Signed-off-by: Steven Penny --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile

Re: [PATCH v3 08/21] Documentation/git-update-index: talk about core.splitIndex config var

2017-01-07 Thread Junio C Hamano
Christian Couder writes: > It feels strange that when I do things one way, you suggest another > way, and the next time in a similar situation when I do things the way > you suggested previously, then you suggest the way I did it initially > the first time... Perhaps

Re: [PATCH] don't use test_must_fail with grep

2017-01-07 Thread Junio C Hamano
Pranit Bauva writes: > Hey Johannes, > > On Sun, Jan 1, 2017 at 8:20 PM, Johannes Sixt wrote: >> which makes me wonder: Is the message that we do expect not to occur >> actually printed on stdout? It sounds much more like an error message, i.e., >> text

Re: RFC: --force-with-lease default behaviour

2017-01-07 Thread Junio C Hamano
"G. Sylvie Davies" writes: > I wonder if there's anything one could do to help those who type "git > fetch" and still want to enjoy "--force-with-lease"... The entire idea behind "force-with-lease" is that you plan to later force update the tip of a branch at the remote

Re:

2017-01-07 Thread Information
Do you need loan? we offer all kinds of loan from minimum amount of $5,000 to maximum of $2,000,000 if you are interested contact us via: internationalloa...@gmail.comwith the information below: Full Name: Country: Loan Amount: Loan Duration: Mobile phone number: Sex: Thanks, Dr Scott.

Re: Git filesystem case-insensitive to case-sensitive system broken

2017-01-07 Thread Torsten Bögershausen
On Fri, Jan 06, 2017 at 01:56:36PM -0800, Steven Robertson wrote: > Hello, > > I was doing development on a linux box on AWS, when we found a code > bug that had me switching to running the code on a Mac instead. We > discovered that we had accidentally named two files the same when > looked at

"git fsck" not detecting garbage at the end of blob object files...

2017-01-07 Thread John Szakmeister
I was perusing StackOverflow this morning and ran across this question: http://stackoverflow.com/questions/41521143/git-fsck-full-only-checking-directories/ It was a simple question about why "checking objects" was not appearing, but in it was another issue. The user purposefully corrupted a

Re: [PATCH] rebase--interactive: count squash commits above 10 correctly

2017-01-07 Thread Jeff King
On Sat, Jan 07, 2017 at 11:51:23AM +0100, Johannes Schindelin wrote: > > We can fix this by making the ".*" less greedy. Instead of > > depending on ".*?" working portably, we can just limit the > > match to non-digit characters, which accomplishes the same > > thing. > > Or we could simply

Re: [PATCH] rebase--interactive: count squash commits above 10 correctly

2017-01-07 Thread Johannes Schindelin
Hi Peff, On Sat, 7 Jan 2017, Jeff King wrote: > On Fri, Jan 06, 2017 at 01:04:05AM -0800, Brandon Tolsch wrote: > > We can fix this by making the ".*" less greedy. Instead of > depending on ".*?" working portably, we can just limit the > match to non-digit characters, which accomplishes the

Re: [RFC PATCH 0/5] Localise error headers

2017-01-07 Thread Duy Nguyen
On Wed, Jan 4, 2017 at 8:25 PM, Duy Nguyen wrote: > On Wed, Jan 4, 2017 at 2:45 AM, Stefan Beller wrote: >>> In this implementation, the gettext call for the header and the body are >>> done >>> in different places (error function vs. caller) but this call

Re: [PATCH v5 00/16] pathspec cleanup

2017-01-07 Thread Duy Nguyen
On Thu, Jan 5, 2017 at 1:03 AM, Brandon Williams wrote: > Changes in v5: > * Move GUARD_PATHSPEC to prevent checking if pathspec is null twice. > * Mark a string containing 'mnemonic' for translation. Argh.. I've run out of things to complain about! Ack! -- Duy

Re: [PATCH 3/3] execv_dashed_external: wait for child on signal death

2017-01-07 Thread Duy Nguyen
On Sat, Jan 7, 2017 at 8:22 AM, Jeff King wrote: > When you hit ^C to interrupt a git command going to a pager, > this usually leaves the pager running. But when a dashed > external is in use, the pager ends up in a funny state and > quits (but only after eating one more character

[BUG] push sometimes omits status table when remote dies

2017-01-07 Thread Jeff King
If I run t5504 under heavy load, it sometimes fails tests 8 and 9, which make a broken push to the remote. The failure looks like this: expecting success: rm -rf dst && git init dst && ( cd dst && git config

[PATCH] rebase--interactive: count squash commits above 10 correctly

2017-01-07 Thread Jeff King
On Fri, Jan 06, 2017 at 01:04:05AM -0800, Brandon Tolsch wrote: > git --version: 2.11.0 > > When using git rebase -i to squash a series of commits that includes > more than 10 commits, the generated commit message you are given to > edit counts the old messages incorrectly. It will say the