Re: [PATCH] dir: special case check for the possibility that pathspec is NULL

2019-09-30 Thread Denton Liu
Hi Elijah, On Mon, Sep 30, 2019 at 12:11:06PM -0700, Elijah Newren wrote: > Commits 404ebceda01c ("dir: also check directories for matching > pathspecs", 2019-09-17) and 89a1f4aaf765 ("dir: if our pathspec might > match files under a dir, recurse into it", 2019-09-17) added calls to > match_pathsp

Re: [PATCH v2 1/1] git-add--interactive.perl: Add progress counter in the prompt

2019-09-30 Thread Johannes Schindelin
eally know perl (though printf syntax is almost universal). Cheers Kunal Tyagi On Mon, 30 Sep 2019, Junio C Hamano wrote: > "Kunal Tyagi via GitGitGadget" writes: > > > From: Kunal Tyagi > > Subject: Re: [PATCH v2 1/1] git-add--interactive.perl: Add progress counter >

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

2019-09-30 Thread Jeff King
gt; previous value of promisors) is also free()'d. This double-free error > was unrecoverable for the user without removing the filter or re-cloning > the repo and hoping to miss this edge case. > > Now, when promisor_remote_move_to_tail() would be a no-op, just do a > no-op. In

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

2019-09-30 Thread Alex Henrie
On Mon, Sep 30, 2019 at 3:48 AM Junio C Hamano wrote: > > Alex Henrie writes: > > > Well, I admit that code clarity is somewhat subjective. To me it's not > > obvious that "if (q->nr <= j)" means "if the loop exited normally", > > I actually do not have too much problem with this side of the > eq

Re: [PATCH v4 04/24] merge-recursive: provide a better label for diff3 common ancestor

2019-09-30 Thread Jeff King
On Mon, Sep 30, 2019 at 05:14:37PM -0400, Jeff King wrote: > > This chosen label was perfectly reasonable when recursiveness kicks in, > > i.e. when there are multiple merge bases. (I can't think of a better > > label in such cases.) But it is actually somewhat misleading when there > > is a uni

Re: [PATCH v4 04/24] merge-recursive: provide a better label for diff3 common ancestor

2019-09-30 Thread Jeff King
On Sat, Aug 17, 2019 at 11:41:24AM -0700, Elijah Newren wrote: > In commit 7ca56aa07619 ("merge-recursive: add a label for ancestor", > 2010-03-20), a label was added for the '||' line to make it have > the more informative heading '|| merged common ancestors', with > the statement: > >

Re: [PATCH v2 1/6] midx: add MIDX_PROGRESS flag

2019-09-30 Thread William Baker
On 9/27/19 8:40 PM, Junio C Hamano wrote: > SZEDER Gábor writes: > >>> +#define MIDX_PROGRESS (1 << 0) >> >> Please consider using an enum. > > If they are used by assiging one of their values, definitely a good > idea to use an enum. Are debuggers clever enough that they can > tell, when t

Re: [PATCH v2 18/19] OFFSETOF_VAR macro to simplify hashmap iterators

2019-09-30 Thread Junio C Hamano
Eric Wong writes: > While we cannot rely on a `__typeof__' operator being portable > to use with `offsetof'; we can calculate the pointer offset > using an existing pointer and the address of a member using > pointer arithmetic. > +/* > + * like offsetof(), but takes a pointer to type instead of

Re: [PATCH v2 2/6] midx: add progress to write_midx_file Add progress to write_midx_file. Progress is displayed when the MIDX_PROGRESS flag is set.

2019-09-30 Thread William Baker
On 9/27/19 8:49 PM, Junio C Hamano wrote: diff --git a/midx.c b/midx.c index b2673f52e8..54e4e93b2b 100644 --- a/midx.c +++ b/midx.c @@ -449,6 +449,8 @@ struct pack_list { uint32_t nr; uint32_t alloc; struct multi_pack_index *m; + struct progre

Re: RFC: Cryptographic attestation for email-based patch workflows

2019-09-30 Thread Konstantin Ryabitsev
On Fri, Sep 27, 2019 at 08:24:37AM -0700, d...@linuxprogrammer.org wrote: - generate a signify-compatible cryptographic signature of the verbatim patch content, perhaps slightly normalized for things like LF vs. CRLF line endings (see minisign/libsodium for crypto details) - include both the sig

Re: [PATCH 2/2] git-gui: support for diff3 conflict style

2019-09-30 Thread Bert Wesarg
> > + set tags d_-- > > I'm afraid I don't follow what this hunk is supposed to do. > > You set the variable ::conflict_state to the values like OURS, THEIRS, > CONTEXT, but I don't see th

Re: [PATCH 1/2] Move git_sort(), a stable sort, into into libgit.a

2019-09-30 Thread Johannes Schindelin
Hi Junio, On Sat, 28 Sep 2019, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" > writes: > > > --- > > Makefile | 2 +- > > compat/mingw.c| 5 - > > git-compat-util.h | 4 +++- > > compat/qsort.c => qsort.c | 2 +- > > 4 files changed, 5 i

Re: [PATCH v2 10/19] introduce container_of macro

2019-09-30 Thread Eric Wong
Derrick Stolee wrote: > On 9/23/2019 9:03 PM, Eric Wong wrote: > > This macro is popular within the Linux kernel for supporting > > intrusive data structures such as linked lists, red-black trees, > > and chained hash tables while allowing the compiler to do > > type checking. > > > > I intend to

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

2019-09-30 Thread Johannes Schindelin
Hi, On Fri, 27 Sep 2019, Pratyush Yadav wrote: > 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

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

2019-09-30 Thread Eric Wong
Johannes Schindelin wrote: > 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

Re: [PATCH v2 07/19] hashmap_get takes "const struct hashmap_entry *"

2019-09-30 Thread Eric Wong
Derrick Stolee wrote: > On 9/23/2019 9:03 PM, Eric Wong wrote: > > This is less error-prone than "const void *" as the compiler > > now detects invalid types being passed. > [snip] > > diff --git a/hashmap.h b/hashmap.h > > index 40bcc64289..2a4b4a3954 100644 > > --- a/hashmap.h > > +++ b/hashmap.

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

2019-09-30 Thread Johannes Schindelin
Hi Junio, On Sun, 29 Sep 2019, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" > writes: > > > diff --git a/t/test-lib.sh b/t/test-lib.sh > > index d1ba33745a..f21c781e68 100644 > > --- a/t/test-lib.sh > > +++ b/t/test-lib.sh > > @@ -695,7 +695,7 @@ test_failure_ () { > > say_

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

2019-09-30 Thread Johannes Schindelin
Hi Denton, On Thu, 26 Sep 2019, Denton Liu wrote: > On Thu, Sep 26, 2019 at 11:01:32PM +0200, Johannes Schindelin wrote: > > > > 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: > >

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

2019-09-30 Thread Junio C Hamano
Alex Henrie writes: > Well, I admit that code clarity is somewhat subjective. To me it's not > obvious that "if (q->nr <= j)" means "if the loop exited normally", I actually do not have too much problem with this side of the equation. I however do see problem with squashing the two diff_q calls

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

2019-09-30 Thread Johannes Schindelin
Hi, On Fri, 27 Sep 2019, Pratyush Yadav wrote: > On 27/09/19 08:10AM, Bert Wesarg wrote: > > On Fri, Sep 27, 2019 at 12:40 AM Pratyush Yadav > > wrote: > > > > > > On 26/09/19 02:17PM, Johannes Schindelin via GitGitGadget wrote: > > > > From: Johannes Schindelin > > > > > > > > Since v2.9.0, G

Re: Git in Outreachy December 2019?

2019-09-30 Thread Eric Wong
od at driving stuff to cache. > > > Likewise, having a framework in C would make it a lot easier to improve > > > debugging, e.g. by making test scripts "resumable" (guarded by an > > > option, it could store a complete state, including a copy of the trash > > &g

Re: Bi-Weekly Standup - Time/timezone in calendar?

2019-09-30 Thread Thomas Gummerer
On 09/28, Junio C Hamano wrote: > Thomas Gummerer writes: > > >> I thought it was to be 1700 UTC, which currently is 1800 BST her in UK, and > >> 1900 CST in Europe. > > > > That's my recollection as well, and what the calendar should say. > > Thanks for flagging this! > > > > I don't know. I'd

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

2019-09-30 Thread Alex Henrie
On Sun, Sep 29, 2019 at 7:36 PM Junio C Hamano wrote: > > Alex Henrie writes: > > > The condition "if (q->nr <= j)" checks whether the loop exited normally > > or via a break statement. This check can be avoided by replacing the > > jump out of the inner loop with a jump to the end of the outer l

Re: [PATCH v3] commit-graph: remove a duplicate assignment

2019-09-30 Thread Alex Henrie
On Sun, Sep 29, 2019 at 7:22 PM Junio C Hamano wrote: > > Alex Henrie writes: > > > The variable g was being set to the same value both at the beginning of > > the function and before the loop. The assignment before the loop was > > kept because it helps clarify what the loop does, and the redund

Re: [PATCH v3 2/2] t0028: add more tests

2019-09-30 Thread Alexandr Miloslavskiy
On 28.09.2019 6:47, Junio C Hamano wrote: s/bugged/buggy/ perhaps? Usually people do not place hidden listening devices in tests ;-) Yes, hinting those hidden listening devices was an oversight. Thanks for your help in putting them back undercover! I understand that you already changed the

[PATCH v2 09/11] grep: protect packed_git [re-]initialization

2019-09-29 Thread Matheus Tavares
initialization of packed_git when setting git-grep up. There'll be a small overhead in the cases where we didn't really needed to prepare packed_git during execution but this shouldn't be very noticeable. Also, packed_git may be re-initialized by packfile.c:reprepare_packed_git().

[PATCH v2 10/11] grep: re-enable threads in non-worktree case

2019-09-29 Thread Matheus Tavares
peedup, so let's re-enable threads in non-worktree grep. Grepping 'abcd[02]' ("Regex 1") and '(static|extern) (int|double) \*' ("Regex 2") at chromium's repository[1] I got: Threads | Regex 1 | Regex 2 -||--- 1

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

2019-09-29 Thread Junio C Hamano
Alex Henrie writes: > The condition "if (q->nr <= j)" checks whether the loop exited normally > or via a break statement. This check can be avoided by replacing the > jump out of the inner loop with a jump to the end of the outer loop. > > With the break replaced by a goto, the two diff_q calls t

Re: [PATCH v2 1/1] git-add--interactive.perl: Add progress counter in the prompt

2019-09-29 Thread Junio C Hamano
"Kunal Tyagi via GitGitGadget" writes: > From: Kunal Tyagi > Subject: Re: [PATCH v2 1/1] git-add--interactive.perl: Add progress counter > in the prompt Either of these two, perhaps (I'd use the former if I were writing this patch): add -i: show progre

Re: [PATCH v3] commit-graph: remove a duplicate assignment

2019-09-29 Thread Junio C Hamano
Alex Henrie writes: > The variable g was being set to the same value both at the beginning of > the function and before the loop. The assignment before the loop was > kept because it helps clarify what the loop does, and the redundant > assignment at the beginning of the function was removed. Wr

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

2019-09-29 Thread Junio C Hamano
CB Bailey writes: > For easier discussion, I've snipped the original patch and replaced with > one with enough context to show the entire function. > > I was reviewing this patch and it appeared to introduce a change in > behaviour. > >> diff --git a/diffcore-break.c b/diffcore-break.c >> index 8

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

2019-09-29 Thread Alex Henrie
On Sun, Sep 29, 2019 at 3:37 AM CB Bailey wrote: > > Previously, if the condition matched in the inner loop, the function > would null out the entry in the queue that that inner loop had reached > (q->queue[j] = NULL) and then break out of the inner loop. This meant > that the outer loop would ski

Re: ProGit2 translation in Azerbaijani

2019-09-29 Thread Alicenab
Hi guys, any updates? On 22.09.19 02:36, Alicenab wrote: Hi there! I have a translated ProGit2 book to Azerbaijan language. As code of country name name for our country(az) have already taken, I have created "aze" version of it. I hope it will be no problem for you. Partial translations availa

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

2019-09-29 Thread Pratyush Yadav
Since this is a git-gui dialog/prompt, why not use the git-gui icon? This will mean some uniformity between all the platforms (though I'm not sure if other platforms even use GIT_ASK_YESNO). It would also probably save you the hacks needed to find out the git-for-windows icon. Well, there is th

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

2019-09-29 Thread Pratyush Yadav
One minor nitpick: please add a comment at the top of the file documenting the `--title` option, and the usage of the program in general. Other than that, looks good. Thanks. On 26/09/19 08:29AM, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > "Question?" is maybe

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

2019-09-29 Thread Pratyush Yadav
What is the difference between SSH_ASKPASS and GIT_ASKPASS? On my first read, I assumed SSH_ASKPASS is replaced by GIT_ASKPASS, but I might be wrong. On 26/09/19 08:29AM, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > Signed-off-by: Johannes Schindelin > --- > gi

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

2019-09-29 Thread Pratyush Yadav
On 26/09/19 08:29AM, Heiko Voigt via GitGitGadget wrote: > 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 questio

Re: [PATCH 2/2] git-gui: support for diff3 conflict style

2019-09-29 Thread Pratyush Yadav
Hi Philip, Bert, Is there any way I can test this change? Philip, I ran the rebase you mention in the GitHub issue [0], and I get that '9c8cba6862abe5ac821' is an unknown revision. Is there any quick way I can reproduce this (maybe on a sample repo)? [0] https://github.com/git-for-windows/git/

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

2019-09-29 Thread CB Bailey
On Sat, Sep 28, 2019 at 06:56:46PM -0600, Alex Henrie wrote: > The condition "if (q->nr <= j)" checks whether the loop exited normally > or via a break statement. This check can be avoided by replacing the > jump to the end of the loop with a jump to the end of the function. > > With the break rep

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

2019-09-29 Thread Junio C Hamano
Eric Wong writes: > 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 being > the first elem

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

2019-09-28 Thread Alex Henrie
On Thu, Sep 26, 2019 at 8:50 PM Jeff King wrote: > > On Thu, Sep 26, 2019 at 10:14:17PM +0200, Johannes Schindelin wrote: > > > However, I think that this patch should at least be accompanied by a > > commit message that suggests that some thought was put into it, and that > > concerns like mine w

Re: What's cooking in git.git (Sep 2019, #01; Sat, 7)

2019-09-28 Thread brian m. carlson
On 2019-09-28 at 23:31:33, Junio C Hamano wrote: > "brian m. carlson" writes: > > > On 2019-09-07 at 17:26:53, Junio C Hamano wrote: > >> * bc/object-id-part17 (2019-08-19) 26 commits > >> ... > >> - builtin/replace: make hash size independent > >> > >> Preparation for SHA-256 upgrade continue

Re: What's cooking in git.git (Sep 2019, #01; Sat, 7)

2019-09-28 Thread Junio C Hamano
"brian m. carlson" writes: > On 2019-09-07 at 17:26:53, Junio C Hamano wrote: >> * bc/object-id-part17 (2019-08-19) 26 commits >> ... >> - builtin/replace: make hash size independent >> >> Preparation for SHA-256 upgrade continues. >> >> Looked mostly OK, with a possible update. >> cf. <201

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

2019-09-28 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > diff --git a/t/test-lib.sh b/t/test-lib.sh > index d1ba33745a..f21c781e68 100644 > --- a/t/test-lib.sh > +++ b/t/test-lib.sh > @@ -695,7 +695,7 @@ test_failure_ () { > say_color error "not ok $test_count - $1" > shift > printf '%s

Re: [PATCH 1/2] Move git_sort(), a stable sort, into into libgit.a

2019-09-28 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > --- > Makefile | 2 +- > compat/mingw.c| 5 - > git-compat-util.h | 4 +++- > compat/qsort.c => qsort.c | 2 +- > 4 files changed, 5 insertions(+), 8 deletions(-) > rename compat/qsort.c => qsort.c (97%)

Re: Bi-Weekly Standup - Time/timezone in calendar?

2019-09-28 Thread Junio C Hamano
Thomas Gummerer writes: >> I thought it was to be 1700 UTC, which currently is 1800 BST her in UK, and >> 1900 CST in Europe. > > That's my recollection as well, and what the calendar should say. > Thanks for flagging this! > > I don't know. I'd be happy to keep it at 17:00 UTC, but that might b

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

2019-09-27 Thread Junio C Hamano
Johannes Schindelin writes: > The only problem is that my patch made it into `next` already, according > to https://github.com/gitgitgadget/git/pull/129 (look for the labels on > the right side, or for the comments on the bottom), and > https://github.com/gitster/git/commit/a3f332f4fb10 agrees (l

Re: [PATCH v3 2/2] t0028: add more tests

2019-09-27 Thread Junio C Hamano
"Alexandr Miloslavskiy via GitGitGadget" writes: > From: Alexandr Miloslavskiy > > After I discovered that UTF-16-LE-BOM test was bugged, I decided that s/bugged/buggy/ perhaps? Usually people do not place hidden listening devices in tests ;-) > better tests are required. Possibly the best op

Re: [RFC PATCH 0/3] grep: don't add subrepos to in-memory alternates

2019-09-27 Thread Matheus Tavares Bernardino
On Sat, Sep 28, 2019 at 12:24 AM Junio C Hamano wrote: > > Matheus Tavares Bernardino writes: > > > Right, this would be the best way of doing it. However, I think this > > is not how it's currently implemented. I if correctly understood the > > code in this call chain: > > > > grep_source_load_d

Re: [PATCH 01/15] t6120-describe: correct test repo history graph in comment

2019-09-27 Thread Junio C Hamano
SZEDER Gábor writes: >> Hmm... >> >> > +# ,---ooo-. >> > +# / D,R e \ >> > +# o--o-o-o---ox >> > +# \B/ >> > +# `---ooo-' >> > +#Ac >> >> What's the first parent of the merge between

Re: Git in Outreachy December 2019?

2019-09-27 Thread Junio C Hamano
Eric Wong writes: > C is fine for unit tests, and maybe we can use more unit tests > and less integration tests. Nicely put. I often find it somewhat disturbing that what some of the t/helper/ tests are trying to exercise is at too low a level that the distance from the real-world observable ef

Re: Git in Outreachy December 2019?

2019-09-27 Thread Junio C Hamano
e-one-file. >> >> Oh, sorry, I did not mean to say that we should do away with this at >> all! Rather, I meant to say that `merge-index` could detect when it was >> asked to run `git-merge-one-file` and re-route to internal code instead >> of spawning a process. If an

Re: [PATCH v2 2/6] midx: add progress to write_midx_file Add progress to write_midx_file. Progress is displayed when the MIDX_PROGRESS flag is set.

2019-09-27 Thread Junio C Hamano
William Baker writes: > On 9/20/19 1:10 PM, Junio C Hamano wrote: >>> diff --git a/midx.c b/midx.c >>> index b2673f52e8..54e4e93b2b 100644 >>> --- a/midx.c >>> +++ b/midx.c >>> @@ -449,6 +449,8 @@ struct pack_list { >>> uint32_t nr; >>> uint32_t alloc; >>> struct multi_pack_index *m;

Re: [PATCH v2 1/6] midx: add MIDX_PROGRESS flag

2019-09-27 Thread Junio C Hamano
SZEDER Gábor writes: > On Fri, Sep 20, 2019 at 09:53:48AM -0700, William Baker via GitGitGadget > wrote: >> diff --git a/midx.h b/midx.h >> index f0ae656b5d..e6fa356b5c 100644 >> --- a/midx.h >> +++ b/midx.h >> @@ -37,6 +37,8 @@ struct multi_pack_index { >> char object_dir[FLEX_ARRAY]; >>

Re: [RFC PATCH 0/3] grep: don't add subrepos to in-memory alternates

2019-09-27 Thread Junio C Hamano
Matheus Tavares Bernardino writes: > Right, this would be the best way of doing it. However, I think this > is not how it's currently implemented. I if correctly understood the > code in this call chain: > > grep_source_load_driver() > userdiff_find_by_path() > > git_check_attr() > collect_some_

Re: Feature request: different exit codes for git stash depending on whether stash was created or not

2019-09-27 Thread brian m. carlson
On 2019-09-27 at 12:55:27, Ian Kemp wrote: > Hi, > > Currently, git stash's exit code is 0 regardless of whether it > performed a stash operation or not. Third parties invoking git stash > are therefore unable to determine whether a stash was actually made or > not. > > It would be helpful if the

Re: Git in Outreachy December 2019?

2019-09-27 Thread Jeff King
On Thu, Sep 26, 2019 at 11:44:48PM +0200, SZEDER Gábor wrote: > All that was over a year and a half ago, and these limitations weren't > a maintenance burden at all so far, and nobody needed that escape > hatch. > > Well, nobody except me, that is :) When I saw back then that t1510 > saves the s

Re: Common thread pool API in Git?

2019-09-27 Thread Jeff King
On Wed, Sep 25, 2019 at 05:33:00PM -0700, Jonathan Tan wrote: > Does anyone have ideas or plans for this? I know that (at least) "grep" > and "index-pack" have their own implementations, and it would be great > to just have one that all code can use. > [..] > Searching reveals [2], but I don't thi

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

2019-09-27 Thread CB Bailey
On 26/09/2019 08:20, Jeff King wrote: > On Tue, Sep 24, 2019 at 04:52:56PM -0700, Emily Shaffer wrote: >> I helped my other FOSS project to adopt a Code of Conduct earlier in >> the year (https://github.com/openbmc/docs/blob/master/code-of-conduct.md) >> and we got around this by asking for volunte

Re: [PATCH 1/2] commit-graph: don't show progress percentages while expanding reachable commits

2019-09-27 Thread Linus Torvalds
I was going to make a bug-report about this funny behavior, but decided to search the list first. Yeah, I smiled at Expanding reachable commits in commit graph: 139276% (870481/625), done. when I did the "git gc --prune=now" on the kernel, and apparently actually looked at the noise for the

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

2019-09-27 Thread Denton Liu
On Fri, Sep 27, 2019 at 04:17:46AM +0200, SZEDER Gábor wrote: > 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

Re: Feature request: different exit codes for git stash depending on whether stash was created or not

2019-09-27 Thread Eric Sunshine
On Fri, Sep 27, 2019 at 8:55 AM Ian Kemp wrote: > Currently, git stash's exit code is 0 regardless of whether it > performed a stash operation or not. Third parties invoking git stash > are therefore unable to determine whether a stash was actually made or > not. > > It would be helpful if there w

Re: RFC: Cryptographic attestation for email-based patch workflows

2019-09-27 Thread dwh
On 10.09.2019 08:13, Konstantin Ryabitsev wrote: # Proposed approach I recommend that we provide a way to include cryptographic signature information natively using git-format-patch, using roughly the following process: - generate a signify-compatible cryptographic signature of the verbatim pa

Re: [PATCH v1 0/5] Use complete_action’s todo list to do the rebase

2019-09-27 Thread Phillip Wood
Hi Alban On 25/09/2019 21:13, Alban Gruin wrote: This can be seen as a continuation of ag/reduce-rewriting-todo. Currently, complete_action() releases its todo list before calling sequencer_continue(), which reloads the todo list from the disk. This series removes this useless round trip. Pat

Re: [PATCH v1 4/5] rebase: fill `squash_onto' in get_replay_opts()

2019-09-27 Thread Phillip Wood
Hi Alban On 25/09/2019 21:13, Alban Gruin wrote: get_replay_opts() did not fill `squash_onto' if possible, meaning that I'm not sure what you mean by 'if possible' here, I think the sentance makes sense without that. this field should be read from the disk by the sequencer through read_pop

Re: [PATCH v1 5/5] sequencer: directly call pick_commits() from complete_action()

2019-09-27 Thread Phillip Wood
Hi Alban Thanks for removing some more unnecessary work reloading the the todo list. On 25/09/2019 21:13, Alban Gruin wrote: Currently, complete_action() calls sequencer_continue() to do the rebase. Even though the former already has the todo list, the latter loads it from the disk and parses

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

2019-09-27 Thread Pratyush Yadav
On 27/09/19 08:10AM, Bert Wesarg wrote: > 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 > >

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

2019-09-27 Thread Derrick Stolee
l e.g. when cherry-picking on > top of a branch that already has your v1. I agree that we need more in the commit messages here. It is helpful to include _why_ you are doing this. Keep in mind that your cover letter is not recorded with the commit at all. Further, when updating a patch series

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

2019-09-27 Thread Johannes Schindelin
Hi, On Thu, 26 Sep 2019, Alex Henrie wrote: > Signed-off-by: Alex Henrie Hrm, the commit message should reflect Stolee's careful consideration, no? An empty commit message won't be helpful e.g. when cherry-picking on top of a branch that already has your v1. Ciao, Johannes > --- > commit-gr

Re: Possible bug in git describe, additional commits differs when cloned with --depth

2019-09-27 Thread SZEDER Gábor
On Fri, Sep 27, 2019 at 11:51:07AM +0200, Anders Janmyr wrote: > Hi, > > I'm not sure if this is a bug or not but `git describe` gives > different results when the repo has been cloned with `--depth` or not. > > In the example below from the git repository the number of additional > commits since

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

2019-09-27 Thread Derrick Stolee
On 9/26/2019 10:45 PM, Jeff King wrote: > 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,

Re: [PATCH v4 5/6] rebase -i: support --ignore-date

2019-09-27 Thread Phillip Wood
Hi Rohit This is an improvement but there are a couple of outstanding issues from the previous round with regard to handing --ignore-date when GIT_COMMITTER_DATE is set. I'll try and look at the rest of the series soon. On 07/09/2019 12:50, Rohit Ashiwal wrote: rebase am already has this fla

Re: [git issue] git am failed for patches of converting the format of source codes from dos to unix

2019-09-27 Thread Thomas Gummerer
On 09/27, Beyondhorizon Zheng wrote: > [git issue] git am failed for patches of converting the file format of > source codes from dos to unix > > Git version: git version 2.23.0 > Host PC: ubuntu 16.04.10 > Reporter: Shuang Zheng > > I have submitted a patch which convert the file format of sourc

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

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
e discussed options, this one is pretty easy to understand. > --- a/t/t0410-partial-clone.sh > +++ b/t/t0410-partial-clone.sh > @@ -429,6 +429,18 @@ test_expect_success 'rev-list dies for missing objects > on cmd line' ' > done > ' > > +test

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
cleaned up first... so I'm afraid it will be with us for a while. > -- snipsnap -- > if test -n "$trace" && test -n "$test_untraceable" > then > # '-x' tracing requested, but this test script can't be reliably > # traced, unless it is r

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

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

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

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

<    5   6   7   8   9   10   11   12   13   14   >