Re: [PATCH 1/1] respect core.hooksPath, falling back to .git/hooks

2019-09-26 Thread Bert Wesarg
On Fri, Sep 27, 2019 at 12:40 AM Pratyush Yadav wrote: > > Hi, > > On 26/09/19 02:17PM, Johannes Schindelin via GitGitGadget wrote: > > From: Johannes Schindelin > > > > Since v2.9.0, Git knows about the config variable core.hookspath > > that allows overriding the path to the directory containin

Re: [PATCH 1/2] git-gui: use existing interface to query a path's attribute

2019-09-26 Thread Pratyush Yadav
Looks good. Thanks. On 25/09/19 10:38PM, Bert Wesarg wrote: > Replace the hand-coded call to git check-attr with the already provided one. > > Signed-off-by: Bert Wesarg > --- > lib/diff.tcl | 15 +-- > 1 file changed, 1 insertion(+), 14 deletions(-) > > diff --git a/lib/diff.tcl b

Re: Number of Outreachy interns and co-mentors

2019-09-26 Thread Jeff King
On Thu, Sep 26, 2019 at 03:12:15PM +0200, Christian Couder wrote: > On https://www.outreachy.org/apply/project-selection/#git it looks > like we will only have 1 intern as the title of our section is "Git - > 1 intern". I wonder if it's because only funding for 1 intern has been > secured or if th

Re: [PATCH 3/3] wrapper: use a loop instead of repetitive statements

2019-09-26 Thread Jeff King
On Thu, Sep 26, 2019 at 10:14:17PM +0200, Johannes Schindelin wrote: > I mean, if there is _any_ performance-critical code path hitting this > unrolled loop, we may want to keep it unrolled. The loop in question is maybe a few dozen instructions, and then it immediately makes an open() syscall, w

Re: [PATCH 3/3] wrapper: use a loop instead of repetitive statements

2019-09-26 Thread Jeff King
On Tue, Sep 24, 2019 at 08:01:58PM -0600, Alex Henrie wrote: > diff --git a/wrapper.c b/wrapper.c > index c55d7722d7..c23ac6adcd 100644 > --- a/wrapper.c > +++ b/wrapper.c > @@ -469,13 +469,12 @@ int git_mkstemps_mode(char *pattern, int suffix_len, > int mode) > filename_template = &pattern

[PATCH v2] commit-graph: remove a duplicate assignment

2019-09-26 Thread Alex Henrie
Signed-off-by: Alex Henrie --- commit-graph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commit-graph.c b/commit-graph.c index 9b02d2c426..d0e1f9e1f2 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1522,7 +1522,7 @@ static int write_commit_graph_file(struct write_co

Re: [BUG] git is segfaulting, was [PATCH v4 04/12] dir: also check directories for matching pathspecs

2019-09-26 Thread SZEDER Gábor
On Fri, Sep 27, 2019 at 03:09:30AM +0200, SZEDER Gábor wrote: > On Wed, Sep 25, 2019 at 01:39:19PM -0700, Denton Liu wrote: > > Hi Elijah, > > > > I ran into a segfault on MacOS. I managed to bisect it down to > > 404ebceda0 (dir: also check directories for matching pathspecs, > > 2019-09-17), whi

Re: [BUG] git is segfaulting, was [PATCH v4 04/12] dir: also check directories for matching pathspecs

2019-09-26 Thread SZEDER Gábor
On Wed, Sep 25, 2019 at 01:39:19PM -0700, Denton Liu wrote: > Hi Elijah, > > I ran into a segfault on MacOS. I managed to bisect it down to > 404ebceda0 (dir: also check directories for matching pathspecs, > 2019-09-17), which should be the patch in the parent thread. The test > case below works f

Re: [PATCH v2] promisor-remote: skip move_to_tail when no-op

2019-09-26 Thread Jeff King
On Thu, Sep 26, 2019 at 02:31:56PM -0700, Emily Shaffer wrote: > --- > Thanks Peff for pointing out this bug occurs any time the tail is being > moved to tail in the promisors list. Modified patch to check just for > "already at tail" condition. > > Added a test case based on Peff's reproduction

Re: [BUG] git is segfaulting, was [PATCH v4 04/12] dir: also check directories for matching pathspecs

2019-09-26 Thread Elijah Newren
Hi Denton, On Thu, Sep 26, 2019 at 1:35 PM Denton Liu wrote: > > On Wed, Sep 25, 2019 at 02:55:30PM -0700, Denton Liu wrote: > > Looks correct to me. I don't see why this wouldn't reproduce. I'll send > > you more information if I figure anything else out. > > I looked into it a little more and I

Re: [PATCH 02/13] msvc: avoid using minus operator on unsigned types

2019-09-26 Thread Denton Liu
Hi Dscho, On Thu, Sep 26, 2019 at 11:01:32PM +0200, Johannes Schindelin wrote: > Hi Denton, > > On Thu, 26 Sep 2019, Denton Liu wrote: > > > Hi Dscho, > > > > On Thu, Sep 26, 2019 at 01:30:10AM -0700, Johannes Schindelin via > > GitGitGadget wrote: > > > From: Johannes Schindelin > > > > > > M

Re: git-gui contributions, was Re: What's cooking in git.git (Sep 2019, #02; Wed, 18)

2019-09-26 Thread Pratyush Yadav
On 26/09/19 08:44PM, Johannes Schindelin wrote: > Hi, > > On Tue, 24 Sep 2019, Pratyush Yadav wrote: > > > On 23/09/19 09:35PM, Johannes Schindelin wrote: > > > Hi, > > > > > > On Wed, 18 Sep 2019, Junio C Hamano wrote: > > > > > > > We have a new maintainer for git-gui now. Thanks Pratyush for

Re: [PATCH 1/1] respect core.hooksPath, falling back to .git/hooks

2019-09-26 Thread Pratyush Yadav
Hi, On 26/09/19 02:17PM, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > Since v2.9.0, Git knows about the config variable core.hookspath > that allows overriding the path to the directory containing the > Git hooks. > > Since v2.10.0, the `--git-path` option respect

Re: [PATCH 1/1] git-gui (Windows): use git-bash.exe if it is available

2019-09-26 Thread Pratyush Yadav
On 26/09/19 10:46AM, Thomas Klaeger via GitGitGadget wrote: > From: Thomas Klaeger > > Git for Windows 2.x ships with an executable that starts the Git Bash > with all the environment variables and what not properly set up. It is > also adjusted according to the Terminal emulator option chosen wh

Re: Git in Outreachy December 2019?

2019-09-26 Thread SZEDER Gábor
On Thu, Sep 26, 2019 at 09:32:35PM +0200, Johannes Schindelin wrote: > Hi, > > On Thu, 26 Sep 2019, SZEDER Gábor wrote: > > > On Mon, Sep 23, 2019 at 08:07:09PM +0200, SZEDER Gábor wrote: > > > Here is one more idea for microprojects: > > > > > > Find a group of related preprocessor constants a

Re: Git in Outreachy December 2019?

2019-09-26 Thread SZEDER Gábor
On Thu, Sep 26, 2019 at 09:39:58PM +0200, Johannes Schindelin wrote: > Hi, > > On Thu, 26 Sep 2019, SZEDER Gábor wrote: > > > On Thu, Sep 26, 2019 at 01:04:48PM +0200, Johannes Schindelin wrote: > > > > > > > Also, things like the code tracing via `-x` (which relies on Bash > > > > > > > function

Re: [PATCH v2] doc: MyFirstContribution: fix cmd placement instructions

2019-09-26 Thread Philip Oakley
On 26/09/2019 20:05, Pedro Sousa wrote: Using the pull command instead of push is more accurate when giving instructions on placing the psuh command in alphabetical order. Signed-off-by: Pedro Sousa --- Changes since v1: Addressed Philip's comments on making alphabetical sort instructions more

Re: [PATCH] CODE_OF_CONDUCT: mention individual project-leader emails

2019-09-26 Thread Emily Shaffer
On Thu, Sep 26, 2019 at 03:20:46AM -0400, Jeff King wrote: > So here's a patch that I think improves the situation. Looks great to me and addresses my only concern with the original patch. Hearty ACK. - Emily

[PATCH v2] promisor-remote: skip move_to_tail when no-op

2019-09-26 Thread Emily Shaffer
Previously, when promisor_remote_move_to_tail() is called for a promisor_remote which is currently the final element in promisors, a cycle is created in the promisors linked list. This cycle leads to a double free later on in promisor_remote_clear() when the final element of the promisors list is r

Re: git-gui: automatically move focus to staged file before typing commit message?

2019-09-26 Thread Birger Skogeng Pedersen
On Thu, Sep 26, 2019 at 9:30 PM Pratyush Yadav wrote: > Why are you changing the Alt+4 binding? I couldn't really find an easier way before. > This means your feature won't > work for people who use the mouse to move around in the UI (which I > suppose would be a majority). True. I would much p

[PATCH 1/1] respect core.hooksPath, falling back to .git/hooks

2019-09-26 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Since v2.9.0, Git knows about the config variable core.hookspath that allows overriding the path to the directory containing the Git hooks. Since v2.10.0, the `--git-path` option respects that config variable, too, so we may just as well use that command. For Git versi

[PATCH 0/1] git-gui: respect core.hooksPath, falling back to .git/hooks

2019-09-26 Thread Johannes Schindelin via GitGitGadget
This is yet another patch from Git for Windows. Johannes Schindelin (1): respect core.hooksPath, falling back to .git/hooks git-gui.sh | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) base-commit: 60c60b627e81bf84e1cb01729d2ae882178f079d Published-As: https://github.com/gitgitgadg

Re: git-gui: disable the "loose objects popup" dialog?

2019-09-26 Thread Marc Branchaud
On 2019-09-26 3:15 p.m., Pratyush Yadav wrote: On 26/09/19 08:54PM, Johannes Sixt wrote: Am 26.09.19 um 19:31 schrieb Birger Skogeng Pedersen: Every once in a while, I get the "This repository currently has approximately (some number) loose objects." popup dialog. I don't want to sound arrogan

Re: git-gui: disable the "loose objects popup" dialog?

2019-09-26 Thread Johannes Sixt
Am 26.09.19 um 21:15 schrieb Pratyush Yadav: > Reading the Stackoverflow link, it seems this is already possible via an > undocumented config variable "gui.gcwarning". I haven't tried using it > though, but I see no reason for it to not work (looking at > git-gui.sh:4141). Ah! That explains why

Re: git-gui: disable the "loose objects popup" dialog?

2019-09-26 Thread Birger Skogeng Pedersen
On Thu, Sep 26, 2019 at 9:15 PM Pratyush Yadav wrote: > Talking about auto compression, would it be a better idea to let users > disable the dialog, and then if they do want auto compression, they can > just run a cron job (or the Windows equivalent) to do this on their > repos? Personally I woul

Re: [PATCH 4/4] am: fix --interactive HEAD tree resolution

2019-09-26 Thread Jeff King
On Thu, Sep 26, 2019 at 04:20:05PM +0200, Alejandro Sanchez wrote: > Are there any updates to this problem? The fix for the original bug went into Git v2.22.1. -Peff

Re: [PATCH 1/1] git gui: fix staging a second line to a 1-line file

2019-09-26 Thread Johannes Schindelin
Hi, On Fri, 27 Sep 2019, Pratyush Yadav wrote: > On 26/09/19 08:25PM, Bert Wesarg wrote: > > On Thu, Sep 26, 2019 at 7:43 PM Johannes Schindelin via GitGitGadget > > wrote: > > > > > > From: Johannes Schindelin > > > > > > When a 1-line file is augmented by a second line, and the user tries to

Re: [PATCH 02/13] msvc: avoid using minus operator on unsigned types

2019-09-26 Thread Johannes Schindelin
Hi Denton, On Thu, 26 Sep 2019, Denton Liu wrote: > Hi Dscho, > > On Thu, Sep 26, 2019 at 01:30:10AM -0700, Johannes Schindelin via > GitGitGadget wrote: > > From: Johannes Schindelin > > > > MSVC complains about this with `-Wall`, which can be taken as a sign > > that this is indeed a real bug

Git describe shows old tag

2019-09-26 Thread dirtbikersteve .
I believe there is a bug in git describe. When using the command `git describe –tags` an old tag version was returned. The repo had a lightweight tag at v0.6.1, which was correctly shown by `git tag` but did not get returned by `git describe –tags` OR `git describe –all`. The command `git for-each-

Re: [BUG] git is segfaulting, was [PATCH v4 04/12] dir: also check directories for matching pathspecs

2019-09-26 Thread Denton Liu
On Wed, Sep 25, 2019 at 02:55:30PM -0700, Denton Liu wrote: > Looks correct to me. I don't see why this wouldn't reproduce. I'll send > you more information if I figure anything else out. I looked into it a little more and I think I know why it's being triggered. When we checkout 'todo' from 'mas

Re: [BUG/PATCH 0/5] t4214: cleanup and demonstrate graph bug

2019-09-26 Thread Jeff King
On Wed, Sep 25, 2019 at 10:09:02AM -0700, Denton Liu wrote: > On Wed, Sep 25, 2019 at 03:26:57AM -0700, Denton Liu wrote: > > I tried my hand at fixing the bug but in the hour I spent going at it, I > > couldn't fix the logic up. The buggy logic is in graph.c: > > graph_draw_octopus_merge() in cas

Re: [PATCH 3/3] wrapper: use a loop instead of repetitive statements

2019-09-26 Thread Johannes Schindelin
Hi, On Thu, 26 Sep 2019, Derrick Stolee wrote: > On 9/24/2019 10:01 PM, Alex Henrie wrote: > > Signed-off-by: Alex Henrie > > --- > > wrapper.c | 11 +-- > > 1 file changed, 5 insertions(+), 6 deletions(-) > > > > diff --git a/wrapper.c b/wrapper.c > > index c55d7722d7..c23ac6adcd 10064

Re: [PATCH 1/3] Makefile: use $(ALL_CFLAGS) in $(HCO) target

2019-09-26 Thread Johannes Schindelin
Hi, On Thu, 26 Sep 2019, Denton Liu wrote: > On Thu, Sep 26, 2019 at 02:49:55PM +0200, Johannes Schindelin wrote: > > > > On Mon, 23 Sep 2019, Denton Liu wrote: > > > > > On platforms that can run `make hdr-check` but require custom flags, > > > this target was failing because none of them were b

Re: Git in Outreachy December 2019?

2019-09-26 Thread Johannes Schindelin
Hi, On Thu, 26 Sep 2019, SZEDER Gábor wrote: > On Thu, Sep 26, 2019 at 01:04:48PM +0200, Johannes Schindelin wrote: > > > > > > Also, things like the code tracing via `-x` (which relies on Bash > > > > > > functionality in order to work properly, > > > > > > > > > > Not really. > > > > > > > > To

Re: [PATCH v3 0/2] Update: fixed typos in commit message

2019-09-26 Thread Torsten Bögershausen
On Tue, Sep 24, 2019 at 03:40:28AM -0700, Alexandr Miloslavskiy via GitGitGadget wrote: > Commit 1/2: t0028: fix test for UTF-16-LE-BOM Commit 2/2: t0028: add more > tests Please refer to individual commit messages for more information. > > Alexandr Miloslavskiy (2): > t0028: fix test for UTF-16

Re: Git in Outreachy December 2019?

2019-09-26 Thread Johannes Schindelin
Hi, On Thu, 26 Sep 2019, SZEDER Gábor wrote: > On Mon, Sep 23, 2019 at 08:07:09PM +0200, SZEDER Gábor wrote: > > Here is one more idea for microprojects: > > > > Find a group of related preprocessor constants and turn them into an > > enum. Also find where those constants are stored in varia

Re: git-gui: automatically move focus to staged file before typing commit message?

2019-09-26 Thread Pratyush Yadav
On 26/09/19 08:33PM, Birger Skogeng Pedersen wrote: > Honestly I'll need some help to get this one implemented. The only > implementation I've got working currently, is to change Alt+4 key bind > to do the following: > - Focus the "Staged Changes" widget (which will select a path in the > list, if

Re: git-gui: disable the "loose objects popup" dialog?

2019-09-26 Thread Pratyush Yadav
On 26/09/19 08:54PM, Johannes Sixt wrote: > Am 26.09.19 um 19:31 schrieb Birger Skogeng Pedersen: > > Every once in a while, I get the "This repository currently has > > approximately (some number) loose objects." popup dialog. > > > > I don't want to sound arrogant, but I find this popup along wi

Re: git-gui: disable the "loose objects popup" dialog?

2019-09-26 Thread Birger Skogeng Pedersen
Hi Johannes, On Thu, Sep 26, 2019 at 8:54 PM Johannes Sixt wrote: > I dislike the popup, too. But I want total control over my repository: > No automatic compression behind my back, in particular, when that > expires reflogs, and git-gui does that. I understand what you mean. In my opinion, An o

[PATCH v2] doc: MyFirstContribution: fix cmd placement instructions

2019-09-26 Thread Pedro Sousa
Using the pull command instead of push is more accurate when giving instructions on placing the psuh command in alphabetical order. Signed-off-by: Pedro Sousa --- Changes since v1: Addressed Philip's comments on making alphabetical sort instructions more explicit Documentation/MyFirstContributi

Re: git-gui: disable the "loose objects popup" dialog?

2019-09-26 Thread Johannes Sixt
Am 26.09.19 um 19:31 schrieb Birger Skogeng Pedersen: > Every once in a while, I get the "This repository currently has > approximately (some number) loose objects." popup dialog. > > I don't want to sound arrogant, but I find this popup along with the > dialog showing after that prints the result

Re: [PATCH 1/1] git gui: fix staging a second line to a 1-line file

2019-09-26 Thread Pratyush Yadav
On 26/09/19 08:25PM, Bert Wesarg wrote: > On Thu, Sep 26, 2019 at 7:43 PM Johannes Schindelin via GitGitGadget > wrote: > > > > From: Johannes Schindelin > > > > When a 1-line file is augmented by a second line, and the user tries to > > stage that single line via the "Stage Line" context menu it

Re: git-gui contributions, was Re: What's cooking in git.git (Sep 2019, #02; Wed, 18)

2019-09-26 Thread Johannes Schindelin
Hi, On Tue, 24 Sep 2019, Pratyush Yadav wrote: > On 23/09/19 09:35PM, Johannes Schindelin wrote: > > Hi, > > > > On Wed, 18 Sep 2019, Junio C Hamano wrote: > > > > > We have a new maintainer for git-gui now. Thanks Pratyush for > > > volunteering. > > > > Excellent! > > > > I opened PRs at https

Re: git-gui: automatically move focus to staged file before typing commit message?

2019-09-26 Thread Birger Skogeng Pedersen
Honestly I'll need some help to get this one implemented. The only implementation I've got working currently, is to change Alt+4 key bind to do the following: - Focus the "Staged Changes" widget (which will select a path in the list, if it isn't focused already), then - Focus the "Commit Message" w

Re: [PATCH 1/1] git gui: fix staging a second line to a 1-line file

2019-09-26 Thread Bert Wesarg
On Thu, Sep 26, 2019 at 7:43 PM Johannes Schindelin via GitGitGadget wrote: > > From: Johannes Schindelin > > When a 1-line file is augmented by a second line, and the user tries to > stage that single line via the "Stage Line" context menu item, we do not > want to see "apply: corrupt patch at l

Re: [PATCH] promisor-remote: skip move_to_tail when n=1

2019-09-26 Thread Jeff King
On Thu, Sep 26, 2019 at 10:53:08AM -0700, Emily Shaffer wrote: > > should probably just see if we're already at the end, which also covers > > the single-element case. Like: > > > > if (!r->next) > > return; /* we're already at the end */ > > Hmm, I guess I wasn't familiar enough on the li

Re: [PATCH 1/3] commit-graph: remove a duplicate assignment

2019-09-26 Thread Alex Henrie
On Thu, Sep 26, 2019 at 7:02 AM Derrick Stolee wrote: > > Could we instead remove the assignment during the declaration? It is > easier to know the while loop will work if the assignment is closer > to the loop. Sure, that's fine. I'll send a v2 with that change. -Alex

Re: [PATCH] promisor-remote: skip move_to_tail when n=1

2019-09-26 Thread Emily Shaffer
On Thu, Sep 26, 2019 at 03:55:35AM -0400, Jeff King wrote: > On Wed, Sep 25, 2019 at 02:37:18PM -0700, Emily Shaffer wrote: > > > Previously, when promisor_remote_move_to_tail() is called for a > > promisor_remote which is currently the *only* element in promisors, a > > cycle is created in the pr

[PATCH 1/1] git-gui (Windows): use git-bash.exe if it is available

2019-09-26 Thread Thomas Klaeger via GitGitGadget
From: Thomas Klaeger Git for Windows 2.x ships with an executable that starts the Git Bash with all the environment variables and what not properly set up. It is also adjusted according to the Terminal emulator option chosen when installing Git for Windows (while `bash.exe --login -i` would alway

[PATCH 0/1] git-gui (Windows): use git-bash.exe if it is available

2019-09-26 Thread Johannes Schindelin via GitGitGadget
... and yet another patch that is carried in Git for Windows for quite a long time. This commit was contributed as https://github.com/patthoyts/git/gui/pull/6 which was ignored for almost three years, and then as https://github.com/prati0100/git-gui/pull/2 which was rejected in favor of a mailin

[PATCH 1/1] git gui: fix staging a second line to a 1-line file

2019-09-26 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin When a 1-line file is augmented by a second line, and the user tries to stage that single line via the "Stage Line" context menu item, we do not want to see "apply: corrupt patch at line 5". The reason for this error was that the hunk header looks like this: @@

[PATCH 0/1] git gui: fix staging a second line to a 1-line file

2019-09-26 Thread Johannes Schindelin via GitGitGadget
Yet another patch that is carried in Git for Windows for quite a long time. This fixes https://github.com/git-for-windows/git/issues/515. This commit was contributed as https://github.com/patthoyts/git/gui/pull/7 which was ignored for almost three years, and then as https://github.com/prati0100/

Re: [PATCH] add a Code of Conduct document

2019-09-26 Thread Elijah Newren
On Wed, Sep 25, 2019 at 5:42 PM Jeff King wrote: > > We've never had a formally written Code of Conduct document. Though it > has been discussed off and on over the years, for the most part the > behavior on the mailing list has been good enough that nobody felt the > need to push one forward. > >

Re: [PATCH 1/3] Makefile: use $(ALL_CFLAGS) in $(HCO) target

2019-09-26 Thread Denton Liu
Hi Dscho, On Thu, Sep 26, 2019 at 02:49:55PM +0200, Johannes Schindelin wrote: > Hi Denton, > > On Mon, 23 Sep 2019, Denton Liu wrote: > > > On platforms that can run `make hdr-check` but require custom flags, > > this target was failing because none of them were being passed to the > > compiler

Re: [PATCH 08/15] name-rev: pull out deref handling from the recursion

2019-09-26 Thread SZEDER Gábor
On Tue, Sep 24, 2019 at 07:03:50PM +0200, René Scharfe wrote: > Am 23.09.19 um 22:47 schrieb SZEDER Gábor: > > On Mon, Sep 23, 2019 at 09:55:11PM +0200, René Scharfe wrote: > >> -- >8 -- > >> Subject: [PATCH] name-rev: use FLEX_ARRAY for tip_name in struct rev_name > >> > >> Give each rev_name its

git-gui: disable the "loose objects popup" dialog?

2019-09-26 Thread Birger Skogeng Pedersen
Hi, Every once in a while, I get the "This repository currently has approximately (some number) loose objects." popup dialog. I don't want to sound arrogant, but I find this popup along with the dialog showing after that prints the result of the compression, immensely annoying. And I've seen peo

Re: [PATCH 02/13] msvc: avoid using minus operator on unsigned types

2019-09-26 Thread Denton Liu
Hi Dscho, On Thu, Sep 26, 2019 at 01:30:10AM -0700, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > MSVC complains about this with `-Wall`, which can be taken as a sign > that this is indeed a real bug. The symptom is: > > C4146: unary minus operator applied t

Re: sizeof(var) vs sizeof(type), was Re: [PATCH] git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()

2019-09-26 Thread Derrick Stolee
On 9/26/2019 11:24 AM, Philip Oakley wrote: > On 26/09/2019 14:36, Derrick Stolee wrote: Another good reason to use "sizeof(var)" instead of sizeof(type)". :) >>> That is indeed a very good reason, in addition to getting the type right >>> automatically (by virtue of letting the compiler pick

[PATCH 1/4] git-gui: provide question helper for retry fallback on Windows

2019-09-26 Thread Heiko Voigt via GitGitGadget
From: Heiko Voigt Make use of the new environment variable GIT_ASK_YESNO to support the recently implemented fallback in case unlink, rename or rmdir fail for files in use on Windows. The added dialog will present a yes/no question to the the user which will currently be used by the windows compa

[PATCH 4/4] git-gui--askyesno (mingw): use Git for Windows' icon, if available

2019-09-26 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin For additional GUI goodness. Signed-off-by: Johannes Schindelin --- git-gui--askyesno | 12 1 file changed, 12 insertions(+) diff --git a/git-gui--askyesno b/git-gui--askyesno index 45b0260eff..c0c82e7cbd 100755 --- a/git-gui--askyesno +++ b/git-gui--ask

[PATCH 3/4] git-gui--askyesno: allow overriding the window title

2019-09-26 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin "Question?" is maybe not the most informative thing to ask. In the absence of better information, it is the best we can do, of course. However, Git for Windows' auto updater just learned the trick to use git-gui--askyesno to ask the user whether to update now or not. An

[PATCH 2/4] git gui: set GIT_ASKPASS=git-gui--askpass if not set yet

2019-09-26 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Signed-off-by: Johannes Schindelin --- git-gui.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git-gui.sh b/git-gui.sh index 76d8139b8d..66f046a0c7 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1248,6 +1248,9 @@ set have_tk85 [expr {[package vcompare $tk_versi

[PATCH 0/4] git-gui: GIT_ASK_YESNO/GIT_ASKPASS patches from Git for Windows

2019-09-26 Thread Johannes Schindelin via GitGitGadget
This is another set of patches from Git for Windows' fork that have been sitting there since 2010, providing cross-platform GUI helpers to ask the user a question or allow typing in a password. This patch series was first submitted as https://github.com/patthoyts/git-gui/pull/5 which was ignored

Re: sizeof(var) vs sizeof(type), was Re: [PATCH] git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()

2019-09-26 Thread Philip Oakley
On 26/09/2019 14:36, Derrick Stolee wrote: Another good reason to use "sizeof(var)" instead of sizeof(type)". :) That is indeed a very good reason, in addition to getting the type right automatically (by virtue of letting the compiler pick it). Should we make this an explicit guideline in our d

Re: [PATCH 4/4] am: fix --interactive HEAD tree resolution

2019-09-26 Thread Alejandro Sanchez
Hi, Are there any updates to this problem? Thank you, Alex On Wed, May 29, 2019 at 1:57 PM Johannes Schindelin wrote: > > Hi Peff, > > On Tue, 28 May 2019, Jeff King wrote: > > > On Tue, May 28, 2019 at 01:06:21PM +0200, Johannes Schindelin wrote: > > > > > > Or do you prefer having a one-line

Re: [PATCH v2 00/19] hashmap bug/safety/ease-of-use fixes

2019-09-26 Thread Phillip Wood
Hi Eric On 24/09/2019 02:03, Eric Wong wrote: Patches 1-11 are largely unchanged from the original series with the exception of 2, which is new and posted at: https://public-inbox.org/git/20190908074953.kux7zz4y7iolqko4@whir/ 12-17 take further steps to get us away from hashmap_entry b

Re: sizeof(var) vs sizeof(type), was Re: [PATCH] git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()

2019-09-26 Thread SZEDER Gábor
On Thu, Sep 26, 2019 at 09:36:44AM -0400, Derrick Stolee wrote: > On 9/26/2019 9:22 AM, Johannes Schindelin wrote: > > Hi Peff, > > > > On Mon, 23 Sep 2019, Jeff King wrote: > > > >> On Thu, Sep 19, 2019 at 10:48:30PM +0200, René Scharfe wrote: > >> > >>> Use the macro COPY_ARRAY to copy array el

Re: sizeof(var) vs sizeof(type), was Re: [PATCH] git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()

2019-09-26 Thread Derrick Stolee
On 9/26/2019 9:22 AM, Johannes Schindelin wrote: > Hi Peff, > > On Mon, 23 Sep 2019, Jeff King wrote: > >> On Thu, Sep 19, 2019 at 10:48:30PM +0200, René Scharfe wrote: >> >>> Use the macro COPY_ARRAY to copy array elements and MOVE_ARRAY to do the >>> same for moving them backwards in an array w

Re: Git in Outreachy December 2019?

2019-09-26 Thread SZEDER Gábor
On Thu, Sep 26, 2019 at 01:04:48PM +0200, Johannes Schindelin wrote: > > > > > Also, things like the code tracing via `-x` (which relies on Bash > > > > > functionality in order to work properly, > > > > > > > > Not really. > > > > > > To work properly. What I meant was the trick we need to play wi

sizeof(var) vs sizeof(type), was Re: [PATCH] git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()

2019-09-26 Thread Johannes Schindelin
Hi Peff, On Mon, 23 Sep 2019, Jeff King wrote: > On Thu, Sep 19, 2019 at 10:48:30PM +0200, René Scharfe wrote: > > > Use the macro COPY_ARRAY to copy array elements and MOVE_ARRAY to do the > > same for moving them backwards in an array with potential overlap. The > > result is shorter and safer

Celine Santiago

2019-09-26 Thread Madam Celine Labuso
Dear Friend My name is Mrs. Celine Santiago, I got your contact from yahoo tourist search while I was searching for a foreign partner. I am assured of your capability and reliability to champion this business opportunity. I am a banker in one of the prime Banks in Ouagadougou Burkina-Faso, I want

Re: [PATCH 3/3] wrapper: use a loop instead of repetitive statements

2019-09-26 Thread Derrick Stolee
On 9/24/2019 10:01 PM, Alex Henrie wrote: > Signed-off-by: Alex Henrie > --- > wrapper.c | 11 +-- > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/wrapper.c b/wrapper.c > index c55d7722d7..c23ac6adcd 100644 > --- a/wrapper.c > +++ b/wrapper.c > @@ -469,13 +469,12 @@ in

Number of Outreachy interns and co-mentors

2019-09-26 Thread Christian Couder
Hi Peff and everyone, On https://www.outreachy.org/apply/project-selection/#git it looks like we will only have 1 intern as the title of our section is "Git - 1 intern". I wonder if it's because only funding for 1 intern has been secured or if there is another reason. Also I am not sure how peopl

Re: [PATCH 2/3] diffcore-break: use a goto instead of a redundant if statement

2019-09-26 Thread Derrick Stolee
On 9/24/2019 10:01 PM, Alex Henrie wrote: > Signed-off-by: Alex Henrie > --- > diffcore-break.c | 15 +++ > 1 file changed, 7 insertions(+), 8 deletions(-) > > diff --git a/diffcore-break.c b/diffcore-break.c > index 875aefd3fe..f6ab74141b 100644 > --- a/diffcore-break.c > +++ b/diff

Re: [PATCH 1/3] commit-graph: remove a duplicate assignment

2019-09-26 Thread Derrick Stolee
On 9/24/2019 10:01 PM, Alex Henrie wrote: > Signed-off-by: Alex Henrie > --- > commit-graph.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/commit-graph.c b/commit-graph.c > index 9b02d2c426..659f4bb4f4 100644 > --- a/commit-graph.c > +++ b/commit-graph.c > @@ -1534,7 +1534,6 @@ static

Re: [PATCH 0/3] fixes related to `make hdr-check`

2019-09-26 Thread Johannes Schindelin
Hi Denton, On Mon, 23 Sep 2019, Denton Liu wrote: > This patchset relates to `make hdr-check`. The first patch addresses > getting it to run on platforms which require custom CFLAGS. > > The other two patches address errors/warnings caught by actually running > `make hdr-check`. > > > Denton Liu

Re: [PATCH 1/3] Makefile: use $(ALL_CFLAGS) in $(HCO) target

2019-09-26 Thread Johannes Schindelin
Hi Denton, On Mon, 23 Sep 2019, Denton Liu wrote: > On platforms that can run `make hdr-check` but require custom flags, > this target was failing because none of them were being passed to the > compiler. For example, on MacOS, the NO_OPENSSL flag was being set but > it was not being passed into

Re: Git in Outreachy December 2019?

2019-09-26 Thread Johannes Schindelin
Hi Eric, On Tue, 24 Sep 2019, Eric Wong wrote: > Johannes Schindelin wrote: > > On Mon, 16 Sep 2019, Emily Shaffer wrote: > > > - try and make progress towards running many tests from a single test > > >file in parallel - maybe this is too big, I'm not sure if we know how > > >many of o

Re: [PATCH] CODE_OF_CONDUCT: mention individual project-leader emails

2019-09-26 Thread Derrick Stolee
On 9/26/2019 3:20 AM, Jeff King wrote: > On Tue, Sep 24, 2019 at 04:52:56PM -0700, Emily Shaffer wrote: > I've cc'd g...@sfconservancy.org here, because I think it's important for all of the project committee members to endorse it (and because the document puts us on the hook for en

Re: Git in Outreachy December 2019?

2019-09-26 Thread Johannes Schindelin
Hi, On Mon, 23 Sep 2019, SZEDER Gábor wrote: > On Wed, Sep 04, 2019 at 03:41:15PM -0400, Jeff King wrote: > > The project page has a section to point people in the right direction > > for first-time contributions. I've left it blank for now, but I think it > > makes sense to point one (or both) o

Re: Git in Outreachy December 2019?

2019-09-26 Thread Johannes Schindelin
Hi, On Mon, 23 Sep 2019, SZEDER Gábor wrote: > On Mon, Sep 23, 2019 at 02:47:23PM +0200, Johannes Schindelin wrote: > > > > On Tue, 17 Sep 2019, SZEDER Gábor wrote: > > > > > On Tue, Sep 17, 2019 at 01:23:18PM +0200, Johannes Schindelin wrote: > > > > Also, things like the code tracing via `-x` (

Re: Virtual Git Contributor Summit

2019-09-26 Thread Johannes Schindelin
On Thu, 26 Sep 2019, Eric Wong wrote: > James Ramsay wrote: > > On 3 Jul 2019, at 9:01, Johannes Schindelin wrote: > > > > > > I kept talking about this idea of a purely online Git Contributor > > > Summit, and it is finally time for action. > > > > Yesterday, Christian and I took notes in the do

Re: Git in Outreachy December 2019?

2019-09-26 Thread SZEDER Gábor
On Mon, Sep 23, 2019 at 08:07:09PM +0200, SZEDER Gábor wrote: > Here is one more idea for microprojects: > > Find a group of related preprocessor constants and turn them into an > enum. Also find where those constants are stored in variables and > in structs and passed around as function pa

Re: [PATCH v2 00/19] hashmap bug/safety/ease-of-use fixes

2019-09-26 Thread Johannes Schindelin
Hi Eric, On Tue, 24 Sep 2019, Eric Wong wrote: > Patches 1-11 are largely unchanged from the original series with the > exception of 2, which is new and posted at: > > https://public-inbox.org/git/20190908074953.kux7zz4y7iolqko4@whir/ > > 12-17 take further steps to get us away from hashmap

[PATCH 09/13] vcxproj: include more generated files

2019-09-26 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin In the CI builds, we bundle all generated files into a so-called artifacts `.tar` file, so that the test phase can fan out into multiple parallel builds. This patch makes sure that all files are included in the `vcxproj` target which are needed for that artifacts `.tar`

[PATCH 04/13] compat/win32/path-utils.h: add #include guards

2019-09-26 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin This adds the common guards that allow headers to be #include'd multiple times. Signed-off-by: Johannes Schindelin --- compat/win32/path-utils.h | 5 + 1 file changed, 5 insertions(+) diff --git a/compat/win32/path-utils.h b/compat/win32/path-utils.h index 0f70d4

[PATCH 02/13] msvc: avoid using minus operator on unsigned types

2019-09-26 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin MSVC complains about this with `-Wall`, which can be taken as a sign that this is indeed a real bug. The symptom is: C4146: unary minus operator applied to unsigned type, result still unsigned Let's avoid this warning in the minimal way, e.g. writing `-

[PATCH 08/13] vcxproj: only copy `git-remote-http.exe` once it was built

2019-09-26 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin In b18ae14a8f6 (vcxproj: also link-or-copy builtins, 2019-07-29), we started to copy or hard-link the built-ins as a post-build step of the `git` project. At the same time, we tried to copy or hard-link `git-remote-http.exe`, but it is quite possible that it was not bui

[PATCH 03/13] winansi: use FLEX_ARRAY to avoid compiler warning

2019-09-26 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin MSVC would complain thusly: C4200: nonstandard extension used: zero-sized array in struct/union Let's just use the `FLEX_ARRAY` constant that we introduced for exactly this type of scenario. Signed-off-by: Johannes Schindelin --- compat/winansi.c | 2 +- 1 file

[PATCH 07/13] msvc: work around a bug in GetEnvironmentVariable()

2019-09-26 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The return value of that function is 0 both for variables that are unset, as well as for variables whose values are empty. To discern those two cases, one has to call `GetLastError()`, whose return value is `ERROR_ENVVAR_NOT_FOUND` and `ERROR_SUCCESS`, respectively. Exc

[PATCH 11/13] tests: let --immediate and --write-junit-xml play well together

2019-09-26 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin When the `--immediate` option is in effect, any test failure will immediately exit the test script. Together with `--write-junit-xml`, we will want the JUnit-style `.xml` file to be finalized (and not leave the XML incomplete). Let's make it so. This comes in particular

[PATCH 10/13] test-tool run-command: learn to run (parts of) the testsuite

2019-09-26 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Git for Windows jumps through hoops to provide a development environment that allows to build Git and to run its test suite. To that end, an entire MSYS2 system, including GNU make and GCC is offered as "the Git for Windows SDK". It does come at a price: an initial downl

[PATCH 13/13] ci: also build and test with MS Visual Studio on Azure Pipelines

2019-09-26 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin ... because we can, now. Technically, we actually build using `MSBuild`, which is however pretty close to building interactively in Visual Studio. As there is no convenient way to run Git's test suite in Visual Studio, we unpack a Portable Git to run it, using the just-

[PATCH 12/13] ci: really use shallow clones on Azure Pipelines

2019-09-26 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin This was a left-over from the previous YAML schema, and it no longer works. The problem was noticed while editing `azure-pipelines.yml` in VS Code with the very helpful "Azure Pipelines" extension (syntax highlighting and intellisense for `azure-pipelines.yml`...). Sign

[PATCH 06/13] msvc: handle DEVELOPER=1

2019-09-26 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin We frequently build Git using the `DEVELOPER=1` make setting as a shortcut to enable all kinds of more stringent compiler warnings. Those compiler warnings are relatively specific to GCC, though, so let's try our best to translate them to the equivalent options to pass

[PATCH 05/13] msvc: ignore some libraries when linking

2019-09-26 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin To build with MSVC, we "translate" GCC options to MSVC options, and part of those options refer to the libraries to link into the final executable. Currently, this part looks somewhat like this on Windows: -lcurl -lnghttp2 -lidn2 -lssl -lcrypto -lssl -lcrypto -l

[PATCH 00/13] ci: include a Visual Studio build & test in our Azure Pipeline

2019-09-26 Thread Johannes Schindelin via GitGitGadget
Git's Continuous Integration (CI) includes an Azure Pipeline that builds Git on Linux, macOS and Windows, in the former two cases even in multiple configurations (using GCC vs clang, 32-bit vs 64-bit, etc). On Windows, we only build using GCC, using (a subset of) Git for Windows' SDK. Recently, a

[PATCH 01/13] push: do not pretend to return `int` from `die_push_simple()`

2019-09-26 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin This function is marked as `NORETURN`, and it indeed does not want to return anything. So let's not declare it with the return type `int`. This fixes the following warning when building with MSVC: C4646: function declared with 'noreturn' has non-void return type

Re: [PATCH] promisor-remote: skip move_to_tail when n=1

2019-09-26 Thread Jeff King
On Wed, Sep 25, 2019 at 02:37:18PM -0700, Emily Shaffer wrote: > Previously, when promisor_remote_move_to_tail() is called for a > promisor_remote which is currently the *only* element in promisors, a > cycle is created in the promisors linked list. This cycle leads to a > double free later on in

[PATCH 2/2] stash: handle staged changes in skip-worktree files correctly

2019-09-26 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin When calling `git stash` while changes were staged for files that are marked with the `skip-worktree` bit (e.g. files that are excluded in a sparse checkout), the files are recorded as _deleted_ instead. The reason is that `git stash` tries to construct the tree reflect

  1   2   >