Re: [PATCH 07/11] graph: commit and post-merge lines for left-skewed merges

2019-10-12 Thread Jeff King
On Fri, Oct 11, 2019 at 06:04:21PM +0100, James Coglan wrote: > > I should have noticed in your earlier commits, but why don't you keep > > the output inside the test suite? You can start with "cat >expect <<-EOF" > > to have it ignore leading whitespace. Sorry if there's something else about > >

Re: Cannot shallow clone using GitHub tag refs after commit 34066f06

2019-10-12 Thread Jeff King
On Sat, Oct 12, 2019 at 06:31:02PM -0400, Teddy Reed wrote: > Hello, I am trying to debug an issue where a shallow clone (--depth=1) > fails when the reference is the tip of a tag on a GitHub repository. > > The git client works on versions below 2.22.0-rc0 up until commit > 34066f06, "fetch: do

Re: [PATCH 2/2] merge-recursive: fix merging a subdirectory into the root directory

2019-10-12 Thread Elijah Newren
Hi Dscho, Thanks for the reviews! On Sat, Oct 12, 2019 at 1:37 PM Johannes Schindelin wrote: > On Fri, 11 Oct 2019, Elijah Newren via GitGitGadget wrote: > [...] > > @@ -1980,6 +1990,25 @@ static void get_renamed_dir_portion(const char > > *old_path, const char *new_path, > > *end_of_

Re: [PATCH v3 00/17] New sparse-checkout builtin and "cone" mode

2019-10-12 Thread Elijah Newren
On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget wrote: > > This series makes the sparse-checkout feature more user-friendly. While > there, I also present a way to use a limited set of patterns to gain a > significant performance boost in very large repositories. > > Sparse-checkout

Re: [PATCH v3 17/17] sparse-checkout: cone mode should not interact with .gitignore

2019-10-12 Thread Elijah Newren
On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget wrote: > > From: Derrick Stolee > > During the development of the sparse-checkout "cone mode" feature, > an incorrect placement of the initializer for "use_cone_patterns = 1" > caused warnings to show up when a .gitignore file was pre

Re: [PATCH v3 16/17] sparse-checkout: write using lockfile

2019-10-12 Thread Elijah Newren
On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget wrote: > > From: Derrick Stolee > > If two 'git sparse-checkout set' subcommands are launched at the > same time, the behavior can be unexpected as they compete to write > the sparse-checkout file and update the working directory. > >

Re: [PATCH v3 15/17] sparse-checkout: update working directory in-process

2019-10-12 Thread Elijah Newren
On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget wrote: > > From: Derrick Stolee > > The sparse-checkout builtin used 'git read-tree -mu HEAD' to update the > skip-worktree bits in the index and to update the working directory. > This extra process is overly complex, and prone to fa

Cannot shallow clone using GitHub tag refs after commit 34066f06

2019-10-12 Thread Teddy Reed
Hello, I am trying to debug an issue where a shallow clone (--depth=1) fails when the reference is the tip of a tag on a GitHub repository. The git client works on versions below 2.22.0-rc0 up until commit 34066f06, "fetch: do not consider peeled tags as advertised tips". That commit peels refs

Re: [PATCH v3 13/17] read-tree: show progress by default

2019-10-12 Thread Elijah Newren
On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget wrote: > > From: Derrick Stolee > > The read-tree builtin has a --verbose option that signals to show > progress and other data while updating the index. Update this to > be on by default when stderr is a terminal window. > > This wil

ds/sparse-cone, was Re: What's cooking in git.git (Oct 2019, #03; Fri, 11)

2019-10-12 Thread Johannes Schindelin
Hi Junio, On Fri, 11 Oct 2019, Junio C Hamano wrote: > * ds/sparse-cone (2019-10-08) 17 commits > - sparse-checkout: cone mode should not interact with .gitignore > - sparse-checkout: write using lockfile > - sparse-checkout: update working directory in-process > - sparse-checkout: sanitize f

Re: [PATCH v4 1/1] Make gitdir work with worktrees, respect core.hooksPath, etc

2019-10-12 Thread Johannes Schindelin
Hi Pratyush, On Sat, 12 Oct 2019, Pratyush Yadav wrote: > On 08/10/19 04:33AM, Johannes Schindelin via GitGitGadget wrote: > > > @@ -1453,10 +1501,16 @@ proc rescan {after {honor_trustmtime 1}} { > > global HEAD PARENT MERGE_HEAD commit_type > > global ui_index ui_workdir ui_comm > >

Re: [PATCH 2/2] merge-recursive: fix merging a subdirectory into the root directory

2019-10-12 Thread Johannes Schindelin
Hi Elijah, On Fri, 11 Oct 2019, Elijah Newren via GitGitGadget wrote: > From: Elijah Newren > > We allow renaming all entries in e.g. a directory named z/ into a > directory named y/ to be detected as a z/ -> y/ rename, so that if the > other side of history adds any files to the directory z/ in

Re: Git Gui: Branch->create currently fails...

2019-10-12 Thread Philip Oakley
Hi Pratyus, On 08/10/2019 01:00, Pratyush Yadav wrote: On 07/10/19 11:02PM, Philip Oakley wrote: I'd never used the Branch:Create before (this is via mouse) and it threw an error, which appears to be repeatable, so I'm reporting it at the moment so I'm afraid I can't reproduce it. I tested by c

Re: [PATCH 1/2] merge-recursive: clean up get_renamed_dir_portion()

2019-10-12 Thread Johannes Schindelin
Hi Elijah, On Fri, 11 Oct 2019, Elijah Newren via GitGitGadget wrote: > From: Elijah Newren > > Dscho noted a few things making this function hard to follow. > Restructure it a bit and add comments to make it easier to follow. The > restructurings include: > > * There was a special case if-ch

Re: [PATCH v10 18/36] merge-recursive: add get_directory_renames()

2019-10-12 Thread Johannes Schindelin
Hi Elijah, On Fri, 11 Oct 2019, Elijah Newren wrote: > On Wed, Oct 9, 2019 at 1:39 PM Johannes Schindelin > wrote: > > > > sorry about the blast from the past, but I just stumbled over something > > I could not even find any discussion about: > > I'm curious what brought you to this part of the

Re: [PATCH 0/2] Dir rename fixes

2019-10-12 Thread Johannes Schindelin
Hi Elijah, On Fri, 11 Oct 2019, Elijah Newren via GitGitGadget wrote: > This series improves a couple things found after looking into things Dscho > flagged: > > * clarify and slightly restructure code in the get_renamed_dir_portion() >function > > * extend support of detecting renaming/mer

Re: [PATCH 01/11] graph: automatically track visible width of `strbuf`

2019-10-12 Thread Johannes Schindelin
Hi, I just realized that I completely failed to offer my enthusiasm not only for the idea of this patch series and the resulting graphs, but also at the really high quality of the contribution. Thanks, James, for working on this! And now just quickly... On Sat, 12 Oct 2019, Junio C Hamano wrote:

[PATCH v4] stash: avoid recursive hard reset on submodules

2019-10-12 Thread Jakob Jarmar
git stash push does not recursively stash submodules, but if submodule.recurse is set, it may recursively reset --hard them. Having only the destructive action recurse is likely to be surprising behaviour, and unlikely to be desirable, so the easiest fix should be to ensure that the call to git res

Re: [PATCH v3] stash: avoid recursive hard reset on submodules

2019-10-12 Thread Jakob Jarmar
On Sat, Oct 12, 2019 at 10:46:36AM +0900, Junio C Hamano wrote: > > + git init sub && > > + ( > > + cd sub && > > + test_commit sub_file > > + ) && > > + git init main && > > + ( > > + cd main && > > + git submodule add ../sub && > > + tes

Re: [PATCH] userdiff: Fix some corner cases in dts regex

2019-10-12 Thread Johannes Sixt
Am 08.10.19 um 16:43 schrieb Stephen Boyd: > Quoting Johannes Sixt (2019-10-05 07:09:11) >> Am 04.10.19 um 23:30 schrieb Stephen Boyd: >>> --- /dev/null >>> +++ b/t/t4018/dts-nodes-multiline-prop >>> @@ -0,0 +1,12 @@ >>> +/ { >>> + label_1: node1@ff00 { >>> + RIGHT@deadf00,4000 { >>

Re: [PATCH v3] git-gui: add a readme

2019-10-12 Thread Bert Wesarg
On Fri, Oct 11, 2019 at 11:35 PM Pratyush Yadav wrote: > > I'll take the silence to mean there are no further objections, and will > merge this version in to 'master'. correct. FWIW Acked-by: Bert Wesarg > > On 08/10/19 05:47PM, Pratyush Yadav wrote: > > It is a good idea to have a readme so p