[PATCH 0/5] consistent setup code for external commands

On Fri, Jul 01, 2016 at 12:07:15AM -0400, Jeff King wrote: > Interesting. It's failing on the assert(argv0_path) in system_path(). > > That's part of the RUNTIME_PREFIX code which is built only on Windows, > so this is a Windows-specific issue. > > I can guess the reason that argv0_path is not

Re: [PATCH v4 1/5] t9300: factor out portable "head -c" replacement

On Thursday, June 30, 2016, Jeff King wrote: > In shell scripts it is sometimes useful to be able to read > exactly N bytes from a pipe. Doing this portably turns out > to be surprisingly difficult. > > We want a solution that: > > - is portable > > - never reads more than N

Re: git-credentials-store.exe crash

On Thu, Jun 30, 2016 at 03:24:41PM -0600, d...@ucar.edu wrote: > Carson:part2: git push > This application has requested the Runtime to terminate it in an unusual > way. > Please contact the application's support team for more information. > A s s e r t i o n f a i l e d ! > > P r o g r a m :

Re: topological index field for commit objects

On Thu, Jun 30, 2016 at 11:12:52AM -0700, Linus Torvalds wrote: > I do think that it's ok to cache generation numbers somewhere if there > is an algorithm that can make use of them, but every time this comes > up, it's just not been important enough to make a big deal and a new > incompatible

Re: topological index field for commit objects

On Thu, Jun 30, 2016 at 11:12:52AM -0700, Linus Torvalds wrote: > On Thu, Jun 30, 2016 at 3:30 AM, Jakub Narębski wrote: > > > > P.S. Having Git ensure that committerdate (as an epoch) is greater > > than committerdates of its parents at the commit creation time (with > >

Re: [PATCH v13 11/20] index-helper: use watchman to avoid refreshing index with lstat()

Duy Nguyen gmail.com> writes: > > On Thu, Jun 30, 2016 at 7:55 PM, Ben Peart gmail.com> wrote: > > David Turner novalis.org> writes: > > > >> > >> Hiding watchman behind index-helper means you need both daemons. You > >> can't run watchman alone. Not so good. But on the other hand, 'git' > >>

Re: topological index field for commit objects

W dniu 2016-06-30 o 20:12, Linus Torvalds pisze: > On Thu, Jun 30, 2016 at 3:30 AM, Jakub Narębski wrote: >> >> P.S. Having Git ensure that committerdate (as an epoch) is greater >> than committerdates of its parents at the commit creation time (with >> providing warning about

git-credentials-store.exe crash

Since I cannot submit a github issue, I will try here. - Which version of Git for Windows are you using? 32-bit or 64-bit? Include the output of `git version` as well. git version 2.9.0.windows.1 32-bit - Which version of Windows are you running? 32-bit or 64-bit? 64-bit windows 7 -

Re: Problem with --shallow-submodules option

Hi, Thanks for the clarification, it makes sense now. Thanks, Istvan On 30 June 2016 at 22:57, Stefan Beller wrote: > On Thu, Jun 30, 2016 at 6:27 AM, Istvan Zakar wrote: >> Hello, >> >> Thanks for your answers. I tested it after the changes

Re: Problem with --shallow-submodules option

On Thu, Jun 30, 2016 at 6:27 AM, Istvan Zakar wrote: > Hello, > > Thanks for your answers. I tested it after the changes were made on > the git server, and it seems to be working. But some other issue came > up. > > We have quite many submodules in our project so I did

[PATCH v2 4/4] doc: clarify that `^r1` will exclude `r1` itself

Signed-off-by: Philip Oakley --- Documentation/revisions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index 131060c..87be9c4 100644 --- a/Documentation/revisions.txt +++

[PATCH v2 3/4] doc: give headings for the two and three dot notations

While there, also break out the other shorthand notations and add a title for the revision range summary (which also appears in git-rev-parse, so keep it mixed case). Signed-off-by: Philip Oakley --- Documentation/revisions.txt | 23 +-- 1 file changed,

[PATCH v2 1/4] doc: use 'symmetric difference' consistently

Signed-off-by: Philip Oakley --- Documentation/gitk.txt | 2 +- Documentation/rev-list-options.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index 6ade002..6c3eb15 100644 ---

[PATCH v2 0/4] Name for A..B ranges?

This is the re-roll of the po/range-doc (2016-06-27) 3 commits The order is slightly re-arranged, and an additional patch clarifying that ^r1 excludes r1 itself being added. The heading have been tweaked. Discussion: $gmane/297908 previous patch series $gmane/298223 Philip Oakley (4): doc:

[PATCH v2 2/4] doc: show the actual left, right, and boundary marks

Signed-off-by: Philip Oakley --- Found while checking the 'symmetric difference' documentation --- Documentation/pretty-formats.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index

Re: --abbrev-commit gives longer hash than necessary

Steffen, Git commands generally have a 7 character minimum by default when abbreviating hashes, even if fewer characters are still (currently) unique. Per the documentation: core.abbrev Set the length object names are abbreviated to. If unspecified, many commands abbreviate to 7

--abbrev-commit gives longer hash than necessary

Hello, for your possible interest. For some time (currently with 2.9.0) know see that a single commit gives a longer hash than necessary, even though there is no ambiguity: ?0[steffen@wales ]$ git longca| awk 'BEGIN{l7=0;l8=0}\ /^[[:alnum:]]{7} /{++l7;next}\ /^[[:alnum:]]{8}

Re: [PATCH v13 11/20] index-helper: use watchman to avoid refreshing index with lstat()

On Thu, Jun 30, 2016 at 7:55 PM, Ben Peart wrote: > David Turner novalis.org> writes: > >> >> Hiding watchman behind index-helper means you need both daemons. You >> can't run watchman alone. Not so good. But on the other hand, 'git' >> binary is not linked to watchman/json

Re: topological index field for commit objects

On Thu, Jun 30, 2016 at 3:30 AM, Jakub Narębski wrote: > > P.S. Having Git ensure that committerdate (as an epoch) is greater > than committerdates of its parents at the commit creation time (with > providing warning about time skew, perhaps not doing it if skew is > too large)

Re: [PATCH v13 11/20] index-helper: use watchman to avoid refreshing index with lstat()

David Turner novalis.org> writes: > > Hiding watchman behind index-helper means you need both daemons. You > can't run watchman alone. Not so good. But on the other hand, 'git' > binary is not linked to watchman/json libraries, which is good for > packaging. Core git package will run fine

Re: [PATCH v3 3/3] correct ce_compare_data() in a middle of a merge

On 29.06.16 18:14, Junio C Hamano wrote: > tbo...@web.de writes: > >> From: Torsten Bögershausen >> >> The following didn't work as expected: > > Sorry for being slow (not in response but in understanding), but > let's examine the expectation first. Thanks for the patience.

[PATCH v2] t5541: become resilient to GETTEXT_POISON

Use test_i18n* functions for testing text already marked for translation. Signed-off-by: Vasco Almeida --- Fix typo on v1. Forgot to mention that tests with TTY prerequisite were skipped, I don't know how to run them. Notes: Incremental update for va/i18n-even-more

Re: [PATCH] log: decorate HEAD -> branch with the same color for branch and HEAD

On Thu, Jun 30, 2016 at 6:39 PM, Nguyễn Thái Ngọc Duy wrote: > Commit 76c61fb (log: decorate HEAD with branch name under > --decorate=full, too - 2015-05-13) .. and I got the commit wrong. It should be 51ff0f2 (log: decorate HEAD with branch name - 2015-03-10) adds "HEAD ->

[PATCH] log: decorate HEAD -> branch with the same color for branch and HEAD

Commit 76c61fb (log: decorate HEAD with branch name under --decorate=full, too - 2015-05-13) adds "HEAD -> branch" decoration to show current branch vs detached HEAD. The sign of whether HEAD is detached or not is "->" (vs ", "). It's too subtle for my poor eyes. If color is used, we can make the

[PATCH] t5541: become resilient to GETTEXT_POISON

Use test_i18n* functions for testing text already marked for translation. Signed-off-by: Vasco Almeida --- Incremental update for va/i18n-even-more (merged to 'next' on 2016-06-28 at 5919dfa). I don't know how I didn't catch this one. t/t5541-http-push-smart.sh | 12

Re: [PATCH v4 0/5] Better ref summary alignment in "git fetch"

On Mon, Jun 27, 2016 at 8:43 PM, Jeff King wrote: > I tried it on my most-horrible example case, and the results were...just > OK. Because the variable-length part of each line comes first, the > alignment code means that the "origin/$" bit of every line gets bumped > out. And if

[PATCH] fixup! worktree: add "lock" command

Signed-off-by: Nguyễn Thái Ngọc Duy --- Torsten, this seems to fix the symlink problem for me. How many times have I got similar reports from you and still managed to forget ... t/t2028-worktree-move.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

Re: [PATCH v2 00/12] nd/icase updates

On Mon, Jun 27, 2016 at 4:53 PM, Junio C Hamano wrote: >> diff --git a/grep.c b/grep.c >> index cb058a5..92587a8 100644 >> --- a/grep.c >> +++ b/grep.c >> @@ -432,15 +432,8 @@ static void compile_regexp(struct grep_pat *p, struct >> grep_opt *opt) >> icase =

Re: [RFD] Place to document magic pathspecs like ":/" and pathspec handling

Hi Jakub, Where have you been all these years? :D On Thu, Jun 30, 2016 at 11:42 AM, Jakub Narębski wrote: > Nowadays we have gitcli(7) manual page, but perhaps > it would be better to create a separate manpage for issues related > to pathspec handling (of which

Re: [PATCH v13 04/20] index-helper: new daemon for caching index and related stuff

On Thu, Jun 30, 2016 at 3:06 PM, Johannes Schindelin wrote: > Even when NO_MMAP is empty, there might be no Unix sockets available (such > as is the case on Windows). In any case, you really only want to skip > these tests when index-helper is not available, so would

Warm greatings

Greetings from NASOLY STORE Supply , We are keen to placing an order for so me items . Kindly let me know the kinds of credit card you take for payment . Will be waiting to read back from you via : allenlescot...@gmail.com -- To unsubscribe from this list: send the line "unsubscribe git" in the

Re: [PATCH] diff compaction heuristic: favor shortest neighboring blank lines

On 06/23/2016 07:10 PM, Michael Haggerty wrote: > On 06/17/2016 06:09 PM, Stefan Beller wrote: >> I think before spending more time on discussing and implementing new >> (hopefully better) heuristics, I'd want to step back and try to be a bit more >> systematic, i.e. I'll want to collect lots of

Re: Problem with --shallow-submodules option

Hello, Thanks for your answers. I tested it after the changes were made on the git server, and it seems to be working. But some other issue came up. We have quite many submodules in our project so I did some comaprision: If I do a clone with these parameters: --jobs 20 --recurse-submodules The

Re: [PATCH v13 04/20] index-helper: new daemon for caching index and related stuff

Hi Dave, On Sun, 26 Jun 2016, David Turner wrote: > diff --git a/t/t7900-index-helper.sh b/t/t7900-index-helper.sh > new file mode 100755 > index 000..114c112 > --- /dev/null > +++ b/t/t7900-index-helper.sh > @@ -0,0 +1,23 @@ > +#!/bin/sh > +# > +# Copyright (c) 2016, Twitter, Inc > +# > + >

[PATCH v3 1/3] t7810-grep.sh: fix duplicated test name

Signed-off-by: Charles Bailey --- t/t7810-grep.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index 1e72971..c4302ed 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -353,7 +353,7 @@ test_expect_success 'grep

[PATCH v3 0/3] Grepping with intent to add

So I've got back around to this topic again. I've applied fixes to the tests as suggested by Eric and Junio. I came up with a test case that demonstrates a difference between the additional fix that Duy suggested and the alternative that Junio suggested. I've kept Duy's fix because I think it

[PATCH v3 2/3] t7810-grep.sh: fix a whitespace inconsistency

Signed-off-by: Charles Bailey --- t/t7810-grep.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index c4302ed..6e6eaa4 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -175,7 +175,7 @@ do

[PATCH v3 3/3] grep: fix grepping for "intent to add" files

From: Charles Bailey This reverts commit 4d5520053 (grep: make it clear i-t-a entries are ignored, 2015-12-27) and adds an alternative fix to maintain the -L --cached behavior. 4d5520053 caused 'git grep' to no longer find matches in new files in the working tree where

Re: git tag --contains for cherry-picks

W dniu 2016-06-30 o 08:22, Jeff King pisze: > On Wed, Jun 29, 2016 at 12:48:33PM +0100, Laszlo Papp wrote: > >> Old releases are maintained with important bug fixes or even new features >> in our case. It sometimes means that we need to cherry-pick commits across >> branches, like from master to

Re: topological index field for commit objects

W dniu 2016-06-30 o 00:00, Jeff King pisze: > On Wed, Jun 29, 2016 at 11:49:35PM +0200, Jakub Narębski wrote: > >>> So this is the ideal case for generation numbers (the worst cases are >>> when the things you are looking for are in branchy, close history where >>> the generation numbers don't

Re: [RFC/PATCH v2 00/10] Add initial experimental external ODB support

On Wed, Jun 29, 2016 at 10:01 PM, Eric Wong wrote: > Christian Couder wrote: >> Design discussion about performance >> ~~~ >> >> Yeah, it is not efficient to fork/exec a command to just read or write >> one object to or

Re: [PATCH v8 33/41] write_or_die: use warning() instead of fprintf(stderr, ...)

On Tue, Jun 28, 2016 at 11:39 PM, Junio C Hamano wrote: > Christian Couder writes: > >> @@ -98,8 +97,7 @@ int write_or_whine_pipe(int fd, const void *buf, size_t >> count, const char *msg) >> int write_or_whine(int fd, const void *buf, size_t

Re: [PATCH] builtin/apply: include declaration of cmd_apply()

Hi Ramsay, On Thu, Jun 30, 2016 at 3:47 AM, Ramsay Jones wrote: > > Hi Christian, > > If you need to re-roll your 'cc/apply-am' branch, could you please > squash this into the relevant patch. Commit 95a3b0ba ("apply: move > libified code from builtin/apply.c to

Re: [RFD] Place to document magic pathspecs like ":/" and pathspec handling

W dniu 2016-06-29 o 23:28, Junio C Hamano pisze: > Jakub Narębski writes: > >> But I think it is not the best place to keep this documentation. > > All true. In case it was not obvious, I didn't mean to say "Here > you find the information, shut up." It was "here is a

Re: [PATCH 1/9] Report bugs consistently

On Thu, Jun 30, 2016 at 10:42:37AM +0200, Johannes Schindelin wrote: > > > The vast majority of error messages in Git's source code which report a > > > bug use the convention to prefix the message with "BUG:". > > > > Good thing to do. > > > > But if we were to review and apply a 200+ line

[PATCH v4 2/5] t5000: test tar files that overflow ustar headers

The ustar format only has room for 11 (or 12, depending on some implementations) octal digits for the size and mtime of each file. For values larger than this, we have to add pax extended headers to specify the real data, and git does not yet know how to do so. Before fixing that, let's start off

[PATCH v4 6/5] t5000: use test_match_signal

On Thu, Jun 30, 2016 at 05:06:14AM -0400, Jeff King wrote: > The one thing that isn't fixed is the use of "141" to test for sigpipe > death. That should use test_match_signal, but that topic just got > re-rolled, too. And here's what the patch for that looks like (which can be applied if this

[PATCH v4 1/5] t9300: factor out portable "head -c" replacement

In shell scripts it is sometimes useful to be able to read exactly N bytes from a pipe. Doing this portably turns out to be surprisingly difficult. We want a solution that: - is portable - never reads more than N bytes due to buffering (which would mean those bytes are not available to

[PATCH v4 4/5] archive-tar: write extended headers for far-future mtime

The ustar format represents timestamps as seconds since the epoch, but only has room to store 11 octal digits. To express anything larger, we need to use an extended header. This is exactly the same case we fixed for the size field in the previous commit, and the solution here follows the same

[PATCH v4 3/5] archive-tar: write extended headers for file sizes >= 8GB

The ustar format has a fixed-length field for the size of each file entry which is supposed to contain up to 11 bytes of octal-formatted data plus a NUL or space terminator. These means that the largest size we can represent is 0777, or 1 byte short of 8GB. The correct solution for a

[PATCH v4 5/5] archive-tar: drop return value

We never do any error checks, and so never return anything but "0". Let's just drop this to simplify the code. Signed-off-by: Jeff King --- archive-tar.c | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/archive-tar.c b/archive-tar.c index

[PATCH v4 0/5] friendlier handling of overflows in archive-tar

This is a re-roll of the jk/big-and-future-archive-tar topic. It addresses all but one of the review comments, and I hope should be pretty polished. The changes are: - the dependency on bunzip2 is dropped; instead, we just provide a partial object for the 64GB blob. See the first commit

Re: [PATCH 1/9] Report bugs consistently

Hi Hannes, On Thu, 30 Jun 2016, Johannes Sixt wrote: > Am 29.06.2016 um 13:36 schrieb Johannes Schindelin: > > @@ -955,9 +955,8 @@ static struct merge_file_info merge_file_1(struct > > merge_options *o, > > > > if (!sha_eq(a->sha1, b->sha1)) > > result.clean = 0;

Re: [PATCH 9/9] am: make a direct call to merge_recursive

Hi Junio, On Wed, 29 Jun 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > From: Junio C Hamano > > Did I write this thing? Yes, you did. It was db05d6194d3f9ea9e64163944961d5f6e85302be as part of pu@{2016-06-15}. > Having two

Re: [PATCH 1/9] Report bugs consistently

Hi Junio, On Wed, 29 Jun 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > The vast majority of error messages in Git's source code which report a > > bug use the convention to prefix the message with "BUG:". > > Good thing to do. > > But if we were

Re: [PATCH 1/9] Report bugs consistently

Hi Eric, On Wed, 29 Jun 2016, Eric Sunshine wrote: > On Wed, Jun 29, 2016 at 7:36 AM, Johannes Schindelin > wrote: > > The vast majority of error messages in Git's source code which report a > > bug use the convention to prefix the message with "BUG:". > > [...] > >

Re: [PATCH 2/2] t3404: add a test for the --gpg-sign option

Hi Junio, On Wed, 29 Jun 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > To keep the time t3404 requires short (in this developer's Windows > > setup, this single test already takes a painful 8 minutes to pass), > > we avoid a full-blown GPG test and

Re: [PATCH 1/2] t3404: fix another typo

Hi Junio, On Wed, 29 Jun 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Wed, 29 Jun 2016, Junio C Hamano wrote: > > > >> Johannes Schindelin writes: > >> > >> > The past tense of "to run" is "run", not "ran". > >> >

Re: preview: What's cooking in git.git (Jun 2016, #10; Tue, 28)

On Wed, Jun 29, 2016 at 07:41:36AM +0200, Johannes Sixt wrote: > Am 29.06.2016 um 03:43 schrieb Jeff King: > > Another is to just put the posix/ksh schemes into the helper function, > > and let Windows people sort it out later if they want to. > > Let's do this. OK, here's a replacement for the

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

On Wed, Jun 29, 2016 at 09:02:37AM +0200, Johannes Schindelin wrote: > It is the most convenient way to determine which tests failed after > running the entire test suite, in parallel, to look for left-over "trash > directory.t*" subdirectories in the t/ subdirectory. As Junio noted, this

Re: [PATCH v2 0/7] literal formatting in documentation

On Tue, Jun 28, 2016 at 01:40:08PM +0200, Matthieu Moy wrote: > This should address all comments from Peff. Thanks. The review is mind-numbing enough that I didn't do a complete read-through again, but just spot-checked a few places. This version looks good to me. -Peff -- To unsubscribe from

Re: preview: What's cooking in git.git (Jun 2016, #10; Tue, 28)

On Wed, Jun 29, 2016 at 01:47:31PM +0200, Johannes Schindelin wrote: > On Tue, 28 Jun 2016, Junio C Hamano wrote: > > > * jk/ansi-color (2016-06-23) 7 commits > > (merged to 'next' on 2016-06-28 at 354989c) > > + color: support strike-through attribute > > + color: support "italic" attribute

Re: git tag --contains for cherry-picks

On Wed, Jun 29, 2016 at 12:48:33PM +0100, Laszlo Papp wrote: > Old releases are maintained with important bug fixes or even new features > in our case. It sometimes means that we need to cherry-pick commits across > branches, like from master to a specific release branch. > > Cherry-picking

Re: [PATCH v4] Refactor recv_sideband()

On Wed, 29 Jun 2016 at 18:40:16, Junio C Hamano wrote: > Lukas, can you see what is in 'pu' after I push out today's > integration result in several hours and tell us if you like the > result of the SQUASH??? change? Looks good to me. Thank you both for working on this. Note that you should amend