Re: [PATCH v2 3/3] Refactor mingw_cygwin_offset_1st_component()

2018-12-07 Thread Johannes Schindelin
Hi Torsten, On Fri, 7 Dec 2018, tbo...@web.de wrote: > diff --git a/compat/mingw-cygwin.c b/compat/mingw-cygwin.c > index 5552c3ac20..c379a72775 100644 > --- a/compat/mingw-cygwin.c > +++ b/compat/mingw-cygwin.c > @@ -10,10 +10,8 @@ size_t mingw_cygwin_skip_dos_drive_prefix(char **path) >

Re: [PATCH v2 1/3] git clone C:\cygwin\home\USER\repo' is working (again)

2018-12-07 Thread Johannes Schindelin
Hi Torsten, On Fri, 7 Dec 2018, tbo...@web.de wrote: > compat/mingw-cygwin.c | 28 > compat/mingw-cygwin.h | 20 Please use compat/win32/path.c (or .../path-utils.c) instead. This is not so much about MINGW or Cygwin or MSys or MSYS2 or Visual

Re: enhancement: support for author.email and author.name in "git config"

2018-12-06 Thread Johannes Schindelin
Hi William, On Thu, 6 Dec 2018, William Hubbs wrote: > On Thu, Dec 06, 2018 at 07:38:08PM +0100, Martin Ågren wrote: > > Hi William, > > > > [...] > > > > This idea was floated a couple of months ago [1]. Junio seemed to find > > the request sensible and outlined a design. No patches

Re: git, monorepos, and access control

2018-12-06 Thread Johannes Schindelin
Hi, On Wed, 5 Dec 2018, Jeff King wrote: > The model that fits more naturally with how Git is implemented would be > to use submodules. There you leak the hash of the commit from the > private submodule, but that's probably obscure enough (and if you're > really worried, you can add a random

Re: [PATCH] rebase -i: introduce the 'test' command

2018-12-04 Thread Johannes Schindelin
Hi Peff, On Mon, 3 Dec 2018, Jeff King wrote: > On Mon, Dec 03, 2018 at 08:01:44PM +0100, Johannes Schindelin wrote: > > > > In this sort of situation, I often whish to be able to do nested rebases. > > > Even more because it happen relatively often that I forge

Re: [PATCH] rebase docs: fix incorrect format of the section Behavioral Differences

2018-12-03 Thread Johannes Schindelin
Hi Hannes, On Mon, 3 Dec 2018, Johannes Sixt wrote: > The text body of section Behavioral Differences is typeset as code, > but should be regular text. Remove the indentation to achieve that. > > While here, prettify the language: > > - use "the x backend" instead of "x-based rebase"; > - use

Re: [ANNOUNCE] Git v2.20.0-rc2

2018-12-03 Thread Johannes Schindelin
Peart, Brandon Williams, > brian m. carlson, Christian Couder, Christian Hesse, Denton Liu, > Derrick Stolee, Elijah Newren, Eric Sunshine, Jean-Noël Avila, > Jeff Hostetler, Jeff King, Johannes Schindelin, Johannes Sixt, > Jonathan Nieder, Jonathan Tan, Josh Steadmon, Junio C Hamano, &

Re: [PATCH] rebase -i: introduce the 'test' command

2018-12-03 Thread Johannes Schindelin
Hi Duy, On Mon, 3 Dec 2018, Duy Nguyen wrote: > On Sat, Dec 01, 2018 at 03:02:09PM -0500, Jeff King wrote: > > I sometimes add "x false" to the top of the todo list to stop and create > > new commits before the first one. > > And here I've been doing the same by "edit" the first commit, add a >

Re: [PATCH] rebase -i: introduce the 'test' command

2018-12-03 Thread Johannes Schindelin
Hi Luc, On Mon, 3 Dec 2018, Luc Van Oostenryck wrote: > On Sat, Dec 01, 2018 at 03:02:09PM -0500, Jeff King wrote: > > On Thu, Nov 29, 2018 at 09:32:48AM +0100, Johannes Schindelin wrote: > > > > > > > Would it not make more sense to add a command-line o

Re: [PATCH] rebase -i: introduce the 'test' command

2018-12-02 Thread Johannes Schindelin
Hi Peff, On Sat, 1 Dec 2018, Jeff King wrote: > On Thu, Nov 29, 2018 at 09:32:48AM +0100, Johannes Schindelin wrote: > > > > > Would it not make more sense to add a command-line option (and a config > > > > setting) to re-schedule failed `exec` commands? Like so:

Re: [PATCH v3 06/16] sequencer: refactor sequencer_add_exec_commands() to work on a todo_list

2018-11-30 Thread Johannes Schindelin
Hi, On Fri, 30 Nov 2018, Phillip Wood wrote: > > diff --git a/sequencer.c b/sequencer.c > > index 900899ef20..11692d0b98 100644 > > --- a/sequencer.c > > +++ b/sequencer.c > > @@ -4394,24 +4394,29 @@ int sequencer_make_script(FILE *out, int argc, const > > char **argv, > > return 0; > > } >

Re: [PATCH] builtin/rebase.c: remove superfluous space in messages

2018-11-30 Thread Johannes Schindelin
Hi Ralf, On Fri, 30 Nov 2018, Ralf Thielow wrote: > Signed-off-by: Ralf Thielow ACK. The commit message could state that the scripted rebase does not have those whitespace issues, and that this aligns the built-in rebase with it, but I won't insist. Ciao, Johannes > --- > builtin/rebase.c

Re: en/rebase-merge-on-sequencer, was Re: What's cooking in git.git (Nov 2018, #07; Fri, 30)

2018-11-30 Thread Johannes Schindelin
Hi Junio, On Fri, 30 Nov 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Fri, 30 Nov 2018, Junio C Hamano wrote: > > > >> * en/rebase-merge-on-sequencer (2018-11-08) 2 commits > >> - rebase: implement --merge via git-rebase--interactive &

en/rebase-merge-on-sequencer, was Re: What's cooking in git.git (Nov 2018, #07; Fri, 30)

2018-11-30 Thread Johannes Schindelin
Hi Junio, On Fri, 30 Nov 2018, Junio C Hamano wrote: > * en/rebase-merge-on-sequencer (2018-11-08) 2 commits > - rebase: implement --merge via git-rebase--interactive > - git-rebase, sequencer: extend --quiet option for the interactive machinery > > "git rebase --merge" as been reimplemented

Re: [PATCH] format-patch: do not let its diff-options affect --range-diff (was Re: [PATCH 2/2] format-patch: allow for independent diff & range-diff options)

2018-11-30 Thread Johannes Schindelin
Hi Junio, On Fri, 30 Nov 2018, Junio C Hamano wrote: > Junio C Hamano writes: > > >> I had to delay -rc2 to see these last minute tweaks come to some > >> reasonable place to stop at, and I do not think we want to delay the > >> final any longer or destablizing it further by piling last minute

[PATCH 1/1] rebase: fix GIT_REFLOG_ACTION regression

2018-11-29 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The scripted version (partially) heeded the `GIT_REFLOG_ACTION` and when we converted to a built-in, this regressed. Fix that, and add a regression test, both with `GIT_REFLOG_ACTION` set and unset. Note: the reflog message for "rebase finished" did

[PATCH 0/1] Fix built-in rebase regression noticed by Debian's dgit

2018-11-29 Thread Johannes Schindelin via GitGitGadget
. This here patch fixes that. Johannes Schindelin (1): rebase: fix GIT_REFLOG_ACTION regression builtin/rebase.c | 29 ++--- t/t3406-rebase-message.sh | 26 ++ 2 files changed, 52 insertions(+), 3 deletions(-) base-commit

Re: [PATCH 2/2] format-patch: allow for independent diff & range-diff options

2018-11-29 Thread Johannes Schindelin
Hi Ævar, On Thu, 29 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > On Thu, Nov 29 2018, Johannes Schindelin wrote: > > > On Thu, 29 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > > > >> On Thu, Nov 29 2018, Johannes Schindelin wrote: > >> > >> > On

Re: [PATCH] rebase: mark the C reimplementation as an experimental opt-in feature (was Re: [ANNOUNCE] Git v2.20.0-rc1)

2018-11-29 Thread Johannes Schindelin
Hi Ian, On Thu, 29 Nov 2018, Ian Jackson wrote: > Johannes Schindelin writes ("Re: [PATCH] rebase: mark the C reimplementation > as an experimental opt-in feature (was Re: [ANNOUNCE] Git v2.20.0-rc1)"): > > > In a successful run with older git I get a reflog like this

Re: [PATCH 2/2] format-patch: allow for independent diff & range-diff options

2018-11-29 Thread Johannes Schindelin
Hi Ævar, On Thu, 29 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > On Thu, Nov 29 2018, Johannes Schindelin wrote: > > > On Thu, 29 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > > > >> On Thu, Nov 29 2018, Johannes Schindelin wrote: > >> > >> > On

Re: [PATCH] rebase: mark the C reimplementation as an experimental opt-in feature (was Re: [ANNOUNCE] Git v2.20.0-rc1)

2018-11-29 Thread Johannes Schindelin
Hi Ian, On Thu, 29 Nov 2018, Ian Jackson wrote: > Johannes Schindelin writes ("Re: [PATCH] rebase: mark the C reimplementation > as an experimental opt-in feature (was Re: [ANNOUNCE] Git v2.20.0-rc1)"): > > if you could pry more information (or better information) out of

Re: [PATCH v1] mem_pool: add GIT_TRACE_MEMPOOL support

2018-11-29 Thread Johannes Schindelin
Hi Ben, On Thu, 29 Nov 2018, Ben Peart wrote: > On 11/28/2018 4:37 AM, Johannes Schindelin wrote: > > Hi Ben, > > > > On Tue, 27 Nov 2018, Ben Peart wrote: > > > > > From: Ben Peart > > > > > > Add tracing around initializing and disc

Re: [PATCH] rebase: mark the C reimplementation as an experimental opt-in feature (was Re: [ANNOUNCE] Git v2.20.0-rc1)

2018-11-29 Thread Johannes Schindelin
On Wed, 28 Nov 2018, Johannes Schindelin wrote: > Hi Jonathan, > > On Tue, 27 Nov 2018, Jonathan Nieder wrote: > > > At https://bugs.debian.org/914695 is a report of a test regression in > > an outside project that is very likely to have been triggered by the > > new

Re: [PATCH v11 00/22] Convert "git stash" to C builtin

2018-11-29 Thread Johannes Schindelin
Hi Junio, On Thu, 29 Nov 2018, Johannes Schindelin wrote: > On Mon, 26 Nov 2018, Junio C Hamano wrote: > > > Junio C Hamano writes: > > > > > Thomas Gummerer writes: > > > > > >> Thanks for your work on this! I have read through the range-

[PATCH v2 0/1] Fix git rebase --stat -i

2018-11-29 Thread Johannes Schindelin via GitGitGadget
). * In case that there is no merge base, it no longer reports "Changes from (empty) to ..." but "Changes to ...", which should be a lot less controversial. Johannes Schindelin (1): rebase --stat: fix when rebasing to an unrelated history builtin/rebase.c | 18 +++

[PATCH v2 1/1] rebase --stat: fix when rebasing to an unrelated history

2018-11-29 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin When rebasing to a commit history that has no common commits with the current branch, there is no merge base. In diffstat mode, this means that we cannot compare to the merge base, but we have to compare to the empty tree instead. Also, if running in verbose diffstat

Re: [PATCH v11 00/22] Convert "git stash" to C builtin

2018-11-29 Thread Johannes Schindelin
Hi Junio, On Mon, 26 Nov 2018, Junio C Hamano wrote: > Junio C Hamano writes: > > > Thomas Gummerer writes: > > > >> Thanks for your work on this! I have read through the range-diff and > >> the new patch of this last round, and this addresses all the comments > >> I had on v10 (and some

Re: [PATCH 1/1] rebase --stat: fix when rebasing to an unrelated history

2018-11-29 Thread Johannes Schindelin
Hi Junio, On Thu, 29 Nov 2018, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" > writes: > > > The built-in version of the `git rebase` command blindly translated that > > shell script code, assuming that there is no need to test whether there

Re: [PATCH 2/2] format-patch: allow for independent diff & range-diff options

2018-11-29 Thread Johannes Schindelin
Hi Ævar, On Thu, 29 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > On Thu, Nov 29 2018, Johannes Schindelin wrote: > > > On Wed, 28 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > > > >> Change the semantics of the "--range-diff" option so that the regular > &g

Re: [PATCH v11 20/22] stash: convert `stash--helper.c` into `stash.c`

2018-11-29 Thread Johannes Schindelin
Hi, On Wed, 28 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > On Tue, Nov 27 2018, Johannes Schindelin wrote: > > > On Mon, 26 Nov 2018, Junio C Hamano wrote: > > > >> Paul-Sebastian Ungureanu writes: > >> > >> > The old shell script `git-sta

Re: [PATCH] rebase -i: introduce the 'test' command

2018-11-29 Thread Johannes Schindelin
Hi Paul, On Thu, 29 Nov 2018, Johannes Schindelin wrote: > I already added a test... See the reschedule-failed-exec branch on > https://github.com/dscho/git. And now I put up a proper Pull Request, to be submitted via GitGitGadget right after Git v2.20.0 will be released (technical

Re: in 2.19.2 t0061-run-command FAILs if . is in $PATH

2018-11-29 Thread Johannes Schindelin
Hi Merijn and Junio, On Thu, 29 Nov 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > -test_expect_success 'run_command is restricted to PATH' ' > > +test_lazy_prereq DOT_IN_PATH ' > > + case ":$PATH:" in > > + *:.:*

Re: [PATCH 2/2] format-patch: allow for independent diff & range-diff options

2018-11-29 Thread Johannes Schindelin
Hi Ævar, On Wed, 28 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > Change the semantics of the "--range-diff" option so that the regular > diff options can be provided separately for the range-diff and the > patch. This allows for supplying e.g. --range-diff-U0 and -U1 to > "format-patch" to provide

Re: [PATCH] rebase -i: introduce the 'test' command

2018-11-29 Thread Johannes Schindelin
Hi Paul, On Wed, 28 Nov 2018, Paul Morelle wrote: > On 28/11/18 16:19, Johannes Schindelin wrote: > > > > On Wed, 28 Nov 2018, Paul Morelle wrote: > > > >> The 'exec' command can be used to run tests on a set of commits, > >> interrupting on failin

Re: [PATCH] rebase -i: introduce the 'test' command

2018-11-28 Thread Johannes Schindelin
Hi Paul, On Wed, 28 Nov 2018, Paul Morelle wrote: > The 'exec' command can be used to run tests on a set of commits, > interrupting on failing commits to let the user fix the tests. > > However, the 'exec' line has been consumed, so it won't be ran again by > 'git rebase --continue' is ran,

Re: in 2.19.2 t0061-run-command FAILs if . is in $PATH

2018-11-28 Thread Johannes Schindelin
Hi, On Wed, 28 Nov 2018, H.Merijn Brand wrote: > the test is explicitely checking that it should not find runnable > scripts outside $PATH, *assuming* $PATH does not have . in it Does this fix it for you? -- snip -- diff --git a/t/t0061-run-command.sh b/t/t0061-run-command.sh index

Re: [PATCH v1] mem_pool: add GIT_TRACE_MEMPOOL support

2018-11-28 Thread Johannes Schindelin
Hi Ben, On Tue, 27 Nov 2018, Ben Peart wrote: > From: Ben Peart > > Add tracing around initializing and discarding mempools. In discard report > on the amount of memory unused in the current block to help tune setting > the initial_size. > > Signed-off-by: Ben Peart > --- Looks good. My

Re: [PATCH v1/RFC 1/1] 'git clone C:\cygwin\home\USER\repo' is working (again)

2018-11-28 Thread Johannes Schindelin
Hi J.H. On Wed, 28 Nov 2018, Houder wrote: > On 2018-11-28 09:46, Johannes Schindelin wrote: > > > > On Wed, 28 Nov 2018, J.H. van de Water wrote: > > > > > > > me@work /cygdrive > > > > > $ ls > > > > > c d &

Re: [ANNOUNCE] Git v2.20.0-rc1

2018-11-28 Thread Johannes Schindelin
Hi Junio, On Wed, 28 Nov 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > ... > > In short, even a thorough study of the code (keeping in mind the few > > tidbits of information provided by you) leaves me really wondering which > > code you run,

Re: [PATCH] rebase: mark the C reimplementation as an experimental opt-in feature (was Re: [ANNOUNCE] Git v2.20.0-rc1)

2018-11-28 Thread Johannes Schindelin
Hi Jonathan, On Tue, 27 Nov 2018, Jonathan Nieder wrote: > At https://bugs.debian.org/914695 is a report of a test regression in > an outside project that is very likely to have been triggered by the > new faster rebase code. >From looking through that log.gz (without having a clue where the

Re: [PATCH] advice: don't pointlessly suggest --convert-graft-file

2018-11-28 Thread Johannes Schindelin
Hi Ævar, On Tue, 27 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > The advice to run 'git replace --convert-graft-file' added in > f9f99b3f7d ("Deprecate support for .git/info/grafts", 2018-04-29) > didn't add an exception for the 'git replace --convert-graft-file' > codepath itself. > > As a

Re: [PATCH v1/RFC 1/1] 'git clone C:\cygwin\home\USER\repo' is working (again)

2018-11-28 Thread Johannes Schindelin
Hi J.H., On Wed, 28 Nov 2018, J.H. van de Water wrote: > > > me@work /cygdrive > > > $ ls > > > c d > > > > > > So `/cygdrive` *is* a valid directory in Cygwin. > > > > That supports the code that does not special case a path that begins > > with /cygdrive/ and simply treats it as a full path

Re: [PATCH v3 1/7] rebase: fix incompatible options error message

2018-11-28 Thread Johannes Schindelin
Hi Elijah, On Wed, 21 Nov 2018, Elijah Newren wrote: > In commit f57696802c30 ("rebase: really just passthru the `git am` > options", 2018-11-14), the handling of `git am` options was simplified > dramatically (and an option parsing bug was fixed), but it introduced > a small regression in the

Re: [PATCH v11 20/22] stash: convert `stash--helper.c` into `stash.c`

2018-11-27 Thread Johannes Schindelin
Hi Junio & Paul, On Mon, 26 Nov 2018, Junio C Hamano wrote: > Paul-Sebastian Ungureanu writes: > > > The old shell script `git-stash.sh` was removed and replaced > > entirely by `builtin/stash.c`. In order to do that, `create` and > > `push` were adapted to work without `stash.sh`. For

Re: [PATCH v11 03/22] strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()`

2018-11-27 Thread Johannes Schindelin
Hi, On Sun, 25 Nov 2018, Thomas Gummerer wrote: > On 11/23, Paul-Sebastian Ungureanu wrote: > > Implement `strbuf_insertf()` and `strbuf_vinsertf()` to > > insert data using a printf format string. > > > > Original-idea-by: Johannes Schindelin > > Signed

Git for Windows v2.19.2 demoted to "pre-release"

2018-11-27 Thread Johannes Schindelin
Team, sorry for the inconvenience, but I had to "pull" Git for Windows v2.19.2 because of two major bugs: 32-bit Git Bash simply failed to start, and all operations using git:// URLs were broken. This close to v2.20.0, I was uncomfortable pushing yet another upgrade to users that would have been

Re: [PATCH v1/RFC 1/1] 'git clone C:\cygwin\home\USER\repo' is working (again)

2018-11-27 Thread Johannes Schindelin
Hi Junio, On Tue, 27 Nov 2018, Junio C Hamano wrote: > Steven Penny writes: > > > If you strip the drive, you can still navigate within the same drive: > > > > $ cd 'C:\Users' > > $ pwd > > /cygdrive/c/Users > > > > $ cd '\Windows' > > $ pwd > > /cygdrive/c/Windows > >

Re: [PATCH v1/RFC 1/1] 'git clone C:\cygwin\home\USER\repo' is working (again)

2018-11-27 Thread Johannes Schindelin
Hi Torsten, On Mon, 26 Nov 2018, tbo...@web.de wrote: > diff --git a/compat/cygwin.c b/compat/cygwin.c > index b9862d606d..c4a10cb5a1 100644 > --- a/compat/cygwin.c > +++ b/compat/cygwin.c > @@ -1,19 +1,29 @@ > #include "../git-compat-util.h" > #include "../cache.h" > > +int

[PATCH 1/1] rebase --stat: fix when rebasing to an unrelated history

2018-11-27 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin When rebasing to a commit history that has no common commits with the current branch, there is no merge base. The scripted version of the `git rebase` command was not prepared for that and spewed out fatal: ambiguous argument '': unknown revision or path

[PATCH 0/1] Fix git rebase --stat -i

2018-11-27 Thread Johannes Schindelin via GitGitGadget
the time to split the patch again now. Johannes Schindelin (1): rebase --stat: fix when rebasing to an unrelated history builtin/rebase.c | 8 +--- git-legacy-rebase.sh | 6 -- t/t3406-rebase-message.sh | 10 ++ 3 files changed, 19 insertions(+), 5 deletions(-) base

Re: [ANNOUNCE] Git v2.20.0-rc1

2018-11-26 Thread Johannes Schindelin
Hi Ævar, On Mon, 26 Nov 2018, Johannes Schindelin wrote: > On Sat, 24 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > > > On Wed, Nov 21 2018, Junio C Hamano wrote: > > > > > * "git rebase" and "git rebase -i" have been reimplemented in C. >

Re: [ANNOUNCE] Git v2.20.0-rc1

2018-11-26 Thread Johannes Schindelin
Hi Ævar, On Sat, 24 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > On Wed, Nov 21 2018, Junio C Hamano wrote: > > > * "git rebase" and "git rebase -i" have been reimplemented in C. > > Here's another regression in the C version (and rc1), note: the > sha1collisiondetection is just a stand in for

Re: [PATCH v16 Part II 2/8] bisect--helper: `bisect_write` shell function in C

2018-11-26 Thread Johannes Schindelin
Hi Martin, On Fri, 23 Nov 2018, Martin Ågren wrote: > On Fri, 23 Nov 2018 at 11:13, Johannes Schindelin > wrote: > > On Mon, 30 Oct 2017, Pranit Bauva wrote: > > > > > On Fri, Oct 27, 2017 at 10:58 PM, Martin Ågren > > > wrote: > > > > On 27 Oct

Re: [PATCH v1 1/1] t5601-99: Enable colliding file detection for MINGW

2018-11-23 Thread Johannes Schindelin
Hi Carlo, On Thu, 22 Nov 2018, Carlo Marcelo Arenas Belón wrote: > Subject: [PATCH] entry: remove windows fallback to inode checking > > this test is really FS specific, so is better to avoid any compiled > assumptions about the platform and let the user drive the fallback > through

Re: [RFC/PATCH 0/5] stop installing old libexec aliases like "git-init"

2018-11-23 Thread Johannes Schindelin
Hi Peff, On Thu, 22 Nov 2018, Jeff King wrote: > On Thu, Nov 22, 2018 at 01:48:53PM +0100, Johannes Schindelin wrote: > > > So YMMV with git-s. My rule of thumb is: if I want to use this > > myself only, I'll make it an alias. If I want to ship it (e.g. with Git > >

Re: [PATCH v16 Part II 2/8] bisect--helper: `bisect_write` shell function in C

2018-11-23 Thread Johannes Schindelin
Hi Pranit, (Cc:ing Tanushree because they will try to pick up this patch series as part of the Outreachy program.) On Mon, 30 Oct 2017, Pranit Bauva wrote: > On Fri, Oct 27, 2017 at 10:58 PM, Martin Ågren wrote: > > On 27 October 2017 at 17:06, Pranit Bauva wrote: > >> +static void

Re: 2.19.2 wont launch

2018-11-23 Thread Johannes Schindelin
Hi Paul, On Thu, 22 Nov 2018, Paul Gureghian wrote: > I installed 2.19.2 on windows 7 , 32 bit and it wont launch. This has been reported on Gitter and fixed in https://github.com/git-for-windows/MINGW-packages/commit/deb0395d031401ffe55024fb066267e2ea8d032b For the time being, please either

Re: Git for Windows v2.20.0-rc0

2018-11-22 Thread Johannes Schindelin
starting the git bash two windows pop up instead of one. > One that's "empty" and the other one containing the real git bash. Thank you for the report. This has been also reported at https://github.com/git-for-windows/git/issues/1942, and I fixed it in the meantime. Ciao, Johannes >

Re: [RFC/PATCH 0/5] stop installing old libexec aliases like "git-init"

2018-11-22 Thread Johannes Schindelin
Hi Peff, On Sat, 17 Nov 2018, Jeff King wrote: > On Fri, Nov 16, 2018 at 08:22:11PM +0100, Ævar Arnfjörð Bjarmason wrote: > > > So maybe we should just document this interface better. It seems one > > implicit dependency is that we expect a manpage for the tool to exist > > for --help. > >

[PATCH 0/1] Fix Windows build of next

2018-11-22 Thread Johannes Schindelin via GitGitGadget
with ot/ref-filter-object-info. Johannes Schindelin (1): ref-filter: replace unportable `%lld` format ref-filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: d364d6b33e15dbc6e57d83f9f1457a8e8fe77046 Published-As: https://github.com/gitgitgadget/git/releases/tags/pr-87

[PATCH 1/1] ref-filter: replace unportable `%lld` format

2018-11-22 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The `%lld` format is supported on Linux and macOS, but not on Windows. This issue has been reported ten days ago (Message-ID: nycvar.qro.7.76.6.1811121300520...@tvgsbejvaqbjf.bet), but the corresponding topic still advanced to `next` in the meantime, breaking

Re: [RFC PATCH 1/5] ref-filter: add objectsize:disk option

2018-11-22 Thread Johannes Schindelin
Hi Junio, On Wed, 21 Nov 2018, Junio C Hamano wrote: > Оля Тележная writes: > > >> I am OK if we avoid PRIdMAX and use PRIuMAX instead with a cast to > >> the corresponding size in this codepath, as long as we properly > >> handle negative oi.disk_size field, which may be telling some > >>

Re: [PATCH 0/1] rebase: warn about the correct tree's OID

2018-11-21 Thread Johannes Schindelin
Hi Junio, On Wed, 21 Nov 2018, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" > writes: > > > A quick fix for a recent topic. Not overly critical, but I would deem this > > v2.20.0-rc1 material. > > > > Johannes Schindelin (1): >

js/vsts-ci, was Re: What's cooking in git.git (Nov 2018, #06; Wed, 21)

2018-11-21 Thread Johannes Schindelin
Hi Junio, On Wed, 21 Nov 2018, Junio C Hamano wrote: > * js/vsts-ci (2018-10-16) 13 commits > . travis: fix skipping tagged releases > . README: add a build badge (status of the Azure Pipelines build) > . tests: record more stderr with --write-junit-xml in case of failure > . tests: include

Re: [PATCH 1/1] legacy-rebase: backport -C and --whitespace= checks

2018-11-21 Thread Johannes Schindelin
Hi Junio, On Wed, 21 Nov 2018, Junio C Hamano wrote: > Carlo Arenas writes: > > > Tested-by: Carlo Marcelo Arenas Belón > > > > the C version prepends: "fatal: " unlike the shell version for both > > error messages > > In addition, "Invalid whitespace option" says 'bad', not >

Git for Windows v2.20.0-rc0, was Re: [ANNOUNCE] Git v2.20.0-rc0

2018-11-20 Thread Johannes Schindelin
Team, On Sun, 18 Nov 2018, Junio C Hamano wrote: > An early preview release Git v2.20.0-rc0 is now available for > testing at the usual places. It is comprised of 887 non-merge > commits since v2.19.0, contributed by 71 people, 23 of which are > new faces. The "for Windows" flavor of Git

Re: [PATCH] msvc: Directly use MS version (_stricmp) of strcasecmp

2018-11-20 Thread Johannes Schindelin
Hi Junio, On Tue, 20 Nov 2018, Junio C Hamano wrote: > Sven Strickroth writes: > > > This also removes an implicit conversion from size_t (unsigned) to int > > (signed). > > > > _stricmp as well as _strnicmp are both available since VS2012. Looks good to me. > > Signed-off-by: Sven

Re: Git Test Coverage Report (v2.20.0-rc0)

2018-11-20 Thread Johannes Schindelin
Hi Stolee, On Mon, 19 Nov 2018, Derrick Stolee wrote: > On 11/19/2018 1:33 PM, Ævar Arnfjörð Bjarmason wrote: > > On Mon, Nov 19 2018, Derrick Stolee wrote: > > > > > [...] > > > builtin/rebase.c > > > 62c23938fa 55) return env; > > > [...] > > > Ævar Arnfjörð Bjarmason 62c23938f: tests: add a

[PATCH 0/1] legacy-rebase: fix "regression"

2018-11-20 Thread Johannes Schindelin via GitGitGadget
This is a backport, really, to accommodate a new regression test that was introduced when the built-in rebase learned to validate the -C and --whitespace= arguments early. Johannes Schindelin (1): legacy-rebase: backport -C and --whitespace= checks git-legacy-rebase.sh | 8 1 file

[PATCH 1/1] legacy-rebase: backport -C and --whitespace= checks

2018-11-20 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Since 04519d720114 (rebase: validate -C and --whitespace= parameters early, 2018-11-14), the built-in rebase validates the -C and --whitespace arguments early. As this commit also introduced a regression test for this, and as a later commit introduced

Re: [PATCH] rebase: mark a test as failing with rebase.useBuiltin=false

2018-11-20 Thread Johannes Schindelin
quot;tests: > add a special setup where rebase.useBuiltin is off", 2018-11-14). > > 1. > https://public-inbox.org/git/nycvar.qro.7.76.6.1811201157170...@tvgsbejvaqbjf.bet/ > > Signed-off-by: Ævar Arnfjörð Bjarmason > --- > > On Tue, Nov 20 2018, Johannes Schindel

Re: [PATCH v2 2/2] rebase: validate -C and --whitespace= parameters early

2018-11-20 Thread Johannes Schindelin
Hi Ævar, On Mon, 19 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > > On Wed, Nov 14 2018, Johannes Schindelin via GitGitGadget wrote: > > > From: Johannes Schindelin > > > > It is a good idea to error out early upon seeing, say, `-Cbad`, rather > > than starting

[PATCH 1/1] rebase: warn about the correct tree's OID

2018-11-20 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin This was a simple copy/paste error, and an obvious one at that: if we cannot fill the tree descriptor, we should show an error message about *that* tree, not another one. Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 3 ++- 1 file changed, 2 insertions

[PATCH 0/1] rebase: warn about the correct tree's OID

2018-11-20 Thread Johannes Schindelin via GitGitGadget
A quick fix for a recent topic. Not overly critical, but I would deem this v2.20.0-rc1 material. Johannes Schindelin (1): rebase: warn about the correct tree's OID builtin/rebase.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) base-commit: bb75be6cb916297f271c846f2f9caa3daaaec718

Re: [PATCH] bundle: dup() output descriptor closer to point-of-use

2018-11-16 Thread Johannes Schindelin
Hi Peff, On Fri, 16 Nov 2018, Jeff King wrote: > On Thu, Nov 15, 2018 at 09:01:07PM +0100, Johannes Schindelin wrote: > > > > It seems like we should be checking that the stale lockfile isn't left, > > > which is the real problem (the warning is annoying, but is a s

Re: git pull --rebase=preserve is always rebasing something, even on up-to-date branch

2018-11-16 Thread Johannes Schindelin
Hi Mikhail, On Mon, 17 Sep 2018, Mikhail Matrosov wrote: > Please try the following: > > mmatrosov@Mikhail-PC:~/test$ git init --bare server > Initialized empty Git repository in /home/mmatrosov/test/server/ > mmatrosov@Mikhail-PC:~/test$ git clone server local > Cloning into 'local'... >

Re: [PATCH v2 1/2] rebase doc: document rebase.useBuiltin

2018-11-16 Thread Johannes Schindelin
Hi Junio, On Fri, 16 Nov 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > > > The rebase.useBuiltin variable introduced in 55071ea248 ("rebase: > > start implementing it as a builtin", 2018-08-07) was turned on by > > default in 5541bd5b8f ("rebase: default to using the builtin

Re: [PATCH v2 1/1] bundle: cleanup lock files on error

2018-11-15 Thread Johannes Schindelin
Hi Peff, On Thu, 15 Nov 2018, Jeff King wrote: > On Thu, Nov 15, 2018 at 05:32:15PM +0100, Johannes Schindelin wrote: > > > I cannot claim that I wrapped my head around your explanation or your > > diff (I am busy trying to prepare Git for Windows' `master` for > >

Re: [PATCH v2 1/1] bundle: cleanup lock files on error

2018-11-15 Thread Johannes Schindelin
Hi Peff, On Thu, 15 Nov 2018, Jeff King wrote: > On Thu, Nov 15, 2018 at 01:57:45PM +0100, Johannes Schindelin wrote: > > > > I looked at the test to see if it would pass, but it is not even > > > checking anything about lockfiles! It just checks that we exit

Re: [PATCH v4] commit: add a commit.allowEmpty config variable

2018-11-15 Thread Johannes Schindelin
Hi Peff, On Thu, 15 Nov 2018, Jeff King wrote: > On Thu, Nov 15, 2018 at 09:40:38AM +0100, Johannes Schindelin wrote: > > > From @chucklu: > > > > > my user case is like this : > > > > > > When I want to cherr-pick commits from A to G (ABCDEFG), i

Re: [PATCH v2 1/1] bundle: cleanup lock files on error

2018-11-15 Thread Johannes Schindelin
Hi Peff, On Wed, 14 Nov 2018, Jeff King wrote: > On Wed, Nov 14, 2018 at 02:08:48PM -0800, Stefan Beller wrote: > > > On Wed, Nov 14, 2018 at 1:43 PM Martin Ågren wrote: > > > > > > On Wed, 14 Nov 2018 at 16:26, Gaël Lhez via GitGitGadget > > > wrote: > > > > However, the `.lock` file was

Re: [PATCH] technical doc: add a design doc for the evolve command

2018-11-15 Thread Johannes Schindelin
Hi Stefan, On Wed, 14 Nov 2018, sxe...@google.com wrote: > From: Stefan Xenos > > This document describes what an obsolescence graph for > git would look like, the behavior of the evolve command, > and the changes planned for other commands. Thanks, this is a good discussion starter. >

Re: [PATCH v2 1/2] [Outreachy] t3903-stash: test without configured user.name and user.email

2018-11-15 Thread Johannes Schindelin
Hi Slavica, this looks very good to me. Just one grammar thing: On Wed, 14 Nov 2018, Slavica Djukic wrote: > Add test to document that stash fails if user.name and user.email > are not configured. > In the later commit, test will be updated to expect success. In a later commit [...]

Re: [PATCH 2/5] tests: respect GIT_TEST_INSTALLED when initializing repositories

2018-11-15 Thread Johannes Schindelin
Hi Junio, On Wed, 14 Nov 2018, Jeff King wrote: > On Wed, Nov 14, 2018 at 02:16:37PM +0100, Johannes Schindelin wrote: > > > > Makes perfect sense. Shouldn't we be asking where the template > > > directory of the installed version is and using it instead of the

Re: [PATCH v2 2/2] rebase: Implement --merge via git-rebase--interactive

2018-11-15 Thread Johannes Schindelin
Hi Elijah, On Wed, 14 Nov 2018, Elijah Newren wrote: > On Mon, Nov 12, 2018 at 8:21 AM Johannes Schindelin > wrote: > > > t3425: topology linearization was inconsistent across flavors of rebase, > > > as already noted in a TODO

[PATCH 0/1] mingw: update a link to the official documentation

2018-11-15 Thread Johannes Schindelin via GitGitGadget
v2.20.0. But this is just an update to a code comment... :-) Johannes Schindelin (1): mingw: replace an obsolete link with the superseding one compat/mingw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: d166e6afe5f257217836ef24a73764eba390c58d Published-As: https

[PATCH 1/1] mingw: replace an obsolete link with the superseding one

2018-11-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The MSDN documentation has been superseded by Microsoft Docs (which is backed by a repository on GitHub containing many, many files in Markdown format). Signed-off-by: Johannes Schindelin --- compat/mingw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions

Re: [PATCH v4] commit: add a commit.allowEmpty config variable

2018-11-15 Thread Johannes Schindelin
Hi, On Wed, 14 Nov 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > > > Agreed. I'm happy to see the test for-loop gone as I noted in > > https://public-inbox.org/git/87d0rm7zeo@evledraar.gmail.com/ but as > > noted in that v3 feedback the whole "why would anyone want this?"

Re: [PATCH v2 2/2] rebase: validate -C and --whitespace= parameters early

2018-11-14 Thread Johannes Schindelin
t stating this explicitly. Thank you for your review, Dscho > > Best Wishes > > Phillip > > On 14/11/2018 16:25, Johannes Schindelin via GitGitGadget wrote: > > From: Johannes Schindelin > > > > It is a good idea to error out early upon seeing, say, `-Cbad`, rat

[PATCH v2 2/5] tests: respect GIT_TEST_INSTALLED when initializing repositories

2018-11-14 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin It really makes very, very little sense to use a different git executable than the one the caller indicated via setting the environment variable GIT_TEST_INSTALLED. Signed-off-by: Johannes Schindelin --- t/test-lib-functions.sh | 3 ++- 1 file changed, 2 insertions

[PATCH v2 4/5] tests: do not require Git to be built when testing an installed Git

2018-11-14 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin We really only need the test helpers to be built in the worktree in that case, but that is not what we test for. On the other hand it is a perfect opportunity to verify that `GIT_TEST_INSTALLED` points to a working Git. So let's test the appropriate Git executable

[PATCH v2 3/5] t/lib-gettext: test installed git-sh-i18n if GIT_TEST_INSTALLED is set

2018-11-14 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin It makes very, very little sense to test the built git-sh-i18n when the user asked specifically to test another one. Signed-off-by: Johannes Schindelin --- t/lib-gettext.sh | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/t/lib-gettext.sh b/t

[PATCH v2 5/5] tests: explicitly use `git.exe` on Windows

2018-11-14 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin On Windows, when we refer to `/an/absolute/path/to/git`, it magically resolves `git.exe` at that location. Except if something of the name `git` exists next to that `git.exe`. So if we call `$BUILD_DIR/git`, it will find `$BUILD_DIR/git.exe` *only* if there is not, say

[PATCH v2 1/5] tests: fix GIT_TEST_INSTALLED's PATH to include t/helper/

2018-11-14 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin We really need to be able to find the test helpers... Really. This change was forgotten when we moved the test helpers into t/helper/ Signed-off-by: Johannes Schindelin --- t/test-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/test

[PATCH v2 0/5] tests: various improvements to the GIT_TEST_INSTALLED feature

2018-11-14 Thread Johannes Schindelin via GitGitGadget
whether the Git executable is working (thanks, Peff!). * The commit message of 5/5 was touched up. Johannes Schindelin (5): tests: fix GIT_TEST_INSTALLED's PATH to include t/helper/ tests: respect GIT_TEST_INSTALLED when initializing repositories t/lib-gettext: test installed git-sh-i18n

[PATCH v2 2/2] rebase: validate -C and --whitespace= parameters early

2018-11-14 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin It is a good idea to error out early upon seeing, say, `-Cbad`, rather than starting the rebase only to have the `--am` backend complain later. Let's do this. The only options accepting parameters which we pass through to `git am` (which may, or may not, forward them

[PATCH v2 1/2] rebase: really just passthru the `git am` options

2018-11-14 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Currently, we parse the options intended for `git am` as if we wanted to handle them in `git rebase`, and then reconstruct them painstakingly to define the `git_am_opt` variable. However, there is a much better way (that I was unaware of, at the time when I mentored

[PATCH v2 0/2] rebase: understand -C again, refactor

2018-11-14 Thread Johannes Schindelin via GitGitGadget
passed through to git am. Johannes Schindelin (2): rebase: really just passthru the `git am` options rebase: validate -C and --whitespace= parameters early builtin/rebase.c | 108 -- t/t3406-rebase-message.sh | 7 +++ 2 files changed, 52

Re: [PATCH v5 0/3] range-diff fixes

2018-11-14 Thread Johannes Schindelin
Hi Ævar, On Tue, 13 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > Trivial updates since v4 addressing the feedback on that > iteration. Hopefully this is the last one, range-diff with the last > version: This range-diff looks good to me. Thanks, Dscho > > 1: 5399e57513 = 1: f225173f43

[PATCH v2 0/1] bundle: fix issue when bundles would be empty

2018-11-14 Thread Johannes Schindelin via GitGitGadget
And yet another patch coming through Git for Windows... Change since v1: * Using a better oneline now. Gaël Lhez (1): bundle: cleanup lock files on error bundle.c| 7 --- t/t5607-clone-bundle.sh | 4 2 files changed, 8 insertions(+), 3 deletions(-) base-commit:

  1   2   3   4   5   6   7   8   9   10   >