Re: [PATCH 00/33] object id conversion (grep and diff)

2017-06-01 Thread Junio C Hamano
Junio C Hamano writes: > Brandon Williams writes: > >> A month or so ago I thought I would lend a hand to Brian and do a round of >> conversions from sha1 -> struct object_id. Now that Brian's latest series >> has >> hit master I can finally send these

Re: Incorrect Diff!

2017-06-01 Thread Junio C Hamano
Pulkit Goyal <7895pul...@gmail.com> writes: > I was working on a Django project when I got the following diff which > is very much confusing. > > The diff is pasted at https://bpaste.net/show/c2cb00728ff0. > > As you can see on bpaste that in line number 9,10 I have changed > "class

Re: [WIP 2/2] pack-objects: support --blob-size-limit

2017-06-01 Thread Junio C Hamano
Jonathan Tan writes: > diff --git a/Documentation/git-pack-objects.txt > b/Documentation/git-pack-objects.txt > index 8973510a4..c4257cacc 100644 > --- a/Documentation/git-pack-objects.txt > +++ b/Documentation/git-pack-objects.txt > @@ -12,7 +12,8 @@ SYNOPSIS > 'git

Incorrect Diff!

2017-06-01 Thread Pulkit Goyal
Hey folks! I was working on a Django project when I got the following diff which is very much confusing. The diff is pasted at https://bpaste.net/show/c2cb00728ff0. As you can see on bpaste that in line number 9,10 I have changed "class activationview" to "class activateuser", but in line

Re: [WIP 1/2] pack-objects: rename want_.* to ignore_.*

2017-06-01 Thread Junio C Hamano
Jonathan Tan writes: > Currently, pack-objects conflates the concepts of "ignoring an object" > and "including it in to_pack". Hmph, that statement is a hard to read and agree to. I thought an ignored object that is not going to be packed is one that won't hit

Re: git-2.13.0: log --date=format:%z not working

2017-06-01 Thread Junio C Hamano
René Scharfe writes: > Am 27.05.2017 um 23:46 schrieb Jeff King: >> On Sat, May 27, 2017 at 06:57:08PM +0200, Ævar Arnfjörð Bjarmason wrote: >> >>> There's another test which breaks if we just s/gmtime/localtime/g. As >>> far as I can tell to make the non-local case work we'd need

Re: [PATCH v5 5/5] convert: add "status=delayed" to filter process protocol

2017-06-01 Thread Junio C Hamano
Lars Schneider writes: > +Delay > +^ > + > +If the filter supports the "delay" capability, then Git can send the > +flag "can-delay" after the filter command and pathname. This flag > +denotes that the filter can delay filtering the current blob (e.g. to >

Re: [PATCH v5 0/5] convert: add "status=delayed" to filter process protocol

2017-06-01 Thread Junio C Hamano
Lars Schneider writes: > If you review this series then please read the "Delay" section in > "Documentation/gitattributes.txt" first for an overview of the delay > mechanism. OK.

Re: [PATCH] send-email: check for repo before invoking hook

2017-06-01 Thread Junio C Hamano
Thanks. "git show -w" tells readers how this fix is trivially correct ;-) Will apply.

Re: [PATCH v4 0/6] Fast git status via a file system watcher

2017-06-01 Thread Junio C Hamano
Ben Peart writes: > Changes from V3 include: > - update test script based on feedback > - update template hook proc with better post-processing code and make >it executable I take it that the first three patches are the same as before, so is the "add documentation" one

Re: [PATCH v2] docs: fix formatting and grammar

2017-06-01 Thread Junio C Hamano
Jeff King writes: > On Thu, Jun 01, 2017 at 11:37:03AM +0100, Adam Dinwoodie wrote: > >> When compiling the documentation, asciidoc thinks a backtick surrounded >> by whitespace shouldn't be interpreted as marking the start or end of a >> literal. In most cases, that's useful

Re: [PATCH 20/33] combine-diff: convert find_paths_* to struct object_id

2017-06-01 Thread Junio C Hamano
Stefan Beller writes: > On Tue, May 30, 2017 at 10:30 AM, Brandon Williams wrote: >> Convert find_paths_generic and find_paths_multitree to use struct >> object_id. >> >> > > double empty line? Is it because sed -e 's/^Change-ID:.*//' insead of

Re: [PATCH 00/33] object id conversion (grep and diff)

2017-06-01 Thread Junio C Hamano
Brandon Williams writes: > A month or so ago I thought I would lend a hand to Brian and do a round of > conversions from sha1 -> struct object_id. Now that Brian's latest series has > hit master I can finally send these patches out. > > The first couple patches are from Brian

Re: [PATCH 30/33] tree-diff: convert diff_tree_paths to struct object_id

2017-06-01 Thread Junio C Hamano
Brandon Williams writes: > @@ -220,7 +221,7 @@ static struct combine_diff_path *emit_path(struct > combine_diff_path *p, > if (emitthis) { > int keep; > struct combine_diff_path *pprev = p; > - p = path_appendnew(p, nparent, base,

Re: [PATCH 31/33] tree-diff: convert path_appendnew to object_id

2017-06-01 Thread Junio C Hamano
Brandon Williams writes: > @@ -221,7 +221,7 @@ static struct combine_diff_path *emit_path(struct > combine_diff_path *p, > if (emitthis) { > int keep; > struct combine_diff_path *pprev = p; > - p = path_appendnew(p, nparent, base,

Re: [PATCH 28/33] builtin/diff-tree: cleanup references to sha1

2017-06-01 Thread Junio C Hamano
Brandon Williams writes: > @@ -132,15 +131,14 @@ int cmd_diff_tree(int argc, const char **argv, const > char *prefix) >* reverse the order of the objects if the second one >* is marked UNINTERESTING. >*/ > - nr_sha1 = opt->pending.nr; > -

Re: [PATCH 22/33] notes-merge: convert notes_merge* to struct object_id

2017-06-01 Thread Junio C Hamano
"brian m. carlson" writes: >> diff --git a/notes-merge.h b/notes-merge.h >> index 0d890563b..eaa8e3b86 100644 >> --- a/notes-merge.h >> +++ b/notes-merge.h >> @@ -33,15 +33,15 @@ void init_notes_merge_options(struct notes_merge_options >> *o); >> * >> * 1. The

Re: [PATCH 08/33] grep: convert to struct object_id

2017-06-01 Thread Junio C Hamano
Brandon Williams writes: > Convert the remaining parts of grep to use struct object_id. > > Signed-off-by: Brandon Williams > --- > builtin/grep.c | 22 +++--- > cache.h| 7 +++ > grep.c | 17 - > grep.h

Re: [PATCH] send-email: check for repo before invoking hook

2017-06-01 Thread Jacob Keller
On Thu, Jun 1, 2017 at 5:22 PM, Todd Zullinger wrote: > Hi Jonathan, > > Jonathan Tan wrote: >> >> Thanks for the notification. Here's a patch to fix that. --- >> git-send-email.perl | 32 +--- >> t/t9001-send-email.sh | 8 2 files changed, 25

Re: [PATCH 25/33] notes-merge: convert verify_notes_filepair to struct object_id

2017-06-01 Thread Junio C Hamano
Brandon Williams writes: > Signed-off-by: Brandon Williams > --- > notes-merge.c | 20 ++-- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/notes-merge.c b/notes-merge.c > index 55dbb3659..962e9b1bc 100644 > ---

Re: [PATCH 23/33] notes-merge: convert merge_from_diffs to struct object_id

2017-06-01 Thread Junio C Hamano
Stefan Beller writes: >> trace_printf("\tmerge_from_diffs(base = %.7s, local = %.7s, " >> - "remote = %.7s)\n", sha1_to_hex(base), sha1_to_hex(local), >> - sha1_to_hex(remote)); >> + "remote = %.7s)\n", oid_to_hex(base),

Re: [PATCH v4 0/6] Fast git status via a file system watcher

2017-06-01 Thread Ben Peart
Any chance you can provide me with a bash script that contains the exact sequence of commands you are running to get this result? I've been trying to replicate it using your notes but have not been able to. I'd like to see if it is a repo difference, a platform difference, a command sequence

Re: [PATCH 0/6] Some more git config completions

2017-06-01 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > As an aside from this series, has anyone ever proposed some method of > semi-automatically keeping this up-to-date? Seems we're in a continual > cycle of adding flags/config, forgetting to update this, then updating > it. At least the

Re: [PATCH] send-email: check for repo before invoking hook

2017-06-01 Thread Todd Zullinger
Hi Jonathan, Jonathan Tan wrote: Thanks for the notification. Here's a patch to fix that. --- git-send-email.perl | 32 +--- t/t9001-send-email.sh | 8 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/git-send-email.perl

[WIP 2/2] pack-objects: support --blob-size-limit

2017-06-01 Thread Jonathan Tan
As part of an effort to improve Git support for very large repositories in which clients typically have only a subset of all version-controlled blobs, teach pack-objects to support --blob-size-limit, packing only blobs below that size limit unless the blob corresponds to a file whose name starts

[WIP 0/2] Modifying pack-objects to support --blob-size-limit

2017-06-01 Thread Jonathan Tan
I took a look at modifying builtin/pack-objects.c to support excluding oversized blobs and reporting the exclusions that it has performed. Here's a work in progress - it might be of aid to others who are working on a similar feature and/or are modifying pack-objects for something else. The way I

[WIP 1/2] pack-objects: rename want_.* to ignore_.*

2017-06-01 Thread Jonathan Tan
Currently, pack-objects conflates the concepts of "ignoring an object" and "including it in to_pack". This is fine for now, but a subsequent commit will introduce the concept of an object that cannot be completely ignored, but should not be included in to_pack either. To separate these concepts,

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Junio C Hamano
Martin Ågren writes: > I looked into this some more. It turns out it is possible to trigger > undefined behavior on "next". Here's what I did: > ... > > This "fixes" the problem: > ... > diff --git a/sha1dc/sha1.c b/sha1dc/sha1.c > index 3dff80a..d6f4c44 100644 > ---

[PATCH] send-email: check for repo before invoking hook

2017-06-01 Thread Jonathan Tan
Unless --no-validate is passed, send-email will invoke $repo->repo_path() in its search for a validate hook regardless of whether a Git repo is actually present. Teach send-email to first check for repo existence. Signed-off-by: Jonathan Tan --- Thanks for the

Re: [PATCH 2/3] rebase: Add tests for console output

2017-06-01 Thread Stefan Beller
On Thu, Jun 1, 2017 at 4:40 PM, Junio C Hamano wrote: > Johannes Schindelin writes: > >> Also, about the commit IDs. As long as the tests are consistent (i.e. they >> use test_commit rather than plain `git commit`, or at least call >> `test_tick`

Re: [PATCH 2/3] rebase: Add tests for console output

2017-06-01 Thread Junio C Hamano
Johannes Schindelin writes: > Also, about the commit IDs. As long as the tests are consistent (i.e. they > use test_commit rather than plain `git commit`, or at least call > `test_tick` beforehand), the commit IDs should actually be identical > between runs and not

Re: [PATCH v4 0/8] PCRE v2, PCRE v1 JIT, log -P & fixes

2017-06-01 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > See <20170525200528.22037-1-ava...@gmail.com> for v3 > (https://public-inbox.org/git/20170525200528.22037-1-ava...@gmail.com/). > > This is on top of "[PATCH v4 00/31] Easy to review grep & pre-PCRE > changes". > > Changes: > > Ævar Arnfjörð

Re: preserve untracked cache, was Re: What's cooking in git.git (Jun 2017, #01; Thu, 1)

2017-06-01 Thread Junio C Hamano
Samuel Lijin writes: >> What is holding this topic up? Anything Ben or I can do to move this >> closer to `next` or even `master`? > > It's in `next` right now (3196d093d6). Thanks for pinging and checking ;-) I think the topic was merged to 'next' on the 23rd of last

Re: git-send-email no longer works outside a repository?

2017-06-01 Thread Junio C Hamano
Jacob Keller writes: > I often use git-send-email in order to send patch files. Recently when > I tried to do this outside a repository I got some cryptic failures, > I'm using the master branch, git version 2.13.0.311.g0339965c70d6 > > I generate the patch files and copy

Re: What's cooking in git.git (Jun 2017, #01; Thu, 1)

2017-06-01 Thread Junio C Hamano
Johannes Sixt writes: >> Waiting for an Ack to the SQUASH fix or a reroll of the tip commits. > > ACK! > > See also > https://public-inbox.org/git/2899d715-a416-1852-4399-28af0a3e9...@kdbg.org/ > > -- Hannes Thanks.

Re: git-send-email no longer works outside a repository?

2017-06-01 Thread Brandon Williams
On 06/01, Jacob Keller wrote: > I often use git-send-email in order to send patch files. Recently when > I tried to do this outside a repository I got some cryptic failures, > I'm using the master branch, git version 2.13.0.311.g0339965c70d6 > > I generate the patch files and copy them into a

git-send-email no longer works outside a repository?

2017-06-01 Thread Jacob Keller
I often use git-send-email in order to send patch files. Recently when I tried to do this outside a repository I got some cryptic failures, I'm using the master branch, git version 2.13.0.311.g0339965c70d6 I generate the patch files and copy them into a separate folder outside of the repository,

Re: wrong language translation part7

2017-06-01 Thread Stefan Beller
On Thu, Jun 1, 2017 at 3:08 PM, SJR wrote: > So when v2 will be translated to Polish? > > Regards, > JanR When a volunteer shows up to do the work. https://github.com/progit/progit2/blob/master/CONTRIBUTING.md

Re: wrong language translation part7

2017-06-01 Thread SJR
So when v2 will be translated to Polish? Regards, JanR 2017-06-01 17:26 GMT+02:00 Kevin Daudt : > On Thu, Jun 01, 2017 at 01:16:11PM +0200, SJR wrote: >> W dniu 1 czerwca 2017 09:43 użytkownik SJR napisał: >> > >> > Hi, >> > >> >

Re: [PATCH v4 2/8] grep: skip pthreads overhead when using one thread

2017-06-01 Thread Stefan Beller
On Thu, Jun 1, 2017 at 2:55 PM, Ævar Arnfjörð Bjarmason wrote: > On Thu, Jun 1, 2017 at 11:45 PM, Stefan Beller wrote: >>> I didn't mean to change this bit, it should remain "if >>> (!num_threads)". I was in the middle of monkeypatching and didn't >>> review

Re: [PATCH/RFC v3 3/3] branch: add copy branch feature implementation

2017-06-01 Thread Sahil Dua
On Thu, Jun 1, 2017 at 8:59 PM, Ævar Arnfjörð Bjarmason wrote: > > On Thu, Jun 1, 2017 at 8:35 PM, Sahil Dua wrote: > > Adds copy branch option available using -c or -C (forcefully). > > Commenting on the series in general. I have a fixup branch for you

Re: [PATCH 0/6] Some more git config completions

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Sat, May 27, 2017 at 8:25 AM, Rikard Falkeborn wrote: > Some more completions (from what I could tell, there are probably more > missing). Please let me know if you prefer them in smaller (or larger) > batches (or if the patches aren't wanted at all). This all

Re: [PATCH v4 2/8] grep: skip pthreads overhead when using one thread

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Jun 1, 2017 at 11:45 PM, Stefan Beller wrote: >> I didn't mean to change this bit, it should remain "if >> (!num_threads)". I was in the middle of monkeypatching and didn't >> review the diff carefully enough. But it any case, without this change >> the rest of this

Re: [PATCH v4 2/8] grep: skip pthreads overhead when using one thread

2017-06-01 Thread Stefan Beller
> I didn't mean to change this bit, it should remain "if > (!num_threads)". I was in the middle of monkeypatching and didn't > review the diff carefully enough. But it any case, without this change > the rest of this diff is your proposed (but segfaulting) change as I > understand it. Sorry for

[PATCH 5/6] completion: Add git config credential completions

2017-06-01 Thread Rikard Falkeborn
Add missing completions for git config credential: * credential.helper * credential.useHttpPath * credential.username Signed-off-by: Rikard Falkeborn --- contrib/completion/git-completion.bash | 3 +++ 1 file changed, 3 insertions(+) diff --git

[PATCH 4/6] completion: Add git config advice completions

2017-06-01 Thread Rikard Falkeborn
Add missing completions for git config advice: * advice.amWorkDir * advice.pushAlreadyExists * advice.pushFetchFirst * advice.pushNeedsForce * advice.pushNonFFCurrent * advice.pushNonFFMatching * advice.pushUpdateRejected * advice.rmHints * advice.statusUoption Remove completion for git config

[PATCH 6/6] completion: Add git config credentialCache.ignoreSIGHUP

2017-06-01 Thread Rikard Falkeborn
Signed-off-by: Rikard Falkeborn --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 98f3e76ee..6de0dda6c 100644 ---

[PATCH 1/6] completion: Add git config gc completions

2017-06-01 Thread Rikard Falkeborn
Add missing completion for git config gc options: * gc.aggressiveDepth * gc.autoDetach * gc.logExpiry * gc.worktreePruneExpire Signed-off-by: Rikard Falkeborn --- contrib/completion/git-completion.bash | 4 1 file changed, 4 insertions(+) diff --git

[PATCH 0/6] Some more git config completions

2017-06-01 Thread Rikard Falkeborn
Some more completions (from what I could tell, there are probably more missing). Please let me know if you prefer them in smaller (or larger) batches (or if the patches aren't wanted at all). Patches are based on master. Rikard Falkeborn (6): completion: Add git config gc completions

[PATCH 2/6] completion: Add git config core completions

2017-06-01 Thread Rikard Falkeborn
Add missing completions for git config core: * core.checkStat * core.commentChar * core.hideDotFiles * core.hooksPath * core.packedRefsTimeout * core.precomposeUnicode * core.protectHFS * core.protectNTFS * core.splitIndex * core.sshCommand Note that some configs are only used for some platforms

Re: [PATCH v4 2/8] grep: skip pthreads overhead when using one thread

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Jun 1, 2017 at 11:36 PM, Ævar Arnfjörð Bjarmason wrote: > On Thu, Jun 1, 2017 at 11:20 PM, Stefan Beller wrote: >> On Thu, Jun 1, 2017 at 11:20 AM, Ævar Arnfjörð Bjarmason >> wrote: >> >>> + if (num_threads == 1) >>> +

Re: bug: `git log --grep ... --invert-grep --author=...` negates / ignores --author

2017-06-01 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Anyway, much of the above may be incorrect, I haven't dug deeply > beyond just finding that something's funny going on and we definitely > have *some* bugs here. One thing that is very correct in what you said is that the documentation of

Re: [PATCH v4 2/8] grep: skip pthreads overhead when using one thread

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Jun 1, 2017 at 11:20 PM, Stefan Beller wrote: > On Thu, Jun 1, 2017 at 11:20 AM, Ævar Arnfjörð Bjarmason > wrote: > >> + if (num_threads == 1) >> + num_threads = 0; > > I would think that it is easier to maintain the code when

Re: [PATCH v4 2/8] grep: skip pthreads overhead when using one thread

2017-06-01 Thread Stefan Beller
On Thu, Jun 1, 2017 at 11:20 AM, Ævar Arnfjörð Bjarmason wrote: > + if (num_threads == 1) > + num_threads = 0; I would think that it is easier to maintain the code when keep the 1 hard coded, and apply the following diff instead. If we encounter a 0 later

Re: [PATCH v4 0/6] Fast git status via a file system watcher

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Jun 1, 2017 at 10:51 PM, Ævar Arnfjörð Bjarmason wrote: > On Thu, Jun 1, 2017 at 5:50 PM, Ben Peart wrote: >> Changes from V3 include: >> - update test script based on feedback >> - update template hook proc with better post-processing code and

Re: [PATCH v4 0/6] Fast git status via a file system watcher

2017-06-01 Thread Stefan Beller
> >> $ git am /tmp/original_msg.txt >> Applying: fsmonitor: add documentation for the fsmonitor extension. >> error: patch failed: Documentation/githooks.txt:448 >> error: Documentation/githooks.txt: patch does not apply >> Patch failed at 0001 fsmonitor: add documentation

Re: [PATCH v4 0/6] Fast git status via a file system watcher

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Jun 1, 2017 at 11:06 PM, Ben Peart wrote: > On 6/1/2017 3:57 PM, Ævar Arnfjörð Bjarmason wrote: >> >> On Thu, Jun 1, 2017 at 5:50 PM, Ben Peart wrote: >>> >>> Changes from V3 include: >>> - update test script based on feedback >>> - update

Re: [PATCH 05/31] environment: remove namespace_len variable

2017-06-01 Thread Brandon Williams
On 06/01, Stefan Beller wrote: > On Wed, May 31, 2017 at 2:43 PM, Brandon Williams wrote: > > Use 'skip_prefix' instead of 'starts_with' so that we can drop the need > > to keep around 'namespace_len'. > > Looks correct. > > Performance wise: > The strip_namespace function is

Re: [PATCH v4 0/6] Fast git status via a file system watcher

2017-06-01 Thread Ben Peart
On 6/1/2017 3:57 PM, Ævar Arnfjörð Bjarmason wrote: On Thu, Jun 1, 2017 at 5:50 PM, Ben Peart wrote: Changes from V3 include: - update test script based on feedback - update template hook proc with better post-processing code and make it executable Thanks,

Re: What's cooking in git.git (Jun 2017, #01; Thu, 1)

2017-06-01 Thread Johannes Sixt
Am 01.06.2017 um 09:44 schrieb Junio C Hamano: * nd/fopen-errors (2017-05-30) 14 commits - mingw_fopen: report ENOENT for invalid file names - SQUASH??? use test_i18ngrep and add it at the end - mingw: verify that paths are not mistaken for remote nicknames - log: fix memory leak in

Re: bug: `git log --grep ... --invert-grep --author=...` negates / ignores --author

2017-06-01 Thread Anthony Sottile
I actually only expected the --grep to be inverted -- I think I'm on the same page with what's documented. I'd be happy to dig into the code and investigate this some more but I am not familiar with the git codebase, any code hints on where to get bootstrapped? Anthony On Thu, Jun 1, 2017 at

Re: [PATCH v4 0/6] Fast git status via a file system watcher

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Jun 1, 2017 at 5:50 PM, Ben Peart wrote: > Changes from V3 include: > - update test script based on feedback > - update template hook proc with better post-processing code and make >it executable I have watchman running finally, so aside from issues applying

Re: [PATCH 31/31] ls-files: use repository object

2017-06-01 Thread Stefan Beller
On Wed, May 31, 2017 at 2:44 PM, Brandon Williams wrote: > Convert ls-files to use a repository struct and recurse submodules > inprocess. > > Signed-off-by: Brandon Williams > +static void show_submodule(const struct repo *superproject, > +

Re: [PATCH 00/31] repository object

2017-06-01 Thread Jacob Keller
On Thu, Jun 1, 2017 at 11:28 AM, Stefan Beller wrote: > On Thu, Jun 1, 2017 at 11:10 AM, Brandon Williams wrote: >> >> For those who don't like reviewing patches in email form, you can find >> this series at: >>

Re: [PATCH v4 0/6] Fast git status via a file system watcher

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Jun 1, 2017 at 5:50 PM, Ben Peart wrote: > Changes from V3 include: > - update test script based on feedback > - update template hook proc with better post-processing code and make >it executable Thanks, exciting stuff, do you have this pushed somewhere? I

Re: [PATCH 06/31] repo: introduce the repository object

2017-06-01 Thread Stefan Beller
On Wed, May 31, 2017 at 2:43 PM, Brandon Williams wrote: > Introduce the repository object 'struct repo' which can be used hold all > state pertaining to a git repository. > > The aim of object-ifying the repository is to (1) make the code base > more readable and easier to

Re: bug: `git log --grep ... --invert-grep --author=...` negates / ignores --author

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Wed, May 31, 2017 at 11:40 PM, Jeff King wrote: > On Wed, May 31, 2017 at 08:08:54PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> $ git log --grep=bar --author=Ævar --pretty=format:%an -100 origin/pu >> |sort|uniq -c|sort -nr >> 5 Ævar Arnfjörð Bjarmason >> >> $ git log

Re: [PATCH v2] send-email: Net::SMTP::SSL is obsolete, use only when necessary

2017-06-01 Thread Dennis Kaarsemaker
On Thu, 2017-06-01 at 07:50 +0900, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > Second ping. This problem is not going away, so if this solution is not > > acceptable, I'd like to know what needs to be improved. > > Perhaps you needed to actually test with

Re: [PATCH 05/31] environment: remove namespace_len variable

2017-06-01 Thread Stefan Beller
On Wed, May 31, 2017 at 2:43 PM, Brandon Williams wrote: > Use 'skip_prefix' instead of 'starts_with' so that we can drop the need > to keep around 'namespace_len'. Looks correct. Performance wise: The strip_namespace function is only called from {receive/upload}-pack and

Re: [PATCH 04/31] setup: don't perform lazy initialization of repository state

2017-06-01 Thread Stefan Beller
On Wed, May 31, 2017 at 2:43 PM, Brandon Williams wrote: > Under some circumstances (bogus GIT_DIR value or the discovered gitdir > is '.git') 'setup_git_directory()' won't initialize key repository > state. This leads to inconsistent state after running the setup code. > To

Re: preserve untracked cache, was Re: What's cooking in git.git (Jun 2017, #01; Thu, 1)

2017-06-01 Thread Samuel Lijin
On Thu, Jun 1, 2017 at 2:56 PM, Johannes Schindelin wrote: > Hi Junio, > > On Thu, 1 Jun 2017, Junio C Hamano wrote: > >> * dt/unpack-save-untracked-cache-extension (2017-05-20) 1 commit >> (merged to 'next' on 2017-05-23 at 3196d093d6) >> + unpack-trees: preserve

Re: [PATCH/RFC v3 3/3] branch: add copy branch feature implementation

2017-06-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Jun 1, 2017 at 8:35 PM, Sahil Dua wrote: > Adds copy branch option available using -c or -C (forcefully). Commenting on the series in general. I have a fixup branch for you with commits to squash: https://github.com/avar/git/tree/avar/sahildua-rename-branch-2

preserve untracked cache, was Re: What's cooking in git.git (Jun 2017, #01; Thu, 1)

2017-06-01 Thread Johannes Schindelin
Hi Junio, On Thu, 1 Jun 2017, Junio C Hamano wrote: > * dt/unpack-save-untracked-cache-extension (2017-05-20) 1 commit > (merged to 'next' on 2017-05-23 at 3196d093d6) > + unpack-trees: preserve index extensions > > When "git checkout", "git merge", etc. manipulates the in-core > index,

[PATCH/RFC v3 1/3] branch: add tests for new copy branch feature

2017-06-01 Thread Sahil Dua
Adds a few basic tests for the new copy branch option. Aim is to have an option -c for copying a branch just like -m option for renaming a branch. My definition of "copy" for this feature is "copying from A to create B, keeping A intact". That means "copy branch A to B" should do whatever "move

[PATCH/RFC v3 3/3] branch: add copy branch feature implementation

2017-06-01 Thread Sahil Dua
Adds copy branch option available using -c or -C (forcefully). Adds new function copy_existing_ref to copy the ref and git_config_copy_section to copy the git config section. Under the hood, both git_config_copy_section and git_config_rename_section functions use the same function which takes a

[PATCH/RFC v3 2/3] config: abstract out create section from key logic

2017-06-01 Thread Sahil Dua
Abstracts out the logic for creating string buffer from given key for example - 'branch.b' and returns '[branch "b"]'. We want to keep the original config section intact in case of copy operation. For this we need to fetch the section with updated new branch name so that we can write that to the

Re: [PATCH 00/31] repository object

2017-06-01 Thread Stefan Beller
On Thu, Jun 1, 2017 at 11:10 AM, Brandon Williams wrote: > > For those who don't like reviewing patches in email form, you can find > this series at: > https://github.com/bmwill/git/tree/repository-object I was just asking Brandon for a remote to pull these patches from. As I

[PATCH v4 5/8] grep: un-break building with PCRE < 8.32

2017-06-01 Thread Ævar Arnfjörð Bjarmason
Amend my change earlier in this series ("grep: add support for the PCRE v1 JIT API", 2017-04-11) to un-break the build on PCRE v1 versions earlier than 8.32. The JIT support was added in version 8.20 released on 2011-10-21, but it wasn't until 8.32 released on 2012-11-30 that the fast code path

[PATCH v4 6/8] grep: un-break building with PCRE < 8.20

2017-06-01 Thread Ævar Arnfjörð Bjarmason
Amend my change earlier in this series ("grep: add support for the PCRE v1 JIT API", 2017-04-11) to un-break the build on PCRE v1 versions earlier than 8.20. The 8.20 release was the first release to have JIT & pcre_jit_stack in the headers, so a mock type needs to be provided for it on those

[PATCH v4 8/8] grep: add support for PCRE v2

2017-06-01 Thread Ævar Arnfjörð Bjarmason
Add support for v2 of the PCRE API. This is a new major version of PCRE that came out in early 2015[1]. The regular expression syntax is the same, but while the API is similar, pretty much every function is either renamed or takes different arguments. Thus using it via entirely new functions

[PATCH v4 4/8] grep: add support for the PCRE v1 JIT API

2017-06-01 Thread Ævar Arnfjörð Bjarmason
Change the grep PCRE v1 code to use JIT when available. When PCRE support was initially added in commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09) PCRE had no JIT support, it was integrated into 8.20 released on 2011-10-21. Enabling JIT support usually improves performance by more than 40%.

[PATCH v4 2/8] grep: skip pthreads overhead when using one thread

2017-06-01 Thread Ævar Arnfjörð Bjarmason
Skip the administrative overhead of using pthreads when only using one thread. Instead take the non-threaded path which would be taken under NO_PTHREADS. The threading support was initially added in commit 5b594f457a ("Threaded grep", 2010-01-25) with a hardcoded compile-time number of 8 threads.

[PATCH v4 7/8] grep: un-break building with PCRE >= 8.32 without --enable-jit

2017-06-01 Thread Ævar Arnfjörð Bjarmason
Amend my change earlier in this series ("grep: add support for the PCRE v1 JIT API", 2017-04-11) to un-break the build on PCRE v1 versions later than 8.31 compiled without --enable-jit. As explained in that change and a later compatibility change in this series ("grep: un-break building with PCRE

[PATCH v4 1/8] grep: don't redundantly compile throwaway patterns under threading

2017-06-01 Thread Ævar Arnfjörð Bjarmason
Change the pattern compilation logic under threading so that grep doesn't compile a pattern it never ends up using on the non-threaded code path, only to compile it again N times for N threads which will each use their own copy, ignoring the initially compiled pattern. This redundant compilation

[PATCH v4 3/8] log: add -P as a synonym for --perl-regexp

2017-06-01 Thread Ævar Arnfjörð Bjarmason
Add a short -P option as a synonym for the longer --perl-regexp, for consistency with the options the corresponding grep invocations accept. This was intentionally omitted in commit 727b6fc3ed ("log --grep: accept --basic-regexp and --perl-regexp", 2012-10-03) for unspecified future use. Make it

[PATCH v4 0/8] PCRE v2, PCRE v1 JIT, log -P & fixes

2017-06-01 Thread Ævar Arnfjörð Bjarmason
See <20170525200528.22037-1-ava...@gmail.com> for v3 (https://public-inbox.org/git/20170525200528.22037-1-ava...@gmail.com/). This is on top of "[PATCH v4 00/31] Easy to review grep & pre-PCRE changes". Changes: Ævar Arnfjörð Bjarmason (8): grep: don't redundantly compile throwaway patterns

Re: [PATCH 00/31] repository object

2017-06-01 Thread Brandon Williams
On 05/31, Brandon Williams wrote: > Given the vast interest expressed when I sent out my RFC series I decided it > would be worth it to invest more time to making a repository object a reality. > > This series is an extension of the last series I sent out (in that ls-files is > converted to

Re: RFC: Would a config fetch.retryCount make sense?

2017-06-01 Thread Stefan Beller
On Thu, Jun 1, 2017 at 5:48 AM, Lars Schneider wrote: > Hi, > > we occasionally see "The remote end hung up unexpectedly" (pkt-line.c:265) > on our `git fetch` calls (most noticeably in our automations). I expect > random network glitches to be the cause. There is

Re: [PATCH/RFC v2 2/6] branch: add copy branch option

2017-06-01 Thread Sahil Dua
On Thu, Jun 1, 2017 at 3:50 AM, Junio C Hamano wrote: > Sahil Dua writes: > >> Adds copy branch option available using -c or -C (forcefully). >> >> Includes a lot of function renames and their signature changes in order >> to introduce a new function

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Martin Ågren
On 1 June 2017 at 13:53, Martin Ågren wrote: > On 1 June 2017 at 12:33, Ævar Arnfjörð Bjarmason wrote: >> On Thu, Jun 1, 2017 at 12:26 PM, Martin Ågren wrote: >>> On 1 June 2017 at 12:08, Andreas Schwab wrote:

Re: [PATCH 1/2] format-patch: have progress option while generating patches

2017-06-01 Thread Jeff King
On Thu, Jun 01, 2017 at 01:15:57PM +0200, Johannes Schindelin wrote: > On Wed, 31 May 2017, Jeff King wrote: > > > I'm generally in favor of progress meters, though it does seem a little > > funny to me that we'd need one on format-patch. > > When working with huge repositories with a large

Re: [PATCH v2] docs: fix formatting and grammar

2017-06-01 Thread Jeff King
On Thu, Jun 01, 2017 at 11:37:03AM +0100, Adam Dinwoodie wrote: > When compiling the documentation, asciidoc thinks a backtick surrounded > by whitespace shouldn't be interpreted as marking the start or end of a > literal. In most cases, that's useful behaviour, but in the git-pull >

[PATCH v4 5/6] fsmonitor: add documentation for the fsmonitor extension.

2017-06-01 Thread Ben Peart
This includes the core.fsmonitor setting, the query-fsmonitor hook, and the fsmonitor index extension. Signed-off-by: Ben Peart --- Documentation/config.txt | 7 +++ Documentation/githooks.txt | 23 +++

[PATCH v4 6/6] fsmonitor: add a sample query-fsmonitor hook script for Watchman

2017-06-01 Thread Ben Peart
This hook script integrates the new fsmonitor capabilities of git with the cross platform Watchman file watching service. To use the script: Download and install Watchman from https://facebook.github.io/watchman/ and instruct Watchman to watch your working directory for changes ('watchman

[PATCH v4 0/6] Fast git status via a file system watcher

2017-06-01 Thread Ben Peart
Changes from V3 include: - update test script based on feedback - update template hook proc with better post-processing code and make it executable Ben Peart (6): bswap: add 64 bit endianness helper get_be64 dir: make lookup_untracked() available outside of dir.c fsmonitor: teach git

[PATCH v4 1/6] bswap: add 64 bit endianness helper get_be64

2017-06-01 Thread Ben Peart
Add a new get_be64 macro to enable 64 bit endian conversions on memory that may or may not be aligned. Signed-off-by: Ben Peart --- compat/bswap.h | 4 1 file changed, 4 insertions(+) diff --git a/compat/bswap.h b/compat/bswap.h index d47c003544..f89fe7f4b5 100644

[PATCH v4 2/6] dir: make lookup_untracked() available outside of dir.c

2017-06-01 Thread Ben Peart
Remove the static qualifier from lookup_untracked() and make it available to other modules by exporting it from dir.h. This will be used later when we need to find entries to mark 'fsmonitor dirty.' Signed-off-by: Ben Peart --- dir.c | 2 +- dir.h | 3 +++ 2 files

[PATCH v4 4/6] fsmonitor: add test cases for fsmonitor extension

2017-06-01 Thread Ben Peart
Add test cases that ensure status results are correct when using the new fsmonitor extension. Test untracked, modified, and new files by ensuring the results are identical to when not using the extension. Add a test to ensure updates to the index properly mark corresponding entries in the index

[PATCH v4 3/6] fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files.

2017-06-01 Thread Ben Peart
When the index is read from disk, the query-fsmonitor index extension is used to flag the last known potentially dirty index and untracked cache entries. If git finds out some entries are 'fsmonitor-dirty', but are really unchanged (e.g. the file was changed, then reverted back), then Git will

Re: wrong language translation part7

2017-06-01 Thread Kevin Daudt
On Thu, Jun 01, 2017 at 01:16:11PM +0200, SJR wrote: > W dniu 1 czerwca 2017 09:43 użytkownik SJR napisał: > > > > Hi, > > > > https://git-scm.com/book/pl/v1/Dostosowywanie-Gita-Konfiguracja-Gita > > > > part in polish part in english. > > > > Can You repair translation? > > >

  1   2   >