[PATCH] git-gui: convert new/amend commit radiobutton to checketton

2019-09-12 Thread Bert Wesarg
Its a bi-state anyway and also saves one line in the menu. Signed-off-by: Bert Wesarg --- git-gui.sh | 36 +--- lib/checkout_op.tcl | 6 +++--- lib/commit.tcl | 4 ++-- lib/index.tcl | 8 4 files changed, 18 insertions(+), 36 deleti

Re: Patching Git to handle dates before the Unix epoch

2019-09-12 Thread Jeff King
On Tue, Sep 10, 2019 at 08:19:49PM +0300, Diomidis Spinellis wrote: > > > - Can you think of any non-obvious issues (e.g. backward compatibility, > > > switch to the Gregorian calendar) I should be aware of? > > > > The big question is: what will existing implementations do with a commit > > obje

Re: [PATCH v2 0/2] Date test code clean-up

2019-09-12 Thread Jeff King
On Wed, Sep 11, 2019 at 09:11:00PM -0700, Stephen P. Smith wrote: > Range Diff: > 1: f4170ad553 ! 1: e2b8322d58 Quit passing 'now' to date code > [...] Thanks, this version addresses all of my concerns from v1 (and overall looks good). -Peff

Re: [PATCH v2] Documentation: fix build with Asciidoctor 2

2019-09-12 Thread Jeff King
On Fri, Sep 13, 2019 at 01:52:40AM +, brian m. carlson wrote: > We also need to teach xmlto how to use the namespaced DocBook XSLT > stylesheets instead of the non-namespaced ones it usually uses. > Normally these stylesheets are interchangeable, but the non-namespaced > ones have a bug that c

Re: [PATCH 0/7] Fix more AsciiDoc/tor differences

2019-09-12 Thread Jeff King
On Sat, Sep 07, 2019 at 04:12:46PM +0200, Martin Ågren wrote: > This series roughly halves the line count of `./doc-diff --from-asciidoc > --to-asciidoctor --cut-header-footer HEAD HEAD`. Together with my recent > (independent) mini-series [1], I claim that Asciidoctor 1.5.5 now > processes the ma

Git Gui - enhancement suggestion - Can a double click on the file name in the “unstaged” area move the item to “staged changes”

2019-09-12 Thread Allan Ford
Dear Git Authors, Not a bug, but a suggestion consideration for “Git Gui” Can a double click on the file name in the “unstaged” area move the item to “staged changes” .. (rather than having to click on the small icon to the left of the file name?) cheers, Allan

[PATCH v2] Documentation: fix build with Asciidoctor 2

2019-09-12 Thread brian m. carlson
Our documentation toolchain has traditionally been built around DocBook 4.5. This version of DocBook is the last DTD-based version of DocBook. In 2009, DocBook 5 was introduced using namespaces and its syntax is expressed in RELAX NG, which is more expressive and allows a wider variety of syntax f

Re: [PATCH] list-objects: don't queue root trees unless revs->tree_objects is set

2019-09-12 Thread Jeff King
On Thu, Sep 12, 2019 at 09:52:53AM -0700, Junio C Hamano wrote: > Jeff King writes: > > >> I was surprised we ever called repo_get_commit_tree() at all, since > >> we're literally just traversing commits here. It looks like > >> list-objects.c is very happy to queue pending trees for each commit

Re: [PATCH 2/2] git-gui: add hotkey to toggle "Amend Last Commit" check button/menu

2019-09-12 Thread Philip Oakley
On 12/09/2019 22:34, Marc Branchaud wrote: I just tested what happens when you press Ctrl+e while Caps Lock is enabled; the Ctrl+e binding is not invoked. That's probably why other key bindings have the same function bound for both lower- and upper-case letters, to have the same behaviour with/wi

Re: [PATCH] git-gui: convert new/amend commit radiobutton to checketton

2019-09-12 Thread Philip Oakley
On 12/09/2019 20:44, Bert Wesarg wrote: Its a bi-state anyway and also safes one line in the menu. s/safes/saves/  ? Signed-off-by: Bert Wesarg --- Philip

[PATCH v3 12/12] clean: fix theoretical path corruption

2019-09-12 Thread Elijah Newren
cmd_clean() had the following code structure: struct strbuf abs_path = STRBUF_INIT; for_each_string_list_item(item, &del_list) { strbuf_addstr(&abs_path, prefix); strbuf_addstr(&abs_path, item->string); PROCESS(&abs_path); strbuf_reset(&abs_path); } whe

[PATCH v3 10/12] clean: avoid removing untracked files in a nested git repository

2019-09-12 Thread Elijah Newren
Users expect files in a nested git repository to be left alone unless sufficiently forced (with two -f's). Unfortunately, in certain circumstances, git would delete both tracked (and possibly dirty) files and untracked files within a nested repository. To explain how this happens, let's contrast

[PATCH v3 00/12] Fix some git clean issues

2019-09-12 Thread Elijah Newren
NOTE: This series builds on sg/clean-nested-repo-with-ignored, as it (among other things) modifies his testcase from expect_failure to expect_success. Also, Peff is probably the only one who remembers v1 (and even he may have forgotten it): v1 was posted a year and a half a

[PATCH v3 08/12] git-clean.txt: do not claim we will delete files with -n/--dry-run

2019-09-12 Thread Elijah Newren
It appears that the wrong option got included in the list of what will cause git-clean to actually take action. Correct the list. Signed-off-by: Elijah Newren --- Documentation/git-clean.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-clean.txt b/Docume

[PATCH v3 07/12] dir: add commentary explaining match_pathspec_item's return value

2019-09-12 Thread Elijah Newren
The way match_pathspec_item() handles names and pathspecs with trailing slash characters, in conjunction with special options like DO_MATCH_DIRECTORY and DO_MATCH_LEADING_PATHSPEC were non-obvious, and broken until this patch series. Add a table in a comment explaining the intent of how these work

[PATCH v3 09/12] clean: disambiguate the definition of -d

2019-09-12 Thread Elijah Newren
The -d flag pre-dated git-clean's ability to have paths specified. As such, the default for git-clean was to only remove untracked files in the current directory, and -d existed to allow it to recurse into subdirectories. The interaction of paths and the -d option appears to not have been careful

[PATCH v3 11/12] clean: rewrap overly long line

2019-09-12 Thread Elijah Newren
Signed-off-by: Elijah Newren --- builtin/clean.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/clean.c b/builtin/clean.c index 3a7a63ae71..6030842f3a 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -158,7 +158,8 @@ static int remove_dirs(struct strbuf *path,

[PATCH v3 04/12] dir: also check directories for matching pathspecs

2019-09-12 Thread Elijah Newren
Even if a directory doesn't match a pathspec, it is possible, depending on the precise pathspecs, that some file underneath it might. So we special case and recurse into the directory for such situations. However, we previously always added any untracked directory that we recursed into to the lis

[PATCH v3 03/12] dir: fix off-by-one error in match_pathspec_item

2019-09-12 Thread Elijah Newren
For a pathspec like 'foo/bar' comparing against a path named "foo/", namelen will be 4, and match[namelen] will be 'b'. The correct location of the directory separator is namelen-1. The reason the code worked anyway was that the following code immediately checked whether the first matchlen charac

[PATCH v3 02/12] dir: fix typo in comment

2019-09-12 Thread Elijah Newren
Signed-off-by: Elijah Newren --- dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir.c b/dir.c index d021c908e5..a9168bed96 100644 --- a/dir.c +++ b/dir.c @@ -139,7 +139,7 @@ static size_t common_prefix_len(const struct pathspec *pathspec) * ":(icase)path" is t

[PATCH v3 01/12] t7300: add testcases showing failure to clean specified pathspecs

2019-09-12 Thread Elijah Newren
Someone brought me a testcase where multiple git-clean invocations were required to clean out unwanted files: mkdir d{1,2} touch d{1,2}/ut touch d1/t && git add d1/t With this setup, the user would need to run git clean -ffd */ut twice to delete both ut files. A little testing showed some

[PATCH v3 06/12] dir: if our pathspec might match files under a dir, recurse into it

2019-09-12 Thread Elijah Newren
For git clean, if a directory is entirely untracked and the user did not specify -d (corresponding to DIR_SHOW_IGNORED_TOO), then we usually do not want to remove that directory and thus do not recurse into it. However, if the user manually specified specific (or even globbed) paths somewhere under

[PATCH v3 05/12] dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case

2019-09-12 Thread Elijah Newren
The specific checks done in match_pathspec_item for the DO_MATCH_SUBMODULE case are useful for other cases which have nothing to do with submodules. Rename this constant; a subsequent commit will make use of this change. Signed-off-by: Elijah Newren --- dir.c | 6 +++--- 1 file changed, 3 insert

Re: [PATCH 2/2] git-gui: add hotkey to toggle "Amend Last Commit" check button/menu

2019-09-12 Thread Marc Branchaud
On 2019-09-12 12:29 p.m., Pratyush Yadav wrote: On 12/09/19 08:05AM, Birger Skogeng Pedersen wrote: Hi Pratyush, On Wed, Sep 11, 2019 at 10:55 PM Pratyush Yadav wrote: Also, I notice that the bindings for other letters have the same function bound for both small and capital letters (IOW, same

Re: [PATCH v2 1/3] Makefile: define THIRD_PARTY_SOURCES

2019-09-12 Thread Junio C Hamano
Denton Liu writes: > After looking through the source files in compat/ and investigating the > files' content and/or its Git history, I've determined the list of files > that were copied from a third-party source. Place the names of these > files into the THIRD_PARTY_SOURCES variable in the Makef

Re: [PATCH 0/2] completion: teach rebase and archive to use __gitcomp_builtin

2019-09-12 Thread Junio C Hamano
Denton Liu writes: > Currently, the completion function for rebase and archive don't take > advantage of __gitcomp_builtin(). Teach them to use it so that future > changes to options will automatically be included by the completion > script with no extra work. Nice ;-)

Re: [PATCH v2 1/1] commit-graph: add --[no-]progress to write and verify.

2019-09-12 Thread Junio C Hamano
"Garima Singh via GitGitGadget" writes: > diff --git a/Documentation/git-commit-graph.txt > b/Documentation/git-commit-graph.txt > index eb5e7865f0..ca0b1a683f 100644 > --- a/Documentation/git-commit-graph.txt > +++ b/Documentation/git-commit-graph.txt > @@ -10,8 +10,8 @@ SYNOPSIS > >

Re: [PATCH 1/1] multi-pack-index: add --no-progress Add --no-progress option to git multi-pack-index. The progress feature was added in 144d703 ("multi-pack-index: report progress during 'verify'", 20

2019-09-12 Thread Junio C Hamano
"William Baker via GitGitGadget" writes: > [verse] > -'git multi-pack-index' [--object-dir=] > +'git multi-pack-index' [--object-dir=] [--[no-]progress] I am wondering what the reasoning behind having this new one *after* the subcommand while the existing one *before* is. Isn't the --[no-]pr

Re: [PATCH] completion: add missing completions for log, diff, show

2019-09-12 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Max, > > The patch looks good to me! Thanks, both. Will queue.

[PATCH] git-gui: convert new/amend commit radiobutton to checketton

2019-09-12 Thread Bert Wesarg
Its a bi-state anyway and also safes one line in the menu. Signed-off-by: Bert Wesarg --- git-gui.sh | 36 +--- lib/checkout_op.tcl | 6 +++--- lib/commit.tcl | 4 ++-- lib/index.tcl | 8 4 files changed, 18 insertions(+), 36 deleti

[PATCH 0/2] completion: teach rebase and archive to use __gitcomp_builtin

2019-09-12 Thread Denton Liu
Currently, the completion function for rebase and archive don't take advantage of __gitcomp_builtin(). Teach them to use it so that future changes to options will automatically be included by the completion script with no extra work. I discovered rebase wasn't using it and fixed that and I started

[PATCH 2/2] completion: teach archive to use __gitcomp_builtin

2019-09-12 Thread Denton Liu
Currently, _git_archive() uses a hardcoded list of options for its completion. However, we can use __gitcomp_builtin() to get a dynamically generated list of completions instead. Teach _git_archive() to use __gitcomp_builtin() so that newly implemented options in archive will be automatically comp

[PATCH 1/2] completion: teach rebase to use __gitcomp_builtin

2019-09-12 Thread Denton Liu
Currently, _git_rebase() uses a hardcoded list of options for its completion. However, we can use __gitcomp_builtin() to get a dynamically generated list of completions instead. Teach _git_rebase() to use __gitcomp_builtin() so that newly implemented options in rebase will be automatically complet

Re: [PATCH 1/2] git-gui: convert new/amend commit radiobutton to checketton

2019-09-12 Thread Bert Wesarg
On Wed, Sep 11, 2019 at 10:15 PM Pratyush Yadav wrote: > > Typo in the subject. s/checketton/checkbutton/\ Will re-roll and drop the actual keybinding patch, so that Birger can resend his part, Bert > > On 05/09/19 10:09PM, Bert Wesarg wrote: > > Signed-off-by: Bert Wesarg > > --- > > git-gui

Re: [PATCH 1/2] git-gui: convert new/amend commit radiobutton to checketton

2019-09-12 Thread Bert Wesarg
On Wed, Sep 11, 2019 at 10:15 PM Pratyush Yadav wrote: > > Typo in the subject. s/checketton/checkbutton/ > > On 05/09/19 10:09PM, Bert Wesarg wrote: > > Signed-off-by: Bert Wesarg > > --- > > git-gui.sh | 36 +--- > > lib/checkout_op.tcl | 6 +++--- > >

Re: [PATCH v2 1/2] commit-graph: bump DIE_ON_LOAD check to actual load-time

2019-09-12 Thread Derrick Stolee
On 9/12/2019 10:44 AM, Jeff King wrote: > Commit 43d3561805 (commit-graph write: don't die if the existing graph > is corrupt, 2019-03-25) added an environment variable we use only in the > test suite, $GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD. But it put the check for > this variable at the very top of p

Re: [PATCH] upload-pack: disable commit graph more gently for shallow traversal

2019-09-12 Thread Derrick Stolee
On 9/12/2019 10:23 AM, Jeff King wrote: > On Thu, Sep 12, 2019 at 08:23:49AM -0400, Derrick Stolee wrote: > >>> That creates an interesting problem for commits that have _already_ been >>> parsed using the commit graph. Their commit->object.parsed flag is set, >>> their commit->graph_pos is set, b

Re: [PATCH 1/2] git-gui: warn if the commit message contains lines longer than the set limit

2019-09-12 Thread Bert Wesarg
On Tue, Sep 10, 2019 at 6:50 PM Johannes Sixt wrote: > > Am 04.09.19 um 22:10 schrieb Bert Wesarg: > > The commit message widget does not wrap the next and has a configurable > > fixed width to avoid creating too wide commit messages. Though this was > > only enforced in the GUI. Now we also check

[PATCH] git-gui: add horizontal scrollbar to commit buffer

2019-09-12 Thread Bert Wesarg
While the commit message widget has a configurable fixed width, it nevertheless allowed to write commit messages which exceeded this limit. Though there is no visual clue, that there is scrolling going on. Now there is a horizontal scrollbar. There seems to be a bug in at least Tcl/Tk up to versio

Re: [PATCH 1/2] git-gui: warn if the commit message contains lines longer than the set limit

2019-09-12 Thread Bert Wesarg
On Tue, Sep 10, 2019 at 10:35 PM Pratyush Yadav wrote: > > On 04/09/19 10:10PM, Bert Wesarg wrote: > > The commit message widget does not wrap the next and has a configurable > > fixed width to avoid creating too wide commit messages. Though this was > > only enforced in the GUI. Now we also check

Re: [PATCH 2/2] git-gui: add horizontal scrollbar to commit buffer

2019-09-12 Thread Bert Wesarg
On Tue, Sep 10, 2019 at 10:28 PM Pratyush Yadav wrote: > > On 04/09/19 10:10PM, Bert Wesarg wrote: > > While the commit message widget has a configurable fixed width, it > > nevertheless allows to write commit messages which exceed this limit. > > Though it does not show this content because there

Re: [PATCH v3 0/4] git-gui: Add ability to revert selected hunks and lines

2019-09-12 Thread Bert Wesarg
On Tue, Sep 10, 2019 at 10:26 PM Johannes Sixt wrote: > > Am 10.09.19 um 21:21 schrieb Pratyush Yadav: > > If there are no further objections with the series, I will merge it in. > > No objections. I use it in production. yep, Since 2012 ;-) > > -- Hannes

[PATCH v3] git-gui: add hotkey to toggle "Amend Last Commit"

2019-09-12 Thread Birger Skogeng Pedersen
Selecting whether to do a "New Commit" or "Amend Last Commit" does not have a hotkey. With this patch, the user may toggle between the two options with CTRL/CMD+e. Signed-off-by: Birger Skogeng Pedersen Signed-off-by: Bert Wesarg --- git-gui.sh | 41 - 1

Re: [PATCH v2 3/3] Makefile: run coccicheck on more source files

2019-09-12 Thread Junio C Hamano
Denton Liu writes: > +FIND_C_SOURCES = $(filter %.c,$(shell $(FIND_SOURCE_FILES))) > +COCCI_SOURCES = $(filter-out $(THIRD_PARTY_SOURCES),$(FIND_C_SOURCES)) The former is somewhat misnamed. FIND_SOURCE_FILES is *not* a list of source files---it is a procedure to list source files to its standar

Re: [PATCH v2] git-svn: trim leading and trailing whitespaces in author name

2019-09-12 Thread Eric Sunshine
On Thu, Sep 12, 2019 at 10:56 AM Tobias Klauser wrote: > v2: > - move whitespace trimming below defined'ness check as per Eric Sunshine's >review comment > diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm > @@ -1494,6 +1494,7 @@ sub check_author { > if (!defined $author || length $autho

Re: [PATCH v2 2/3] Makefile: strip leading ./ in $(FIND_SOURCE_FILES)

2019-09-12 Thread Junio C Hamano
Denton Liu writes: > Unify the two possible invocations in $(FIND_SOURCE_FILES) by using sed > to remove the `./` prefix in the $(FIND) case. > diff --git a/Makefile b/Makefile > index b88b42d7ed..e2c693440b 100644 > --- a/Makefile > +++ b/Makefile > @@ -2610,6 +2610,7 @@ FIND_SOURCE_FILES = ( \

Re: [PATCH v2 1/1] doc: minor formatting fix

2019-09-12 Thread Junio C Hamano
"Cameron Steffen via GitGitGadget" writes: > From: Cameron Steffen > > Move a closing backtick that was placed one character too soon. > > Signed-off-by: Cameron Steffen > --- > Documentation/pretty-formats.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Thanks for spotting and fi

Re: pd/fetch-jobs, was Re: What's cooking in git.git (Sep 2019, #01; Sat, 7)

2019-09-12 Thread Junio C Hamano
Johannes Schindelin writes: >> * pd/fetch-jobs (2019-08-13) 5 commits >> . fetch: make --jobs control submodules and remotes >> . fetch: add the --submodule-fetch-jobs option >> . fetch: add the fetch.jobs config key >> . fetch: add the "--fetch-jobs" option >> . fetch: rename max_children t

[PATCH v2 3/3] Makefile: run coccicheck on more source files

2019-09-12 Thread Denton Liu
Before, when running the "coccicheck" target, only the source files which were being compiled would have been checked by Coccinelle. However, just because we aren't compiling a source file doesn't mean we have to exclude it from analysis. This will allow us to catch more mistakes, in particular one

[PATCH v2 2/3] Makefile: strip leading ./ in $(FIND_SOURCE_FILES)

2019-09-12 Thread Denton Liu
Currently, $(FIND_SOURCE_FILES) has two modes: if `git ls-files` is present, it will use that to enumerate the files in the repository; else it will use `$(FIND) .` to enumerate the files in the directory. There is a subtle difference between these two methods, however. With ls-files, filenames do

[PATCH v2 0/3] Makefile: run coccicheck on all non-upstream sources

2019-09-12 Thread Denton Liu
Before, when we ran coccicheck, it would only run on files that are currently being compiled. However, this leaves us with a blindspot where Windows-only sources are not checked since Coccinelle does not run on Windows. This patchset addresses this by making the "coccicheck" target run against all

[PATCH v2 1/3] Makefile: define THIRD_PARTY_SOURCES

2019-09-12 Thread Denton Liu
After looking through the source files in compat/ and investigating the files' content and/or its Git history, I've determined the list of files that were copied from a third-party source. Place the names of these files into the THIRD_PARTY_SOURCES variable in the Makefile. In addition, add the sh

Re: [PATCH v2] upload-pack commit graph segfault fix

2019-09-12 Thread Taylor Blau
On Thu, Sep 12, 2019 at 10:41:22AM -0400, Jeff King wrote: > Here's a re-roll of my "disable commit graph more gently" fix. Versus > v1: Thanks for sending a re-roll. I deployed this out to all of our servers running git at GitHub, and it seems to be working fine. For what it's worth, I don't hav

Re: [PATCH] list-objects: don't queue root trees unless revs->tree_objects is set

2019-09-12 Thread Junio C Hamano
Jeff King writes: >> I was surprised we ever called repo_get_commit_tree() at all, since >> we're literally just traversing commits here. It looks like >> list-objects.c is very happy to queue pending trees for each commit, >> even if we're just going to throw them away when we get to >> process_

Re: [PATCH v3 1/3] factor out refresh_and_write_cache function

2019-09-12 Thread Junio C Hamano
Thomas Gummerer writes: > On 09/11, Johannes Schindelin wrote: >> Hi Thomas, >> >> On Fri, 6 Sep 2019, Thomas Gummerer wrote: >> > Oops, I didn't realize there was another series in flight that also >> > introduces 'repo_refresh_and_write_index'. Probably should have done >> > a test merge of t

Re: [PATCH 2/2] git-gui: add hotkey to toggle "Amend Last Commit" check button/menu

2019-09-12 Thread Pratyush Yadav
On 12/09/19 08:05AM, Birger Skogeng Pedersen wrote: > Hi Pratyush, > > On Wed, Sep 11, 2019 at 10:55 PM Pratyush Yadav > wrote: > > Also, I notice that the bindings for other letters have the same > > function bound for both small and capital letters (IOW, same behavior > > with shift held and r

[PATCH v2] git-svn: trim leading and trailing whitespaces in author name

2019-09-12 Thread Tobias Klauser
In some cases, the svn author names might contain leading or trailing whitespaces, leading to messages such as: Author: user1 not defined in authors.txt (the trailing newline leads to the line break). The user "user1" is defined in authors.txt though, e.g. user1 = User Fix this by trimm

Re: [PATCH] git-svn: trim leading and trailing whitespaces in author name

2019-09-12 Thread Tobias Klauser
On 2019-09-12 at 16:47:41 +0200, Eric Sunshine wrote: > On Thu, Sep 12, 2019 at 7:59 AM Tobias Klauser wrote: > > In some cases, the svn author names might contain leading or trailing > > whitespaces, leading to messages such as: > > > > Author: user1 > >not defined in authors.txt > > > > (

Re: [PATCH] git-svn: trim leading and trailing whitespaces in author name

2019-09-12 Thread Eric Sunshine
On Thu, Sep 12, 2019 at 7:59 AM Tobias Klauser wrote: > In some cases, the svn author names might contain leading or trailing > whitespaces, leading to messages such as: > > Author: user1 >not defined in authors.txt > > (the trailing newline leads to the line break). The user "user1" is > de

[PATCH v2 2/2] upload-pack: disable commit graph more gently for shallow traversal

2019-09-12 Thread Jeff King
When the client has asked for certain shallow options like "deepen-since", we do a custom rev-list walk that pretends to be shallow. Before doing so, we have to disable the commit-graph, since it is not compatible with the shallow view of the repository. That's handled by 829a321569 (commit-graph:

[PATCH v2 1/2] commit-graph: bump DIE_ON_LOAD check to actual load-time

2019-09-12 Thread Jeff King
Commit 43d3561805 (commit-graph write: don't die if the existing graph is corrupt, 2019-03-25) added an environment variable we use only in the test suite, $GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD. But it put the check for this variable at the very top of prepare_commit_graph(), which is called every tim

Re: [PATCH v2] upload-pack commit graph segfault fix

2019-09-12 Thread Jeff King
On Thu, Sep 12, 2019 at 10:41:22AM -0400, Jeff King wrote: > Here's a re-roll of my "disable commit graph more gently" fix. Versus > v1: > > - I've included a preparatory patch that speeds up > prepare_commit_graph(). It's not strictly related, but there's a > textual dependency. It cou

[PATCH v2] upload-pack commit graph segfault fix

2019-09-12 Thread Jeff King
Here's a re-roll of my "disable commit graph more gently" fix. Versus v1: - I've included a preparatory patch that speeds up prepare_commit_graph(). It's not strictly related, but there's a textual dependency. It could be easily spun off to its own series. - a comment points out that

Re: [PATCH] upload-pack: disable commit graph more gently for shallow traversal

2019-09-12 Thread Jeff King
On Thu, Sep 12, 2019 at 08:23:49AM -0400, Derrick Stolee wrote: > > That creates an interesting problem for commits that have _already_ been > > parsed using the commit graph. Their commit->object.parsed flag is set, > > their commit->graph_pos is set, but their commit->maybe_tree may still > > be

Re: could not fork child process rebasing required

2019-09-12 Thread Castro Alvarez, Sebastian
Hi Johannes, I will try to check for this. Thanks a lot! best, Sebastian On Thu, Sep 12, 2019 at 1:29 PM Johannes Schindelin wrote: > > Hi Sebastian, > > On Thu, 12 Sep 2019, Castro Alvarez, Sebastian wrote: > > > I have tried with both versions 32-bit and 64-bit, none of them work > > for me, I

Re: [PATCH] upload-pack: disable commit graph more gently for shallow traversal

2019-09-12 Thread Jeff King
On Wed, Sep 11, 2019 at 10:08:48PM -0400, Taylor Blau wrote: > > The test suite passes with my patch both with and without > > GIT_TEST_COMMIT_GRAPH=1. But to my surprise, it also passes if I delete > > the close_commit_graph() line added by 829a321569! > > > > So it's not clear to me whether this

Re: [PATCH] upload-pack: disable commit graph more gently for shallow traversal

2019-09-12 Thread Jeff King
On Thu, Sep 12, 2019 at 01:06:20PM +0200, SZEDER Gábor wrote: > > > +# - we must use protocol v2, because it handles the "have" negotiation > > > before > > > +#processing the shallow direectives > > s/ee/e/ Thanks, fixed. > We can't simply replace that 'git config' command with 'test_con

Re: [PATCH] upload-pack: disable commit graph more gently for shallow traversal

2019-09-12 Thread Jeff King
On Wed, Sep 11, 2019 at 10:07:48PM -0400, Taylor Blau wrote: > > The new test in t5500 triggers this segfault, but see the comments there > > for how horribly intimate it has to be with how both upload-pack and > > commit graphs work. > > Thanks for the comment, too. I agree that protocol-level h

Dobar dan

2019-09-12 Thread Jucai LI
Dobar dan, Moje ime je gospodin Jucai Li. Tražim menadžera / investicijskog partnera koji radiće sa mnom na obostranu poslovnu korist. Ako ste zainteresovani kontaktirajte me na moj privatni email za više detalja. email (jucaili...@gmail.com) Čekam vaše vesti. Hvala vam, G. Jucai Li

Dobar dan

2019-09-12 Thread Jucai LI
Dobar dan, Moje ime je gospodin Jucai Li. Tražim menadžera / investicijskog partnera koji radiće sa mnom na obostranu poslovnu korist. Ako ste zainteresovani kontaktirajte me na moj privatni email za više detalja. email (jucaili...@gmail.com) Čekam vaše vesti. Hvala vam, G. Jucai Li

Re: [PATCH] upload-pack: disable commit graph more gently for shallow traversal

2019-09-12 Thread Derrick Stolee
On 9/11/2019 10:07 PM, Taylor Blau wrote:>> >> +# A few subtle things about the request in this test: >> +# >> +# - the server must have commit-graphs present and enabled > > I think "enabled" may be somewhat redundant, at least since some recent > changes to enable this by default. (As an aside,

Re: [PATCH] list-objects: don't queue root trees unless revs->tree_objects is set

2019-09-12 Thread Derrick Stolee
On 9/11/2019 9:11 PM, Jeff King wrote: > On Wed, Sep 11, 2019 at 08:18:46PM -0400, Jeff King wrote: > >>> That creates an interesting problem for commits that have _already_ been >>> parsed using the commit graph. Their commit->object.parsed flag is set, >>> their commit->graph_pos is set, but the

Re: [PATCH] upload-pack: disable commit graph more gently for shallow traversal

2019-09-12 Thread Derrick Stolee
On 9/11/2019 8:04 PM, Jeff King wrote: > When the client has asked for certain shallow options like > "deepen-since", we do a custom rev-list walk that pretends to be > shallow. Before doing so, we have to disable the commit-graph, since it > is not compatible with the shallow view of the repositor

[PATCH] git-svn: trim leading and trailing whitespaces in author name

2019-09-12 Thread Tobias Klauser
In some cases, the svn author names might contain leading or trailing whitespaces, leading to messages such as: Author: user1 not defined in authors.txt (the trailing newline leads to the line break). The user "user1" is defined in authors.txt though, e.g. user1 = User Fix this by trimm

Re: could not fork child process rebasing required

2019-09-12 Thread Johannes Schindelin
Hi Sebastian, On Thu, 12 Sep 2019, Castro Alvarez, Sebastian wrote: > I have tried with both versions 32-bit and 64-bit, none of them work > for me, I still get the same error. :( The most common reason for this, then, would be an overzealous anti-malware. Ciao, Johannes

Re: error: could not read '.git/rebase-apply/head-name': No such file or directory

2019-09-12 Thread Johannes Schindelin
Hi Eugen, On Thu, 12 Sep 2019, Eugen Konkov wrote: > $ git --version > git version 2.20.1 First thing to try is whether Git v2.23.0 still exposes that bug. Ciao, Johannes

Re: [PATCH] ci: install P4 from package to fix build error

2019-09-12 Thread SZEDER Gábor
On Wed, Sep 11, 2019 at 05:12:31PM +0200, Johannes Schindelin wrote: > On Tue, 10 Sep 2019, SZEDER Gábor wrote: > > > On Tue, Sep 10, 2019 at 12:51:01AM +0200, Johannes Schindelin wrote: > > > On Fri, 6 Sep 2019, SZEDER Gábor wrote: > > > > > > > On Fri, Sep 06, 2019 at 12:27:11PM +0200, SZEDER Gá

Re: [PATCH] upload-pack: disable commit graph more gently for shallow traversal

2019-09-12 Thread SZEDER Gábor
On Wed, Sep 11, 2019 at 10:07:48PM -0400, Taylor Blau wrote: > > diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh > > index 8210f63d41..7601664b74 100755 > > --- a/t/t5500-fetch-pack.sh > > +++ b/t/t5500-fetch-pack.sh > > +# - we must use protocol v2, because it handles the "have" negot

Re: [PATCH v2 1/1] contrib/hooks: escape left brace in regex in the paranoid update hook

2019-09-12 Thread Johannes Schindelin
Hi Dominic, On Wed, 11 Sep 2019, Dominic Winkler via GitGitGadget wrote: > From: Dominic Winkler > > A literal "{" should now be escaped in a pattern starting from perl > versions >= v5.26. In perl v5.22, using a literal { in a regular > expression was deprecated, and will emit a warning if it i

Re: [PATCH] completion: add missing completions for log, diff, show

2019-09-12 Thread Johannes Schindelin
Hi Max, The patch looks good to me! Thanks, Johannes On Wed, 11 Sep 2019, Max Rothman wrote: > On Thu, Aug 1, 2019 at 8:54 PM Max Rothman wrote: > > > > On Thu, Aug 1, 2019 at 8:50 PM Max Rothman wrote: > > > > > > The bash completion script knows some options to "git log" and > > > "git show

Re: could not fork child process rebasing required

2019-09-12 Thread Castro Alvarez, Sebastian
Hi Johannes, I have tried with both versions 32-bit and 64-bit, none of them work for me, I still get the same error. :( best, Sebastian On Thu, Sep 12, 2019 at 10:45 AM Johannes Schindelin wrote: > > Hi Sebastian, > > On Wed, 11 Sep 2019, Castro Alvarez, Sebastian wrote: > > > I have recently

Re: could not fork child process rebasing required

2019-09-12 Thread Johannes Schindelin
Hi Sebastian, On Wed, 11 Sep 2019, Castro Alvarez, Sebastian wrote: > I have recently updated my computer to W10. So, I reinstalled the > newest version of Git, and it is not working. It gives the following > error: > > Error: Could not fork child process: Resource temporarily unavailable (-1). >

error: could not read '.git/rebase-apply/head-name': No such file or directory

2019-09-12 Thread Eugen Konkov
Hello Git, Next commands cause the error: $ git pull fatal: It seems that there is already a rebase-apply directory, and I wonder if you are in the middle of another rebase. If that is the case, please try git rebase (--continue | --abort | --skip) If that is not the case, please