[PATCH v2] Simplify handling of setup_git_directory_gently() failure cases.

2018-12-15 Thread Erin Dahlgren
setup_git_directory_gently() expects two types of failures to discover a git directory (e.g. .git/): - GIT_DIR_HIT_CEILING: could not find a git directory in any parent directories of the cwd. - GIT_DIR_HIT_MOUNT_POINT: could not find a git directory in any parent directories u

Re: [PATCH] Simplify handling of setup_git_directory_gently() failure cases.

2018-12-15 Thread Erin Dahlgren
On Fri, Dec 14, 2018 at 2:32 AM Johannes Schindelin wrote: > > Hi Erin, > > On Thu, 13 Dec 2018, Erin Dahlgren wrote: > > > setup_git_directory_gently() expects two types of failures to > > discover a git directory (e.g. .git/): > > > > - GIT_DIR_HIT_CEILING: could not find a git directory in an

Re: [PATCH] doc: improve grammar in git-update-index

2018-12-15 Thread Anthony Sottile
On Sat, Dec 15, 2018 at 9:18 AM Philip Oakley wrote: > > On 14/12/2018 21:25, Anthony Sottile wrote: > > Signed-off-by: Anthony Sottile > > --- > > Documentation/git-update-index.txt | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/Documentation/git-update-index.t

[PATCH 0/1] gc/repack: release packs when needed

2018-12-15 Thread Johannes Schindelin via GitGitGadget
This fixes more "can't delete files while they are still open" issues on Windows. Johannes Schindelin (1): gc/repack: release packs when needed builtin/gc.c | 4 +++- builtin/repack.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) base-commit: 5d826e972970a784bd7a7bdf58751251009

[PATCH 1/1] gc/repack: release packs when needed

2018-12-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin On Windows, files cannot be removed nor renamed if there are still handles held by a process. To remedy that, we introduced the close_all_packs() function. Earlier, we made sure that the packs are released just before `git gc` is spawned, in case that gc wants to remove

Re: Bug in lineendings handling that prevents resetting checking out, rebasing etc

2018-12-15 Thread Mr&Mrs D
Thanks again! Whichever path I take all the intermediate commits between the fix commit and the one that added the gitattributes file (so marked that file as text) will be plagued by this - checking them out on linux or macos will show that particular file as modified. Is my understanding correct?

Re: [PATCH 0/3] protocol v2 and hidden refs

2018-12-15 Thread Ævar Arnfjörð Bjarmason
On Fri, Dec 14 2018, Jeff King wrote: > On Thu, Dec 13, 2018 at 11:53:05AM -0800, Jonathan Tan wrote: > >> > I don't know if there's a good solution. I tried running the whole >> > test suite with v2 as the default. It does find this bug, but it has >> > a bunch of other problems (no

Re: [PATCH] doc: improve grammar in git-update-index

2018-12-15 Thread Philip Oakley
On 14/12/2018 21:25, Anthony Sottile wrote: Signed-off-by: Anthony Sottile --- Documentation/git-update-index.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 1c4d146a4..9c03ca167 100644 ---

[ANNOUNCE] Git for Windows 2.20.1

2018-12-15 Thread Johannes Schindelin
Dear Git users, It is my pleasure to announce that Git for Windows 2.20.1 is available from: https://gitforwindows.org/ Changes since Git for Windows v2.20.0 (December 10th 2018) New Features * Comes with Git v2.20.1. * Comes with cURL v7.63.0. Bug Fixes * Fixes a speed regress

Re: Bug in git-remote

2018-12-15 Thread SZEDER Gábor
On Sat, Dec 15, 2018 at 02:14:56AM -0500, Gennady Uraltsev wrote: > I am on git version 2.20.0 > > $ git remote > > does not show remotes configured in named files in $GIT_DIR/remotes/ > > I do not think that this is the intended behavior. It's a known bug. When 'git remote' was rewritten as a

[PATCH 1/4] git-column.txt: fix section header

2018-12-15 Thread Martin Ågren
We have too few dashes under "Examples", which causes Asciidoctor to not pick it up as a section header, but to instead just render the dashes literally. This also seems to confuse Asciidoctor about dashes in general around here. It misinterprets the listing blocks in this section, again rendering

[PATCH 3/4] rev-list-options.txt: do not nest open blocks

2018-12-15 Thread Martin Ågren
Similar to the previous commit, it appears we try to nest open blocks, which does not work well with Asciidoctor. Drop the outer one. That fixes the indentation similar to the previous patch, and makes us stop rendering a literal '+' before "Under --pretty=oneline ...". Asciidoc renders identically

[PATCH 0/4] A few Asciidoctor-fixes

2018-12-15 Thread Martin Ågren
I have (ab)used doc-diff to try to find instances where Asciidoctor and Asciidoc render our documentation differently. (See [1] for details on the hack.) This series fixes the differences that somehow stood out in the diff. Many smaller differences remain. With each patch, I am giving one or a few

[PATCH 4/4] git-status.txt: render tables correctly under Asciidoctor

2018-12-15 Thread Martin Ågren
Asciidoctor removes the indentation of each line in these tables, so the last lines of each table have a completely broken alignment. Similar to 379805051d ("Documentation: render revisions correctly under Asciidoctor", 2018-05-06), use an explicit literal block to indicate that we want to keep th

[PATCH 2/4] git-init.txt: do not nest open blocks

2018-12-15 Thread Martin Ågren
It appears we try to nest open blocks, but that does not work well with Asciidoctor, which fails to indent the inner block. This causes the inner block to be set as if it had nothing to do with `--shared`. Drop the outer one. Asciidoc renders identically before and after this patch, both man-page a