Antw: Re: Surprising semantics of "git add file"

2019-05-06 Thread Ulrich Windl
>>> Andreas Schwab schrieb am 05.05.2019 um 22:31 in Nachricht <87o94gbq46@igel.home>: > On Mai 05 2019, "Ulrich Windl" wrote: > >> After that a "git diff ‑‑cached file" just shows the changes added > interactively, but when I "git add file" to commit those changes), even the > unstaged ch

Re: [PATCH v3 0/6] Create commit-graph file format v2

2019-05-06 Thread Christian Couder
On Fri, May 3, 2019 at 3:44 PM Ævar Arnfjörð Bjarmason wrote: > > > On Fri, May 03 2019, Derrick Stolee wrote: > > > On 5/2/2019 2:02 PM, Ævar Arnfjörð Bjarmason wrote: > >> > >> But those are separate from any back-compat concerns, which is what I > >> think makes sense to focus on now. > > > > T

Re: What's cooking in git.git (Apr 2019, #05; Thu, 25)

2019-05-06 Thread Duy Nguyen
On Thu, Apr 25, 2019 at 8:15 PM Junio C Hamano wrote: > * nd/config-move-to (2019-01-14) 7 commits > - config.h: fix hdr-check warnings > - config: add --move-to > - config: factor out set_config_source_file() > - config: use OPT_FILENAME() > - config.c: add repo_config_set_worktree_gently()

Re: [PATCH] coccicheck: optionally process every source file at once

2019-05-06 Thread Duy Nguyen
On Mon, May 6, 2019 at 12:13 PM Jeff King wrote: > This reduces the time required to run make coccicheck by a significant > amount of time: > > Prior timing of make coccicheck > real6m14.090s > user25m2.606s > sys 1m22.919s > > New timing of make coccicheck > real1m36.580s

Re: [PATCH 0/4] gc docs: modernize and fix the documentation

2019-05-06 Thread Ævar Arnfjörð Bjarmason
On Tue, Mar 19 2019, Jeff King wrote: > On Mon, Mar 18, 2019 at 11:45:39PM +0100, Ævar Arnfjörð Bjarmason wrote: > >> > I don't think the quarantine stuff should impact contention at all. It's >> > only quarantining the objects, which are the least contentious part of >> > Git (because object co

Re: [PATCH v5 0/3] *** SUBJECT HERE ***

2019-05-06 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 29 2019, Denton Liu wrote: >> Subject: [PATCH v5 0/3] *** SUBJECT HERE *** > > I forgot to change the subject... Embarassing. Do you use git-send-email with --force? We should detect & stop these being sent out otherwise. See a03bc5b6ad ("send-email: Refuse to send cover-letter temp

Re: [PATCH v3 0/6] Create commit-graph file format v2

2019-05-06 Thread Derrick Stolee
On 5/6/2019 4:27 AM, Christian Couder wrote: > On Fri, May 3, 2019 at 3:44 PM Ævar Arnfjörð Bjarmason > wrote: >> 1) We can stat() the "commit-graphs" directory to see if there's any >>new/deleted ones (dir mtime changed), similar to what we do for the >>untracked cache, and can (but I do

GIT/SSH_ASKPASS used for username input in https:// URLs

2019-05-06 Thread Andreas Krey
Hi everyone, there is an interesting wart around prompt.c - PROMPT_ECHO isn't used in invoking an external helper program. Thus, if I clone something on https (which requires auth for that), and have SSH_ASKPASS set, I will get two GUI *password* prompts, even though the first one will indicate i

Re: [PATCH v3] git-gui: Handle Ctrl + BS/Del in the commit msg

2019-05-06 Thread Ismael Luceno
On 08/Apr/2019 12:54, Ismael Luceno Cortes wrote: > - Control+BackSpace: Delete word to the left of the cursor. > - Control+Delete : Delete word to the right of the cursor. > > Originally introduced by BRIEF and Turbo Vision between 1985 and 1992, > they were adopted by most CUA-Compliant UIs, i

Re: [PATCH v5 0/3] *** SUBJECT HERE ***

2019-05-06 Thread Denton Liu
On Mon, May 06, 2019 at 01:03:54PM +0200, Ævar Arnfjörð Bjarmason wrote: > > On Mon, Apr 29 2019, Denton Liu wrote: > > >> Subject: [PATCH v5 0/3] *** SUBJECT HERE *** > > > > I forgot to change the subject... Embarassing. > > Do you use git-send-email with --force? We should detect & stop these

Re: Merge commit diff results are confusing and inconsistent

2019-05-06 Thread Robert Dailey
I feel like you got hung up too much on exact wording of what I was trying to describe. I do apologize I don't have the background to explain things 100% accurately, especially at a low level. My explanations are mostly intended to be as a user, based on what is observable, and based on intent. I'l

Re: Merge commit diff results are confusing and inconsistent

2019-05-06 Thread Eckhard Maaß
On Mon, May 06, 2019 at 10:38:12AM -0500, Robert Dailey wrote: > I feel like you got hung up too much on exact wording of what I was > trying to describe. I do apologize I don't have the background to > explain things 100% accurately, especially at a low level. My > explanations are mostly intended

Re: Proposal: object negotiation for partial clones

2019-05-06 Thread Jonathan Nieder
Hi, Matthew DeVore wrote: > I'm considering implementing a feature in the Git protocol which would > enable efficient and accurate object negotiation when the client is a > partial clone. I'd like to refine and get some validation of my > approach before I start to write any code, so I've written

.git/config validations by (for silly errors) by git fsck

2019-05-06 Thread Palauzov, Dilyan
Hello, I added manually a remote to .git/config, but updated only the url= line, forgetting to update the fetch= line. So two remotes had fetch = +refs/heads/*:refs/remotes/origin/* and fetching from the one or the other has overwritten origin/master. git fsck has not helped. Please introd

HELLO MY DEAR PLS RPLY ME THROUGH MY EMAIL, I HAVE SOME THING TO DISCUSSED WITH YOU

2019-05-06 Thread michelledjohnson
-- jmichell...@gmail.com

[PATCH] perf-lib.sh: make "./run " use the correct gits

2019-05-06 Thread Ævar Arnfjörð Bjarmason
Fix a really bad regression in 0baf78e7bc ("perf-lib.sh: rely on test-lib.sh for --tee handling", 2019-03-15). Since that change all runs of different of git have used the git found in the user's $PATH, e.g. /usr/bin/git instead of the we just built and wanted to performance test. The problem st

Re: jt/fetch-cdn-offload (was What's cooking in git.git (Apr 2019, #04; Mon, 22))

2019-05-06 Thread Jonathan Tan
> There has been no answer to my comments in: > > https://public-inbox.org/git/CAP8UFD3SWNu=btPxV2vV=neyrofbgkpzz_wlvsjbv6bkjro...@mail.gmail.com/ > > especially the part related to the "-o avoid-cdn=badcdn.example.com" > example that Jonathan Nieder gave. It seems to me that if you use a server

Re: Proposal: object negotiation for partial clones

2019-05-06 Thread Jonathan Tan
> I'm considering implementing a feature in the Git protocol which would > enable efficient and accurate object negotiation when the client is a > partial clone. I'd like to refine and get some validation of my > approach before I start to write any code, so I've written a proposal > for anyone int

Re: Proposal: object negotiation for partial clones

2019-05-06 Thread Jonathan Nieder
Hi, Jonathan Tan wrote: > Matthew DeVore wrote: >> I'm considering implementing a feature in the Git protocol which would >> enable efficient and accurate object negotiation when the client is a >> partial clone. I'd like to refine and get some validation of my >> approach before I start to write

Re: [PATCH] perf-lib.sh: make "./run " use the correct gits

2019-05-06 Thread Jeff King
On Mon, May 06, 2019 at 09:16:11PM +0200, Ævar Arnfjörð Bjarmason wrote: > Perhaps there's some better way to fix this, but it seems to me that > the best solution is to just make this behavior less magical. We know > in run_dirs_helper() that we're about to run performance tests on a > given , so

Re: [RFE] Allow for "interactive"-like actions in non-interactive rebase

2019-05-06 Thread Emily Shaffer
Hi, On Fri, May 03, 2019 at 06:04:15PM +0300, Konstantin Kharlamov wrote: > Interactive rebase (i.e. for example "git rebase -i HEAD~10") is used most > often to apply an action to a single commit, e.g. "rename", "edit", "fixup", > etc… > > As result, people keep coming up with custom scripts and

[PATCH] commit-graph: fix memory leak

2019-05-06 Thread Josh Steadmon
Free the commit graph when verify_commit_graph_lite() reports an error. Credit to OSS-Fuzz for finding this leak. Signed-off-by: Josh Steadmon --- commit-graph.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/commit-graph.c b/commit-graph.c index 66865acbd7..4bce70d35c 10

Re: [PATCH] commit-graph: fix memory leak

2019-05-06 Thread Emily Shaffer
Hi, This change looks good to me, and like good evidence for the benefits of automated tooling :) Thanks! - Emily On Mon, May 06, 2019 at 02:36:58PM -0700, Josh Steadmon wrote: > Free the commit graph when verify_commit_graph_lite() reports an error. > Credit to OSS-Fuzz for finding this leak.

Re: [RFE] Allow for "interactive"-like actions in non-interactive rebase

2019-05-06 Thread Eric Sunshine
On Mon, May 6, 2019 at 4:30 PM Emily Shaffer wrote: > On Fri, May 03, 2019 at 06:04:15PM +0300, Konstantin Kharlamov wrote: > > Interactive rebase (i.e. for example "git rebase -i HEAD~10") is used most > > often to apply an action to a single commit, e.g. "rename", "edit", "fixup", > > etc… > > >

Re: [PATCH v4] documentation: add tutorial for first contribution

2019-05-06 Thread Jonathan Tan
Sorry for not looking at this sooner. Firstly, I'm not sure if this file should be named without the ".txt", like SubmittingPatches. As for my other comments below, the Makefile comment below is the only one I feel strongly about; feel free to disagree with the rest (which I think are subjective

Re: Proposal: object negotiation for partial clones

2019-05-06 Thread Matthew DeVore
On Mon, May 6, 2019 at 12:28 PM Jonathan Tan wrote: > > > I'm considering implementing a feature in the Git protocol which would > > enable efficient and accurate object negotiation when the client is a > > partial clone. I'd like to refine and get some validation of my > > approach before I start

[PATCH v2 0/2] perf-lib.sh: fix 0baf78e7bc regression, refactor & fix bugs

2019-05-06 Thread Ævar Arnfjörð Bjarmason
On Mon, May 06 2019, Jeff King wrote: > On Mon, May 06, 2019 at 09:16:11PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> Perhaps there's some better way to fix this, but it seems to me that >> the best solution is to just make this behavior less magical. We know >> in run_dirs_helper() that we're abo

[PATCH v2 1/2] perf-lib.sh: make "./run " use the correct gits

2019-05-06 Thread Ævar Arnfjörð Bjarmason
Fix a really bad regression in 0baf78e7bc ("perf-lib.sh: rely on test-lib.sh for --tee handling", 2019-03-15). Since that change all runs of different of git have used the git found in the user's $PATH, e.g. /usr/bin/git instead of the we just built and wanted to performance test. The problem st

[PATCH v2 2/2] perf-lib.sh: remove GIT_TEST_INSTALLED from perf-lib.sh

2019-05-06 Thread Ævar Arnfjörð Bjarmason
Follow-up my preceding change which fixed the immediate "./run " regression in 0baf78e7bc ("perf-lib.sh: rely on test-lib.sh for --tee handling", 2019-03-15) and entirely get rid of GIT_TEST_INSTALLED from perf-lib.sh (and aggregate.perl). As noted in that change the dance we're doing with GIT_TES

Re: .git/config validations by (for silly errors) by git fsck

2019-05-06 Thread Ævar Arnfjörð Bjarmason
On Mon, May 06 2019, Palauzov, Dilyan wrote: > I added manually a remote to .git/config, but updated only the url= line, > forgetting to update the fetch= line. So two > remotes had > fetch = +refs/heads/*:refs/remotes/origin/* > > and fetching from the one or the other has overwritten origi

Re: Proposal: object negotiation for partial clones

2019-05-06 Thread Matthew DeVore
> On 2019/05/06, at 12:46, Jonathan Nieder wrote: > > Hi, > > Jonathan Tan wrote: >> Matthew DeVore wrote: > >>> I'm considering implementing a feature in the Git protocol which would >>> enable efficient and accurate object negotiation when the client is a >>> partial clone. I'd like to ref

[PATCH] coccicheck: optionally batch spatch invocations

2019-05-06 Thread Jeff King
On Mon, May 06, 2019 at 04:34:09PM +0700, Duy Nguyen wrote: > > However, it comes at a cost. The RSS of each spatch process goes from > > ~50MB to ~1500MB (and peak memory usage may be even higher if make runs > > 1.5G should be fine. Trying... > > Even with no -j, my htop's RES column goes up 6

Re: Merge commit diff results are confusing and inconsistent

2019-05-06 Thread Ævar Arnfjörð Bjarmason
On Mon, May 06 2019, Robert Dailey wrote: > I feel like you got hung up too much on exact wording of what I was > trying to describe. I do apologize I don't have the background to > explain things 100% accurately, especially at a low level. My > explanations are mostly intended to be as a user,

Re: Proposal: object negotiation for partial clones

2019-05-06 Thread Jonathan Nieder
Matthew DeVore wrote: > On 2019/05/06, at 12:46, Jonathan Nieder wrote: >> Ah, interesting. When this was discussed before, the proposal has been >> that the client can say "have" anyway. They don't have the commit and >> all referenced objects, but they have the commit and a *promise* that >>

Re: [RFE] Allow for "interactive"-like actions in non-interactive rebase

2019-05-06 Thread Konstantin Kharlamov
On Пн, May 6, 2019 at 18:25, Eric Sunshine wrote: On Mon, May 6, 2019 at 4:30 PM Emily Shaffer wrote: On Fri, May 03, 2019 at 06:04:15PM +0300, Konstantin Kharlamov wrote: > Interactive rebase (i.e. for example "git rebase -i HEAD~10") is used most > often to apply an action to a singl

Re: [PATCH v5 00/11] trace2: load trace2 settings from system config

2019-05-06 Thread Junio C Hamano
Jeff Hostetler writes: > I forgot to update the cover letter for V5. > V5 adds a commit to fix the permission problem in /etc/gitconfig > reported by SZEDER. > > This commit could/should be squashed into commit 5 if wanted. > I left it on top for review purposes. I think v4 has been in 'next' fo

Re: [PATCH] coccicheck: optionally batch spatch invocations

2019-05-06 Thread Jacob Keller
On Mon, May 6, 2019 at 4:43 PM Jeff King wrote: > > On Mon, May 06, 2019 at 04:34:09PM +0700, Duy Nguyen wrote: > > > > However, it comes at a cost. The RSS of each spatch process goes from > > > ~50MB to ~1500MB (and peak memory usage may be even higher if make runs > > > > 1.5G should be fine. T

Re: [PATCH] commit-graph: fix memory leak

2019-05-06 Thread Derrick Stolee
On 5/6/2019 5:58 PM, Emily Shaffer wrote: > Hi, > > This change looks good to me, and like good evidence for the benefits of > automated tooling :) Same here! Keep up the great work here. -Stolee

Re: [PATCH] coccicheck: optionally batch spatch invocations

2019-05-06 Thread Jeff King
On Mon, May 06, 2019 at 06:41:03PM -0700, Jacob Keller wrote: > > So here's what I think we should apply: > > > > -- >8 -- > > Subject: [PATCH] coccicheck: optionally batch spatch invocations > [...] > > This looks reasonable to me :) Thanks. I should have added a: Based-on-a-patch-by: Jacob

Re: [PATCH v3 00/16] Add new command 'restore'

2019-05-06 Thread Emily Shaffer
Hiya, On Thu, Apr 25, 2019 at 04:45:44PM +0700, Nguyễn Thái Ngọc Duy wrote: > v3 changes are really small > > - gitcli.txt is updated to mention the --staged/--worktree pair, in > comparison to --cached/--index which is also mention there. > > - The patch 'rm --staged' is dropped. It could com

Re: What's cooking in git.git (Apr 2019, #05; Thu, 25)

2019-05-06 Thread Junio C Hamano
Duy Nguyen writes: > On Thu, Apr 25, 2019 at 8:15 PM Junio C Hamano wrote: >> * nd/config-move-to (2019-01-14) 7 commits >> - config.h: fix hdr-check warnings >> - config: add --move-to >> - config: factor out set_config_source_file() >> - config: use OPT_FILENAME() >> - config.c: add repo_

Re: [PATCH] coccicheck: optionally batch spatch invocations

2019-05-06 Thread Junio C Hamano
Jeff King writes: > The implementation is done with xargs, which should be widely available; > it's in POSIX, we rely on it already in the test suite. And "coccicheck" > is really a developer-only tool anyway, so it's not a big deal if > obscure systems can't run it. OK. > I left the default at

Re: [PATCH] coccicheck: optionally batch spatch invocations

2019-05-06 Thread Jeff King
On Tue, May 07, 2019 at 11:42:28AM +0900, Junio C Hamano wrote: > > Making "0" work as "unlimited" might be nice, but xargs doesn't support > > that and I didn't want to make the recipe any more unreadable than it > > already is. > > Sounds good. After reading the log message, I was curious if t

Re: [PATCH] coccicheck: optionally batch spatch invocations

2019-05-06 Thread Jacob Keller
On Mon, May 6, 2019 at 7:55 PM Jeff King wrote: > Here's what a patch might look like to implement "0". By still using > xargs in the unlimited code path, it's not too bad. I dunno. > > --- > diff --git a/Makefile b/Makefile > index daba958b8f..0765a59b7a 100644 > --- a/Makefile > +++ b/Makefile >

Re: [PATCH v2] parse-options: don't emit "ambiguous option" for aliases

2019-05-06 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > But due to the way the options parsing machinery works this resulted > in the rather absurd situation of: > > $ git clone --recurs [...] > error: ambiguous option: recurs (could be --recursive or > --recurse-submodules) > > Add OPT_ALIAS() to express this

Re: [PATCH v2 1/1] diff-highlight: Use correct /dev/null for UNIX and Windows

2019-05-06 Thread Chris Webster
I know these can take some time but is this pending any update from me? The accepted changes will be merged back into the diff-so-fancy project. There was a question about other uses of /dev/null. In the contrib directory, there are a couple of uses. contrib/buildsystems/engine.pl - not clear i

Re: Request to add option to interactive rebase to preserve latest commit date

2019-05-06 Thread Junio C Hamano
Peter Krefting writes: > Junio C Hamano: > >>> Using interactive rebase has one flaw IMHO and that is the way it >>> handles dating its commit. Can you add an option to interactive rebase >>> that would make it use the date from the commit that is most recent >>> and not the date from the commit

Re: [PATCH 2/2] format-patch: teach format.notes config option

2019-05-06 Thread Junio C Hamano
Denton Liu writes: > In git-format-patch, notes can be appended with the `--notes` option. > However, this must be specified by the user on an > invocation-by-invocation basis. If a user is not careful, it's possible > that they may forget to include it and generate a patch series without > notes

Re: [PATCH 2/2] format-patch: Make --base patch-id output stable

2019-05-06 Thread Junio C Hamano
Stephen Boyd writes: > I wonder if we need to make some other sort of form of > "prerequisite-patch-id:" here and let that be a legacy form of the > patch-id so that users know that they have a fixed version of this code? > Maybe "prerequisite-stable-patch-id:"? Or we don't have to care because >

Re: [PATCH v3 00/16] Add new command 'restore'

2019-05-06 Thread Junio C Hamano
Emily Shaffer writes: > Then, figuring that I only had a few files, I thought I'd type them > each, with the exception of a .c/.h pair: > > g restore --staged builtin/log.c builtin/walken.c revision.* > > Because I had build artifacts present, this vomited while trying to > unstage revision.o, an

Re: [PATCH] coccicheck: optionally batch spatch invocations

2019-05-06 Thread Junio C Hamano
Jeff King writes: > Yes, 2^31-1 is probably a better number, but it's harder to write out. :) > > Here's what a patch might look like to implement "0". By still using > xargs in the unlimited code path, it's not too bad. I dunno. As somebody who is too used to run "diff -U999" and be happy, I

Re: Request to add option to interactive rebase to preserve latest commit date

2019-05-06 Thread Peter Krefting
Junio C Hamano: as merely a different way to do the following: $ git commit -m A $ edit $ edit further ;# working tree has an equivalent of C $ git commit --amend -a Indeed. My last command in the chain is usually git commit --amend --date=now to set the co