Re: [PATCH 2/7] diff.c: take "prefix" argument in diff_opt_parse()

On Wed, Jan 20, 2016 at 01:49:21PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > On Wed, Jan 20, 2016 at 12:23:38PM -0800, Junio C Hamano wrote: > > > >> Nguyễn Thái Ngọc Duy writes: > >> > >> > This will be important later when diff_opt_parse()

jc/rerere-multi (was: What's cooking in git.git (Jan 2016, #04; Wed, 20))

Am 21.01.2016 um 00:33 schrieb Junio C Hamano: > * jc/rerere-multi (2015-09-14) 7 commits > - rerere: do use multiple variants > - t4200: rerere a merge with two identical conflicts > - rerere: allow multiple variants to exist > - rerere: delay the recording of preimage > - rerere:

Re: [PATCH 2/5] config.mak.uname: supporting 64-bit MSys2

Hi Gábor, On Thu, 21 Jan 2016, SZEDER Gábor wrote: > > This just makes things compile, the test suite needs extra tender > > loving care in addition to this change. We will address these issues > > in later commits. Please note this statement: > > While at it, also allow building MSys2 Git

Re: [PATCH v3 17/20] refs: allow ref backend to be set for clone

Quoting David Turner : Thanks for the suggestions. With your permission, I will add: Signed-off-by: SZEDER Gábor to all three of these patches post-squash. Is that OK? Sure... (But does such a trivial one-liner need a sign-off at all, when

Re: git status during interactive rebase

Hi Stefan, On Wed, 20 Jan 2016, Stefan Beller wrote: > So I ran an interactive rebase, and while editing > .git/rebase-merge/git-rebase-todo I tried to run > `git status` in another terminal to inquire about a > filename of an untracked file. Heh, I don't think that anybody did that before,

git-diff: unable to turn off diff.autorefreshindex with command line switch

Hello, I am seeing unexpected behaviour on my system with git-diff and stat-only changes: diff.autorefreshindex=0 only works when in a repo's config (./.git/config); it doesn't work via a -c switch. Conversely -c diff.autorefreshindex=1 does indeed override a 0 setting in the repo's config.

Re: [PATCH 2/5] config.mak.uname: supporting 64-bit MSys2

> This just makes things compile, the test suite needs extra tender loving > care in addition to this change. We will address these issues in later > commits. > > While at it, also allow building MSys2 Git (i.e. a Git that uses MSys2's > POSIX emulation layer). > > Signed-off-by: Johannes

[PATCH] Consistent usage of working tree in the git-add help

The usage of working directory is inconsistent in the git add help. Also http://git-scm.com/docs/git-clone speaks only about working tree. Remaining entry found by "git grep -B1 '^directory' git-add.txt" really relates to a directory. Signed-off-by: Lars Vogel ---

Zombie tag

I'm having trouble to get rid of a deleted tag. Here's what I did: - push master branch from a non-bare repo (R1) into a bare repo (B1) - push a tag (tag-a) from R1 into the same B1 - force-push master from another non-bare repo (R2) into B1 - do 'git push B1 :tag-a' from R2 to delete the tag

Re: git status during interactive rebase

Stefan Beller writes: > So I ran an interactive rebase, and while editing > .git/rebase-merge/git-rebase-todo I tried to run > `git status` in another terminal to inquire about a > filename of an untracked file. > > However, I got: > > $ git status > On branch

Re: [PATCH] Consistent usage of working tree in the git-add help

Thanks Junio for the feedback. I send a new patch with only the first change. On Thu, Jan 21, 2016 at 1:24 AM, Junio C Hamano wrote: > Lars Vogel writes: > >> The usage of working directory is inconsistent in the git add help. >> Also

Re: Zombie tag

Am 21.01.2016 um 09:17 schrieb stefan.na...@atlas-elektronik.com: > I'm having trouble to get rid of a deleted tag. > Here's what I did: > > - push master branch from a non-bare repo (R1) into a bare repo (B1) > - push a tag (tag-a) from R1 into the same B1 > - force-push master from another

Re: [PATCH 7/7] merge: add --rename-notes

Nguyễn Thái Ngọc Duy writes: > +/* > + * Traverse through the given notes tree, convert all "path to path" > + * rename lines into "blob to blob" and return it. If cache_file is > + * non-NULL, return it's content if still valid. Otherwise save the > + * new content in it. >

Re: [PATCH v3 04/15] ref-filter: introduce struct used_atom

On Tuesday, January 5, 2016, Karthik Nayak wrote: > Introduce the 'used_atom' structure to replace the existing > implementation of 'used_atom' (which is a list of atoms). This helps > us parse atoms beforehand and store required details into the > 'used_atom' for future

Re: [PATCH 3/4] submodule update: Initialize all group-selected submodules by default

On Wed, Jan 20, 2016 at 8:40 PM, Junio C Hamano wrote: > I am not sure what you mean by the above snippet. With > > [submodule "foo"] > group = default > [submodule "bar"] > group = optional > [submodule "baz"] >

Re: [PATCH v3 01/15] strbuf: introduce strbuf_split_str_omit_term()

On Wed, Jan 6, 2016 at 2:27 AM, Karthik Nayak wrote: > On Wed, Jan 6, 2016 at 12:54 AM, Junio C Hamano wrote: >> Karthik Nayak writes: >>> while (slen) { >>> int len = slen; >>> + const char *end =

Re: [PATCH 3/4] submodule update: Initialize all group-selected submodules by default

Stefan Beller writes: > "submodule.$name.group" to be found in .gitmodules, maybe overwritten in > .git/config tells for each submodule its memberships of groups. > > "submodule.group" should be found in .git/config only, to tell some time > after cloning which group

[PATCH] completion: add missing git-rebase options

This adds the --no-* variants where those are documented in git-rebase(1). Signed-off-by: John Keeping --- contrib/completion/git-completion.bash | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash

Re: [PATCH 3/4] submodule update: Initialize all group-selected submodules by default

Junio C Hamano writes: > Ahh, it wasn't clear that was what you were trying to do. If that > is the case, then ... > ... > So I do not think --remember-init-for-tracking is necessary. Just > make it _always_ on and be done with it, I would say. By the way, I forgot to say

Re: [PATCH] unpack-trees: fix accidentally quadratic behavior

On Thu, 2016-01-21 at 11:51 -0800, Junio C Hamano wrote: > David Turner writes: > > > On Wed, 2016-01-20 at 20:58 -0800, Junio C Hamano wrote: > > > David Turner writes: > > > > > > > While unpacking trees (e.g. during git checkout), when we

Re: git status during interactive rebase

On Thu, Jan 21, 2016 at 12:23 AM, Matthieu Moy wrote: > Stefan Beller writes: > >> So I ran an interactive rebase, and while editing >> .git/rebase-merge/git-rebase-todo I tried to run >> `git status` in another terminal to inquire about a >>

Re: jc/rerere-multi

Johannes Sixt writes: > I finally found some time to test and review this series. I have one > case where there are many identical conflicts (up to 15!) that rerere > was unable to resolve. But with this series applied, all of them are > now resolved automatically and correctly.

[PATCHv4 2/2] submodule: port init from shell to C

By having the `init` functionality in C, we can reference it easier from other parts in the code. Signed-off-by: Stefan Beller --- Hi Junio, please replace the top-most patch of sb/submodule-init with this patch. This will print to stdout instead of stderr, as it's the

Re: [PATCH 0/4] Submodule Groups

Stefan Beller writes: > I think having both is bad as it may contradict each other? > What is supposed to happen here: > > [submodule "frotz"] > group = default > > [submoduleGroup "default"] > member = !:frotz What is supposed to happen is that

Re: [PATCH 2/7] diff.c: take "prefix" argument in diff_opt_parse()

Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH 0/4] Submodule Groups

On Thu, Jan 21, 2016 at 1:17 PM, Sebastian Schuberth wrote: > On 20.01.2016 04:34, Stefan Beller wrote: > >> So you could have a .gitmodules file such as: >> >> [submodule "gcc"] >> path = gcc >> url = git://... >> groups = default >>

Re: [PATCH 0/4] Submodule Groups

On Thu, Jan 21, 2016 at 2:18 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> Instead of having a submodule -> set assignment, we could do it the >> other way round: >> >> [submodule "gcc"] >> ... >> >> [submodule-set "default"] >>

Re: [PATCH v2] unpack-trees: fix accidentally quadratic behavior

On Thu, 2016-01-21 at 16:30 -0500, Jeff King wrote: > On Thu, Jan 21, 2016 at 04:11:48PM -0500, David Turner wrote: > > > While unpacking trees (e.g. during git checkout), when we hit a > > cache > > entry that's past and outside our path, we cut off iteration. > > > > This provides about a 45%

Re: [PATCH] unpack-trees: fix accidentally quadratic behavior

David Turner writes: >> The first break is correct, but I am not sure about the "else if" >> part. Shouldn't it be doing something similar to the logic to "keep >> looking" that talks about "t-i", "t" and "t/a" at the end of the >> loop? > > Rather than doing more

[PATCH v2] unpack-trees: fix accidentally quadratic behavior

While unpacking trees (e.g. during git checkout), when we hit a cache entry that's past and outside our path, we cut off iteration. This provides about a 45% speedup on git checkout between master and master^2 on Twitter's monorepo. Speedup in general will depend on repostitory structure,

Re: [PATCH 0/4] Submodule Groups

On 20.01.2016 04:34, Stefan Beller wrote: > So you could have a .gitmodules file such as: > > [submodule "gcc"] > path = gcc > url = git://... > groups = default > groups = devel On the quick I was unable to find the rationale why entries are now stored as

Re: [PATCH v2] unpack-trees: fix accidentally quadratic behavior

On Thu, Jan 21, 2016 at 04:11:48PM -0500, David Turner wrote: > While unpacking trees (e.g. during git checkout), when we hit a cache > entry that's past and outside our path, we cut off iteration. > > This provides about a 45% speedup on git checkout between master and > master^2 on

Re: git-diff: unable to turn off diff.autorefreshindex with command line switch

On Thu, Jan 21, 2016 at 10:29:49AM +, Andrew Stewart wrote: > # Now the strange behaviour: no output from the next command > $ git -c diff.autorefreshindex=0 diff --raw -- README I can't reproduce here (v2.7.0, Linux). But note that your whole test is going to be racy, and possibly depend

Re: [PATCH 0/4] Submodule Groups

Stefan Beller writes: > Instead of having a submodule -> set assignment, we could do it the > other way round: > > [submodule "gcc"] > ... > > [submodule-set "default"] > submodule = gcc > submodule = foo > submodule = by/path/* > >

Re: [PATCH 0/4] Submodule Groups

Junio C Hamano writes: > I suspect that we will end up needing to support both styles. The > latter style is easier when you want to express a larger set as a > collection of groups, e.g. > ... > might be a way to say "the default group includes everything in the >

Re: git status during interactive rebase

Stefan Beller writes: >> So the proper fix might be to test for the presence of the "done" file and >> otherwise tell the user that this rebase has not even started yet. > > So what Matthieu said? Yup, I think that is the right thing to do. Perhaps something along this line

Re: [PATCH] travis-ci: run previously failed tests first, then slowest to fastest

On Wed, Jan 20, 2016 at 10:22:16AM +0100, Lars Schneider wrote: > I tested different settings and found that running prove with "-j5" seems to > be > the fastest option for the Travis CI machines. However, I also noticed that > I got more test failures with higher parallelism (Dscho reported

Re: [PATCH 4/7] log: add --rename-notes to correct renames per commit

On Thu, Jan 21, 2016 at 6:29 AM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> For simplicity, the note of commit A implies rename correction between >> A^ and A. If parents are manipulated (e.g. "git log --reflog") then >> the rename output may

Re: [PATCH] Documentation: remove unnecessary backslashes

On Wed, Jan 20, 2016 at 03:34:30PM -0500, Jeff King wrote: > On Wed, Jan 20, 2016 at 12:28:53PM -0800, Junio C Hamano wrote: > > On the other hand, if this line must be spelled like the above to > > please asciidoctor, i.e. the first and the last must not have > > backslashes and the second must

Re: [PATCH] travis-ci: run previously failed tests first, then slowest to fastest

On Fri, Jan 22, 2016 at 12:52:55AM -0500, Jeff King wrote: > I get a few of the threads failing (in test 4) after 2-3 minutes. The > "-v" output is pretty unenlightening, though. I don't see anything > racy-looking in the test unless it is something with "read-tree" and > stat mtimes. And

Re: [PATCH] unpack-trees: fix accidentally quadratic behavior

On Wed, 2016-01-20 at 20:58 -0800, Junio C Hamano wrote: > David Turner writes: > > > While unpacking trees (e.g. during git checkout), when we hit a > > cache > > entry that's past and outside our path, we cut off iteration. > > > > This provides about a 45% speedup

Re: [PATCH] unpack-trees: fix accidentally quadratic behavior

David Turner writes: > On Wed, 2016-01-20 at 20:58 -0800, Junio C Hamano wrote: >> David Turner writes: >> >> > While unpacking trees (e.g. during git checkout), when we hit a >> > cache >> > entry that's past and outside our path, we cut off