Re: [PATCH 1/4] git submodule: Teach add to accept --group

Stefan Beller writes: > Right, that's what I have here now. I should have said that. > > I was not trying to excuse anything, but more explaining the situation > when reading the second sentence. (You seem to assume I'd want to rewrite > all the shell scripts. Which I am not)

Re: [PATCH 1/2] Add tests for git-sh-setup's require_clean_work_tree()

SZEDER Gábor writes: > Quoting Junio C Hamano : > >>> +test_expect_success 'error on clean index and worktree while on >>> orphan branch' ' >>> + test_when_finished "git checkout master" && >>> + git checkout --orphan orphan && >>> + git reset --hard

Re: [PATCH 2/4] submodule-config: keep groups around

Stefan Beller writes: > In this patch series we only need to check the items of that list one by one, > no need for a sorted version, so I'll change it to be unsorted and > document that. I actually was going to suggest keeping the sorted one. The order may be changed from

Re: [PATCH 1/2] Add tests for git-sh-setup's require_clean_work_tree()

Quoting Junio C Hamano : +test_expect_success 'error on clean index and worktree while on orphan branch' ' + test_when_finished "git checkout master" && + git checkout --orphan orphan && + git reset --hard && + test_must_fail

[PATCH] push --force-with-lease: Fix ref status reporting

From: Andrew Wheeler The --force--with-lease push option leads to less detailed status information than --force. In particular, the output indicates that a reference was fast-forwarded, even when it was force-updated. Modify the --force-with-lease ref status logic to

HOW ARE YOU MY DEAR

I am General Wurth.I am serving in the US military in Afghanistan with the army infantry division,during our search and rescue duty in Afghanistan, my team came across hidden treasure that contains 40kilos of gold dust and a huge amount of money in the rebel camp.we want to move the fund out of

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

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 on git checkout between master and > master^2 on Twitter's monorepo.

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

Stefan Beller writes: > On Wed, Jan 20, 2016 at 1:30 PM, Junio C Hamano wrote: > >> If this were used to implement "there are various groups defined, >> and the user tells us that submodules in this and that groups are to >> be automatically initialized",

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

On Wed, Jan 20, 2016 at 1:30 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> All submodules which are selected via submodule groups >> ("submodule.groups") are initialized if they were not initialized >> before updating the submodules. >> >>

HOW ARE YOU MY DEAR

I am General Wurth.I am serving in the US military in Afghanistan with the army infantry division,during our search and rescue duty in Afghanistan, my team came across hidden treasure that contains 40kilos of gold dust and a huge amount of money in the rebel camp.we want to move the fund out of

[PATCH] 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,

[PATCH] completion: Add --word-diff-regex= to diff

Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index ab4da7f..d2a08dd 100644 ---

Re: [PATCH] Documentation: remove unnecessary backslashes

On Wed, Jan 20, 2016 at 09:21:37AM -0800, Matt Kraai wrote: > From: Matthew Kraai > > asciidoctor does not remove backslashes used to escape curly brackets from > the HTML output if the contents of the curly brackets are empty or contain > at least a <, -, or space.

Re: [PATCH 1/1] contrib/subtree: Make testing easier

David Greene writes: > From: David A. Greene > > Add some Makefile dependencies to ensure an updated git-subtree > gets copied to the main area before testing begins. > > Signed-off-by: David A. Greene > --- > > Notes: >

Re: [PATCH] Documentation: remove unnecessary backslashes

On Wed, Jan 20, 2016 at 12:28:53PM -0800, Junio C Hamano wrote: > >> -'@\{\}', e.g. 'master@\{yesterday\}', 'HEAD@\{5 minutes > >> ago\}':: > >> +'@{}', e.g. 'master@\{yesterday\}', 'HEAD@{5 minutes > >> ago}':: > > > > I see you didn't tweak the middle one here, because it _does_ look like > >

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

Stefan Beller writes: > By having the `init` functionality in C, we can reference it easier > from other parts in the code. > > Signed-off-by: Stefan Beller > Signed-off-by: Junio C Hamano > --- How faithful a conversion is this

Re: [PATCH 1/4] git submodule: Teach add to accept --group

Stefan Beller writes: > diff --git a/git-submodule.sh b/git-submodule.sh > index 6fce0dc..ab0f209 100755 > --- a/git-submodule.sh > +++ b/git-submodule.sh > @@ -130,6 +130,7 @@ cmd_add() > { > # parse $args after "submodule ... add". > reference_path= > +

Re: [PATCH] Documentation: remove unnecessary backslashes

Jeff King writes: > On Wed, Jan 20, 2016 at 09:21:37AM -0800, Matt Kraai wrote: > >> From: Matthew Kraai >> >> asciidoctor does not remove backslashes used to escape curly brackets from >> the HTML output if the contents of the curly brackets are empty or

Bug(ish) - Documentation of .gitattributes Globbing Syntax Whitespace Escapes

In the documentation for .gitattributes, "[[:space:]]" is mentioned in a code snippet but is not documented, and neither is the glob syntax escape from the documentation page for .gitignore ("\ ") not working with .gitattributes. For example, in a .gitattributes file the first glob will work, but

Re: [PATCHv7 0/8] Expose submodule parallelism to the user

Stefan Beller writes: > This is a resend of sb/submodule-parallel-update and is available > at github[1] as well. It applies on top of > sb/submodule-parallel-fetch > > What does it do? > --- > This series should finish the on going efforts of parallelizing > submodule

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

Lars Schneider writes: > On 19 Jan 2016, at 21:00, Junio C Hamano wrote: > >> IOW, I am confused by the beginning of the log message that says >> this is taking advantage of "the Travis-CI cache feature". This >> improvement looks to me like using

Re: [PATCH 2/4] submodule-config: keep groups around

Stefan Beller writes: > We need the submodule groups in a later patch. > > Signed-off-by: Stefan Beller > --- > submodule-config.c | 13 + > submodule-config.h | 1 + > 2 files changed, 14 insertions(+) > > diff --git a/submodule-config.c

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

Stefan Beller writes: > All submodules which are selected via submodule groups > ("submodule.groups") are initialized if they were not initialized > before updating the submodules. > > Signed-off-by: Stefan Beller > --- > builtin/submodule--helper.c | 30

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

Nguyễn Thái Ngọc Duy writes: > This will be important later when diff_opt_parse() accepts paths as > arguments. Paths must be prefixed before access because setup code > moves cwd but does not (and cannot) update command line options. The above sounds like a sensible thing

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

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() accepts paths as > > arguments. Paths must be prefixed before access because setup code > > moves cwd but does not (and

Re: [PATCH] Documentation: remove unnecessary backslashes

Hi, On Wed, Jan 20, 2016 at 01:24:21PM -0500, Jeff King wrote: > On Wed, Jan 20, 2016 at 09:21:37AM -0800, Matt Kraai wrote: > > -'@\{\}', e.g. 'master@\{yesterday\}', 'HEAD@\{5 minutes > > ago\}':: > > +'@{}', e.g. 'master@\{yesterday\}', 'HEAD@{5 minutes ago}':: > > I see you didn't tweak the

Re: [PATCH 4/4] builtin/clone: support submodule groups

Stefan Beller writes: > When invocing clone with the groups option, > the repository will be configured to the specified groups. > This has implications for the submodule commands, such as > update. > > Having groups configured will imply init for all uninitialized >

Re: Is there interest in a n-sect tool?

Mike Hommey writes: > On Mon, Jan 18, 2016 at 07:54:21PM -0800, Junio C Hamano wrote: > >> Hmm, sorry. For the two-trait example I gave (that can be extended >> to N-trait), I can sort of see how the UI might look and I can say >> it might be useful [*1*], but not with this,

What's cooking in git.git (Jan 2016, #04; Wed, 20)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. The tip of 'master' now has

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

Stefan Beller writes: > "say" respects the setting of GIT_QUIET, which is usually set when > --quiet is passed, so I think I want: > > - A faithful rewrite from shell to C including messages respecting >--quiet, such that the "say" behavior is kept. > > -

git status during interactive rebase

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 submodule-groups-v3 fatal: Could not open file .git/rebase-merge/done for

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

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 surprise people. I do not think "git log --reflog" attempts to show changes to

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

On Wed, Jan 20, 2016 at 1:01 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> By having the `init` functionality in C, we can reference it easier >> from other parts in the code. >> >> Signed-off-by: Stefan Beller >>

Re: [PATCH v6 00/11] Untracked cache improvements

Thanks. Will queue. Anybody who knows the untracked code wants to give the final eyeballing over the series, so that we can start thinking about merging it to 'next'? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More

Re: Is there interest in a n-sect tool?

On Wed, Jan 20, 2016 at 02:05:22PM -0800, Junio C Hamano wrote: > Mike Hommey writes: > > > On Mon, Jan 18, 2016 at 07:54:21PM -0800, Junio C Hamano wrote: > > > >> Hmm, sorry. For the two-trait example I gave (that can be extended > >> to N-trait), I can sort of see how the

Re: [PATCH 3/7] diff: add --rename-file

Nguyễn Thái Ngọc Duy writes: > Git's heuristics to detect renames or copies works most of the time. > This option can be used to correct the result when it goes wrong. > Matching pairs get max rename score and override even exact rename > detection. > > Note that

Re: [PATCH 3/7] diff: add --rename-file

Nguyễn Thái Ngọc Duy writes: > Git's heuristics to detect renames or copies works most of the time. > This option can be used to correct the result when it goes wrong. > Matching pairs get max rename score and override even exact rename > detection. > > Note that

GIT Question

Specs: MacBook Pro OS X Yosemite 2.6 GHz Intel Core i5, 8GN 1600 MHz DDR3 After selecting the Git option in a recent install of Visual Studio Code 2015 for MAC, my filesystem was removed. I can no longer access any of the local files stored on my machine. After researching many blogs/websites

[PATCH] Documentation: remove unnecessary backslashes

From: Matthew Kraai asciidoctor does not remove backslashes used to escape curly brackets from the HTML output if the contents of the curly brackets are empty or contain at least a <, -, or space. asciidoc does not require the backslashes in these cases, so just remove

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

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() accepts paths as >> > arguments. Paths must be prefixed before access because

Re: [PATCH 1/4] git submodule: Teach add to accept --group

On Wed, Jan 20, 2016 at 1:18 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> diff --git a/git-submodule.sh b/git-submodule.sh >> index 6fce0dc..ab0f209 100755 >> --- a/git-submodule.sh >> +++ b/git-submodule.sh >> @@ -130,6 +130,7 @@ cmd_add() >> {

Re: [PATCH 1/2] Add tests for git-sh-setup's require_clean_work_tree()

SZEDER Gábor writes: > Add tests that check require_clean_work_tree() in the common cases, > i.e. on a branch with all combinations of clean and dirty index and > worktree, and also add tests that exercise it on an orphan branch. > > require_clean_work_tree()'s behavior in the

Re: [PATCH 1/4] git submodule: Teach add to accept --group

On Wed, Jan 20, 2016 at 4:08 PM, Junio C Hamano wrote: > Stefan Beller writes: > @@ -165,6 +166,10 @@ cmd_add() --depth=*) depth=$1 ;; + -g|--group) +

Re: [PATCH] completion: Add --word-diff-regex= to diff

Thomas Braun writes: > Signed-off-by: Thomas Braun > --- > contrib/completion/git-completion.bash | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/contrib/completion/git-completion.bash >

Re: [PATCH 2/2] sh-setup: make require_clean_work_tree() work on orphan branches

SZEDER Gábor writes: > git-sh-setup's require_clean_work_tree() always exits with error on an > orphan branch, even when the index and worktree are both clean. Ah, I just sent a review on 1/2 as I found it was not commented on by anybody, but re-reading this sentence (and

Re: [PATCH 1/4] git submodule: Teach add to accept --group

Stefan Beller writes: >>> @@ -165,6 +166,10 @@ cmd_add() >>> --depth=*) >>> depth=$1 >>> ;; >>> + -g|--group) >>> + >>> submodule_groups=${submodule_groups:+${submodule_groups};}"$2"

Re: [PATCH 2/4] submodule-config: keep groups around

On Wed, Jan 20, 2016 at 1:23 PM, Junio C Hamano wrote: >> free((void *) entry->config->name); >> + if (entry->config->groups) >> + string_list_clear(entry->config->groups, 0); > > You are allocating entry->config->groups itself in the in the hunk > around

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

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