Re: Syncing HEAD

2018-08-16 Thread Jeff King
On Wed, Aug 15, 2018 at 07:49:25AM +0200, Christian Couder wrote: > > And so here the convention is simpler, because we're talking about the > > main HEAD. But we still have know if you want to do that, and not update > > some refs/remotes/ symref in a bare repo. > > We could maybe look at the

Re: git-clone removes destination path after permission deny

2018-08-16 Thread Jonathan Nieder
Hi, Agis wrote: > On 16 Aug 2018, at 15:08, Agis wrote: >>$ mkdir foo >>$ git clone g...@github.com:agis/private.git foo >>Cloning into 'foo'... >>Permission denied (publickey). >>fatal: Could not read from remote repository. [...] >>$ ls foo >>ls: cannot access

Re: Git Project Leadership Committee

2018-08-16 Thread Junio C Hamano
Jeff King writes: > Here are _my_ opinions on how we should fill the role > ... > So here are the nominations I came up with. If you'd like to nominate > somebody else (or yourself!), please do. If you have opinions, let me > know (public or private, as you prefer). > > - Christian Couder >

Git Project Leadership Committee

2018-08-16 Thread Jeff King
This is a followup to the issue I raised back in March[1], which is that our project committee at Software Freedom Conservancy has two members, but is required by the charter to have at least three. There wasn't any substantive discussion in response to that email or at the contributor summit. I

Re: [PATCH] t5310-pack-bitmaps: fix bogus 'pack-objects to file can use bitmap' test

2018-08-16 Thread Junio C Hamano
Andrei Rybak writes: > On 14/08/18 13:47, SZEDER Gábor wrote: >> ... both >> invocations produce empty 'pack{a,b}.objects' files, and the >> subsequent 'test_cmp' happily finds those two empty files identical. > > Is test_cmp ever used for empty files? Would it make sense for > test_cmp to issue

Re: [PATCH] config.txt: clarify core.checkStat = minimal

2018-08-16 Thread Junio C Hamano
Duy Nguyen writes: > On Thu, Aug 16, 2018 at 7:01 PM Junio C Hamano wrote: >> >> Nguyễn Thái Ngọc Duy writes: >> >> > The description of this key does not really tell what 'minimal' mode >> > checks exactly. More information about this mode can be found in the >> > commit message of

Re: non-smooth progress indication for git fsck and git gc

2018-08-16 Thread Junio C Hamano
Jeff King writes: > On Thu, Aug 16, 2018 at 11:57:14AM -0400, Jeff King wrote: > >> The only way to solve that is to count bytes. We don't have a total byte >> count in most cases, and it wouldn't always make sense (e.g., the >> "Compressing objects" meter can show the same issue, but it's not

Dear intended recipient

2018-08-16 Thread Malik Sanfo
-- Good-Day!, Can you assist me to handle this transaction? I will forward you the full details about the transaction if you are ready. Yours faithfully Mr. Malik Sanfo --

Re: [GSoC] [PATCH v6 3/3] builtin/rebase: support running "git rebase "

2018-08-16 Thread Junio C Hamano
Now, there is a parallel "rebase-i-in-c" effort going on, and of course, setting various shell various and formulating a command line that essentially does . git-rebase--$backend of course stops working. > +static int run_specific_rebase(struct rebase_options *opts) > +{ > + const

Re: [GSoC][PATCH v7 00/26] Convert "git stash" to C builtin

2018-08-16 Thread Paul Sebastian Ungureanu
Hi, On Thu, Aug 16, 2018 at 1:25 AM, Thomas Gummerer wrote: > On 08/08, Paul-Sebastian Ungureanu wrote: >> Hello, >> >> Here is the whole `git stash` C version. Some of the previous >> patches were already reviewed (up to and including "stash: convert >> store to builtin"), but there are some

Re: non-smooth progress indication for git fsck and git gc

2018-08-16 Thread Jeff King
On Thu, Aug 16, 2018 at 04:55:56PM -0400, Jeff King wrote: > > * We spend the majority of the ~30s on this: > > > > https://github.com/git/git/blob/63749b2dea5d1501ff85bab7b8a7f64911d21dea/pack-check.c#L70-L79 > > This is hashing the actual packfile. This is potentially quite long, >

Re: non-smooth progress indication for git fsck and git gc

2018-08-16 Thread Jeff King
On Thu, Aug 16, 2018 at 10:35:53PM +0200, Ævar Arnfjörð Bjarmason wrote: > This is all interesting, but I think unrelated to what Ulrich is talking > about. Quote: > > Between the two phases of "git fsck" (checking directories and > checking objects) there was a break of several seconds

Re: [PATCH] t5310-pack-bitmaps: fix bogus 'pack-objects to file can use bitmap' test

2018-08-16 Thread Andrei Rybak
On 14/08/18 13:47, SZEDER Gábor wrote: > ... both > invocations produce empty 'pack{a,b}.objects' files, and the > subsequent 'test_cmp' happily finds those two empty files identical. Is test_cmp ever used for empty files? Would it make sense for test_cmp to issue warning when an empty file is

Re: [PATCH v2] worktree: add --quiet option

2018-08-16 Thread Junio C Hamano
Junio C Hamano writes: > Elia Pinto writes: > >> diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh >> index be6e09314..658647d83 100755 >> --- a/t/t2025-worktree-add.sh >> +++ b/t/t2025-worktree-add.sh >> @@ -252,6 +252,11 @@ test_expect_success 'add -B' ' >> test_cmp_rev

Re: [PATCH v2] worktree: add --quiet option

2018-08-16 Thread Junio C Hamano
Elia Pinto writes: > diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh > index be6e09314..658647d83 100755 > --- a/t/t2025-worktree-add.sh > +++ b/t/t2025-worktree-add.sh > @@ -252,6 +252,11 @@ test_expect_success 'add -B' ' > test_cmp_rev master^ poodle > ' > >

Re: non-smooth progress indication for git fsck and git gc

2018-08-16 Thread Ævar Arnfjörð Bjarmason
On Thu, Aug 16 2018, Jeff King wrote: > On Thu, Aug 16, 2018 at 08:54:25AM +0200, Ulrich Windl wrote: > >> I'd like to point out some minor issue observed while processing some >> 5-object repository with many binary objects, but most are rather >> small: >> >> Between the two phases of

Re: non-smooth progress indication for git fsck and git gc

2018-08-16 Thread Jeff King
On Thu, Aug 16, 2018 at 11:57:14AM -0400, Jeff King wrote: > The only way to solve that is to count bytes. We don't have a total byte > count in most cases, and it wouldn't always make sense (e.g., the > "Compressing objects" meter can show the same issue, but it's not really > putting through

Re: [PATCH 0/7] speeding up cat-file by reordering object access

2018-08-16 Thread Jeff King
On Thu, Aug 16, 2018 at 11:52:13AM -0700, Junio C Hamano wrote: > Jeff King writes: > > > I think that makes sense. We already see duplicates from > > for_each_packed_object() when they're in multiple packs, and callers > > just need to be ready to deal with it (and depending on what you're > >

Re: [PATCH/RFC] commit: add short option for --amend

2018-08-16 Thread Duy Nguyen
On Thu, Aug 16, 2018 at 8:39 PM Jeff King wrote: > > On Thu, Aug 16, 2018 at 08:31:17PM +0200, Nguyễn Thái Ngọc Duy wrote: > > > I just realized how often I type "git ci --amend". Looking back at my > > ~/.bash_history (only 10k lines) this is the second most often git > > command I type which

Re: [PATCH 0/7] speeding up cat-file by reordering object access

2018-08-16 Thread Junio C Hamano
Jeff King writes: > I think that makes sense. We already see duplicates from > for_each_packed_object() when they're in multiple packs, and callers > just need to be ready to deal with it (and depending on what you're > doing, you may actually _want_ the duplicates). You of course would also

Re: submodules : switching to an older commit/Tag in project with submodules

2018-08-16 Thread Ævar Arnfjörð Bjarmason
On Thu, Aug 16 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> On Thu, Aug 16, 2018 at 12:54 PM, Shani Fridman >> wrote: >>> >>> Hi everybody, >>> >>> I've got a question regarding submodules - >>> >>> I'm working on a git project with submodules connected to it, and

Re: [PATCH/RFC] commit: add short option for --amend

2018-08-16 Thread Jeff King
On Thu, Aug 16, 2018 at 08:31:17PM +0200, Nguyễn Thái Ngọc Duy wrote: > I just realized how often I type "git ci --amend". Looking back at my > ~/.bash_history (only 10k lines) this is the second most often git > command I type which may justify a short option for it (assuming that > other people

Re: [PATCH v3] checkout: optimize "git checkout -b "

2018-08-16 Thread Duy Nguyen
On Thu, Aug 16, 2018 at 8:27 PM Ben Peart wrote: > > From: Ben Peart > > Skip merging the commit, updating the index and working directory if and > only if we are creating a new branch via "git checkout -b ." > Any other checkout options will still go through the former code path. > > If

[PATCH/RFC] commit: add short option for --amend

2018-08-16 Thread Nguyễn Thái Ngọc Duy
I just realized how often I type "git ci --amend". Looking back at my ~/.bash_history (only 10k lines) this is the second most often git command I type which may justify a short option for it (assuming that other people use this option often too, of course). The short option space for 'git

[PATCH v3] checkout: optimize "git checkout -b "

2018-08-16 Thread Ben Peart
From: Ben Peart Skip merging the commit, updating the index and working directory if and only if we are creating a new branch via "git checkout -b ." Any other checkout options will still go through the former code path. If sparse_checkout is on, require the user to manually opt in to this

[PATCH] submodule: add config for where gitdirs are located

2018-08-16 Thread Brandon Williams
Introduce the config "submodule..gitdirpath" which is used to indicate where a submodule's gitdir is located inside of a repository's "modules" directory. Signed-off-by: Brandon Williams --- Maybe something like this on top? Do you think we should disallow "../" in this config, even though it

Re: [PATCH] config.txt: clarify core.checkStat = minimal

2018-08-16 Thread Duy Nguyen
On Thu, Aug 16, 2018 at 7:01 PM Junio C Hamano wrote: > > Nguyễn Thái Ngọc Duy writes: > > > The description of this key does not really tell what 'minimal' mode > > checks exactly. More information about this mode can be found in the > > commit message of c08e4d5b5c (Enable minimal stat

Re: submodules : switching to an older commit/Tag in project with submodules

2018-08-16 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > On Thu, Aug 16, 2018 at 12:54 PM, Shani Fridman > wrote: >> >> Hi everybody, >> >> I've got a question regarding submodules - >> >> I'm working on a git project with submodules connected to it, and pulling >> changes from them every month (more or less). >>

Re: [PATCH] branch: support configuring --sort via .gitconfig

2018-08-16 Thread Junio C Hamano
samuel.maft...@gmail.com writes: > From: Samuel Maftoul > > Add support for configuring default sort ordering for git branches. Command > line option will override this configured value, using the exact same > syntax. Using the exact same syntax as ...? > Signed-off-by: Samuel Maftoul > --- >

Re: submodules : switching to an older commit/Tag in project with submodules

2018-08-16 Thread Ævar Arnfjörð Bjarmason
On Thu, Aug 16, 2018 at 12:54 PM, Shani Fridman wrote: > > Hi everybody, > > I've got a question regarding submodules - > > I'm working on a git project with submodules connected to it, and pulling > changes from them every month (more or less). > Sometimes I need to checkout older versions of

Re: [PATCH v5 5/7] t: add t5319-delta-islands.sh

2018-08-16 Thread Junio C Hamano
Christian Couder writes: > From: Jeff King > > Signed-off-by: Jeff King > Signed-off-by: Christian Couder > --- > t/t5319-delta-islands.sh | 143 +++ > 1 file changed, 143 insertions(+) > create mode 100755 t/t5319-delta-islands.sh I should have told you

Re: [PATCHv4 0/6] Add missing includes and forward declares

2018-08-16 Thread Jeff King
On Thu, Aug 16, 2018 at 01:19:17AM +0100, Ramsay Jones wrote: > As a quick ("just before bedtime") exercise, I tried adding > a Makefile target to perform a similar check. The result is > given below, but I haven't had time to look too closely at > the results: The resulting patch doesn't look

Re: [PATCH 0/7] speeding up cat-file by reordering object access

2018-08-16 Thread Jeff King
On Wed, Aug 15, 2018 at 10:05:04AM -0400, Derrick Stolee wrote: > One thing that I realized while reading it is that the multi-pack-index is > not integrated into the for_each_packed_object method. I was already going > to work on some cleanups in that area [1][2]. > > When using the new flag

Re: [PATCH 3/7] submodule: is_submodule_active to differentiate between new and old mode

2018-08-16 Thread Junio C Hamano
Stefan Beller writes: > The change a086f921a72 (submodule: decouple url and submodule interest, > 2017-03-17) enables us to do more than originally thought. > As the url setting was used both to actually set the url where to > obtain the submodule from, as well as used as a boolean flag later >

Re: [PATCH 4/7] for_each_packed_object: support iterating in pack-order

2018-08-16 Thread Jeff King
On Wed, Aug 15, 2018 at 09:28:44AM -0400, Derrick Stolee wrote: > On 8/10/2018 7:15 PM, Jeff King wrote: > > diff --git a/commit-graph.c b/commit-graph.c > > index b0a55ad128..69a0d1c203 100644 > > --- a/commit-graph.c > > +++ b/commit-graph.c > > @@ -730,7 +730,7 @@ void write_commit_graph(const

Re: [PATCH 2/2] submodule: munge paths to submodule git directories

2018-08-16 Thread Brandon Williams
On 08/15, Jonathan Nieder wrote: > Stefan Beller wrote: > > Jonathan Nieder wrote: > > >> All at the cost of recording a little configuration somewhere. If we > >> want to decrease the configuration, we can avoid recording it there in > >> the easy cases (e.g. when name == gitdirname). That's

Re: "less -F" is broken

2018-08-16 Thread Linus Torvalds
On Thu, Aug 16, 2018 at 9:50 AM Mark Nudelman wrote: > > So I'm not sure what the best solution is. Linus's proposal to disable > the line counting stuff if -X is set seems reasonable. I will look into > that and see if there are any issues with it. One option that I didn't try to go for -

Re: [PATCH 1/7] t7410: update to new style

2018-08-16 Thread Junio C Hamano
Stefan Beller writes: > While at it fix a typo (s/independed/independent) and > make sure git is not in a chain of pipes. > > Signed-off-by: Stefan Beller > --- > t/t7410-submodule-checkout-to.sh | 99 +++- > 1 file changed, 58 insertions(+), 41 deletions(-) Makes

Re: [PATCH] config.txt: clarify core.checkStat = minimal

2018-08-16 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > The description of this key does not really tell what 'minimal' mode > checks exactly. More information about this mode can be found in the > commit message of c08e4d5b5c (Enable minimal stat checking - > 2013-01-22). > While I agree that we need to do

Re: [PATCH v2] cherry-pick: fix --quit not deleting CHERRY_PICK_HEAD

2018-08-16 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > --quit is supposed to be --abort but without restoring HEAD. Leaving > CHERRY_PICK_HEAD behind could make other commands mistake that > cherry-pick is still ongoing (e.g. "git commit --amend" will refuse to > work). Clean it too. > > For --abort, this job of

Re: "less -F" is broken

2018-08-16 Thread Mark Nudelman
-X is a workaround for the previous behavior of -F, but it's not a great solution. By not sending the terminal init sequence, some things can be broken, depending on the terminal. For example, some terminals send the "wrong" sequences for the arrow keys when the terminal doesn't receive the

Re: [PATCH v4] clone: report duplicate entries on case-insensitive filesystems

2018-08-16 Thread Junio C Hamano
Torsten Bögershausen writes: > check_stat is 0 on Windows, and inum is allways 0 in lstat(). > I was thinking about systems which don't have inodes and inum, > and then generate an inum in memory, sometimes random. > After a reboot or a re-mount of the file systems those ino values > change. >

Re: [PATCHv4 0/6] Add missing includes and forward declares

2018-08-16 Thread Junio C Hamano
Ramsay Jones writes: > BTW, I happen to be on the 'pu' branch. > > I think some of the errors are due to missing compiler flags > (-I, -D, etc); which flags did you pass to the compiler? > > Well, it killed 15min. before bed! ;-) > > ATB, > Ramsay Jones It certainly does look fun. I anticipate

[PATCH v2] cherry-pick: fix --quit not deleting CHERRY_PICK_HEAD

2018-08-16 Thread Nguyễn Thái Ngọc Duy
--quit is supposed to be --abort but without restoring HEAD. Leaving CHERRY_PICK_HEAD behind could make other commands mistake that cherry-pick is still ongoing (e.g. "git commit --amend" will refuse to work). Clean it too. For --abort, this job of deleting CHERRY_PICK_HEAD is on "git reset" so

Re: non-smooth progress indication for git fsck and git gc

2018-08-16 Thread Jeff King
On Thu, Aug 16, 2018 at 05:18:51PM +0200, Duy Nguyen wrote: > > During "git gc" the writing objects phase did not update for some > > seconds, but then the percentage counter jumped like from 15% to > > 42%. > [...] > > Is it possible to make this repository public? You can also use "git >

Re: [PATCH 2/2] rebase -i: fix SIGSEGV when 'merge ' fails

2018-08-16 Thread Junio C Hamano
Phillip Wood writes: > This commit implements a minimal fix which fixes the crash and allows > the user to successfully commit a conflict resolution with 'git rebase > --continue'. It does not write .git/rebase-merge/patch, > .git/rebase-merge/stopped-sha or update REBASE_HEAD. I think that

[PATCH] config.txt: clarify core.checkStat = minimal

2018-08-16 Thread Nguyễn Thái Ngọc Duy
The description of this key does not really tell what 'minimal' mode checks exactly. More information about this mode can be found in the commit message of c08e4d5b5c (Enable minimal stat checking - 2013-01-22). Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 2 ++ 1 file

Re: non-smooth progress indication for git fsck and git gc

2018-08-16 Thread Jeff King
On Thu, Aug 16, 2018 at 08:54:25AM +0200, Ulrich Windl wrote: > I'd like to point out some minor issue observed while processing some > 5-object repository with many binary objects, but most are rather > small: > > Between the two phases of "git fsck" (checking directories and > checking

Re: [PATCH] completion: include PARSE_OPT_HIDDEN in completion output

2018-08-16 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > However, manually going over: > > git grep -e OPT_HIDDEN_BOOL -e PARSE_OPT_HIDDEN > > Shows many options we don't want to show in completion either, > e.g. "git am --binary" or "git branch -l". Many of these are internal, > deprecated, or no-ops. There's

Re: [RFC PATCH 0/7] Unset the submodule URL in the superproject when no longer needed

2018-08-16 Thread Stefan Beller
On Thu, Aug 16, 2018 at 8:12 AM Junio C Hamano wrote: > > Stefan Beller writes: > > > Originally we have had the url in the config, (a) that we can change > > the URLs after the "git submodule init" and "git submodule update" > > step that actually clones the submodule if not present and

Re: [PATCH v4] clone: report duplicate entries on case-insensitive filesystems

2018-08-16 Thread Duy Nguyen
On Thu, Aug 16, 2018 at 4:03 PM Torsten Bögershausen wrote: > check_stat is 0 on Windows, How? check_stat is 1 by default. And "git init" does not add this key on new repos. > Now back to the compiler switch: > Windows always set inum to 0 and I can't think about a situation where > a file in a

Re: non-smooth progress indication for git fsck and git gc

2018-08-16 Thread Duy Nguyen
On Thu, Aug 16, 2018 at 1:10 PM Ulrich Windl wrote: > > Hi! > > I'd like to point out some minor issue observed while processing some > 5-object repository with many binary objects, but most are rather small: > > Between the two phases of "git fsck" (checking directories and checking >

Re: [RFC PATCH 0/7] Unset the submodule URL in the superproject when no longer needed

2018-08-16 Thread Junio C Hamano
Stefan Beller writes: > Originally we have had the url in the config, (a) that we can change > the URLs after the "git submodule init" and "git submodule update" > step that actually clones the submodule if not present and much more > importantly (b) to know which submodule "was

[PATCH] completion: include PARSE_OPT_HIDDEN in completion output

2018-08-16 Thread Ævar Arnfjörð Bjarmason
The PARSE_OPT_HIDDEN is, per the documentation of the "option" struct in option parse-options.h, only supposed to affect -h output, not completion. That's what the PARSE_OPT_NOCOMPLETE flag is supposed to be for. Since 2e29dca66a ("completion: use __gitcomp_builtin in _git_commit", 2018-02-09)

Re: Incomplete bash completion on git commit: --allow-empty-message and --allow-empty

2018-08-16 Thread Duy Nguyen
On Thu, Aug 16, 2018 at 3:50 PM Hadi Safari wrote: > > Hi! > > I'm wondering why there isn't --allow-empty and --allow-empty-message in > completeion list of git commit command. This is because they are marked "hidden" in the code. If you do "git commit -h", they will not show up either. Ævar

Re: [PATCH 2/2] submodule: munge paths to submodule git directories

2018-08-16 Thread Junio C Hamano
Jonathan Nieder writes: > So it would be nice, for future-proofing, if we can change the naming > scheme later. > ... > All at the cost of recording a little configuration somewhere. If we > want to decrease the configuration, we can avoid recording it there in > the easy cases (e.g. when name

Re: What's cooking in git.git (Aug 2018, #03; Wed, 15)

2018-08-16 Thread Junio C Hamano
Stefan Beller writes: >> >> * sb/config-write-fix (2018-08-08) 3 commits >> - git-config: document accidental multi-line setting in deprecated syntax >> - config: fix case sensitive subsection names on writing >> - t1300: document current behavior of setting options >> >> Recent update to

Re: submodules : switching to an older commit/Tag in project with submodules

2018-08-16 Thread Stefan Beller
On Thu, Aug 16, 2018 at 4:55 AM Shani Fridman wrote: > > > Hi everybody, > > I've got a question regarding submodules - > > I'm working on a git project with submodules connected to it, and pulling > changes from them every month (more or less). > Sometimes I need to checkout older versions of

Re: What's cooking in git.git (Aug 2018, #03; Wed, 15)

2018-08-16 Thread Stefan Beller
On Thu, Aug 16, 2018 at 6:15 AM Derrick Stolee wrote: > > On 8/15/2018 7:01 PM, Junio C Hamano wrote: > > * ds/commit-graph-with-grafts (2018-07-19) 8 commits > >(merged to 'next' on 2018-08-02 at 0ee624e329) > > + commit-graph: close_commit_graph before shallow walk > > + commit-graph:

Re: [PATCH v4] clone: report duplicate entries on case-insensitive filesystems

2018-08-16 Thread Torsten Bögershausen
On Wed, Aug 15, 2018 at 12:38:49PM -0700, Junio C Hamano wrote: This should answer Duys comments as well. > Torsten Bögershausen writes: > [snip] > > Should the following be protected by core.checkstat ? > > if (check_stat) { > > I do not think such a if statement is strictly necessary. >

Re: What's cooking in git.git (Aug 2018, #03; Wed, 15)

2018-08-16 Thread Derrick Stolee
On 8/15/2018 7:01 PM, Junio C Hamano wrote: * ds/commit-graph-with-grafts (2018-07-19) 8 commits (merged to 'next' on 2018-08-02 at 0ee624e329) + commit-graph: close_commit_graph before shallow walk + commit-graph: not compatible with uninitialized repo + commit-graph: not compatible

Re: git-clone removes destination path after permission deny

2018-08-16 Thread Agis
Nevermind, this is does not happen in 2.18.0. Apparently it was fixed somewhere between 2.11 and 2.18. > On 16 Aug 2018, at 15:08, Agis wrote: > > Hello. > > I've recently observed the following: > >$ mkdir foo >$ # try to clone from a repository that you have no access to >$ git

git-clone removes destination path after permission deny

2018-08-16 Thread Agis
Hello. I've recently observed the following: $ mkdir foo $ # try to clone from a repository that you have no access to $ git clone g...@github.com:agis/private.git foo Cloning into 'foo'... Permission denied (publickey). fatal: Could not read from remote repository.

submodules : switching to an older commit/Tag in project with submodules

2018-08-16 Thread Shani Fridman
Hi everybody, I've got a question regarding submodules - I'm working on a git project with submodules connected to it, and pulling changes from them every month (more or less). Sometimes I need to checkout older versions of the project (tags or specific commits), that needs the older

Re: [PATCH v2] worktree: add --quiet option

2018-08-16 Thread Martin Ågren
Hi Eric, On Thu, 16 Aug 2018 at 10:25, Eric Sunshine wrote: > (/me nudges Martin off the fence onto the side of not bothering to > mention the obvious) :-) Thanks for sanity-checking my thoughts. I agree with everything you wrote in your reply (and, FWIW, your other findings that you sent

[PATCH] branch: support configuring --sort via .gitconfig

2018-08-16 Thread samuel . maftoul
From: Samuel Maftoul Add support for configuring default sort ordering for git branches. Command line option will override this configured value, using the exact same syntax. Signed-off-by: Samuel Maftoul --- Documentation/config.txt | 6 + Documentation/git-branch.txt | 5 ++--

Re: [PATCH] branch: support configuring --sort via .gitconfig

2018-08-16 Thread Eric Sunshine
On Thu, Aug 16, 2018 at 4:06 AM wrote: > Add support for configuring default sort ordering for git branches. Command > line option will override this configured value, using the exact same > syntax. > > Signed-off-by: Samuel Maftoul > --- > diff --git a/Documentation/config.txt

Re: [PATCH v2] worktree: add --quiet option

2018-08-16 Thread Eric Sunshine
On Wed, Aug 15, 2018 at 4:56 PM Elia Pinto wrote: > Add the '--quiet' option to git worktree, > as for the other git commands. 'add' is the > only command affected by it since all other > commands, except 'list', are currently > silent by default. Nit: wrap the commit message at around 70

Re: [PATCH] rebase -i: fix numbering in squash message

2018-08-16 Thread Johannes Schindelin
Hi, On Wed, 15 Aug 2018, Junio C Hamano wrote: > Phillip Wood writes: > > >> I wonder if it makes it easier to read, understand and maintain if > >> there were a local variable that gets opts->current_fixup_count+2 at > >> the beginning of the function, make these three places refer to that >

Re: [PATCH 2/2] rebase -i: fix SIGSEGV when 'merge ' fails

2018-08-16 Thread Johannes Schindelin
Hi Phillip, On Wed, 15 Aug 2018, Phillip Wood wrote: > From: Phillip Wood > > If a merge command in the todo list specifies just a branch to merge > with no -C/-c argument then item->commit is NULL. This means that if > there are merge conflicts error_with_patch() is passed a NULL commit >

Re: [PATCH v2] worktree: add --quiet option

2018-08-16 Thread Eric Sunshine
On Thu, Aug 16, 2018 at 12:41 AM Martin Ågren wrote: > On Wed, 15 Aug 2018 at 22:56, Elia Pinto wrote: > The word "currently" means I can't shake the feeling that Eric has a > very good point in [1]: > > It might make sense to say instead that this is adding a --quiet > option _in general_,

Re: [PATCH 4/4] range-diff: indent special lines as context

2018-08-16 Thread Johannes Schindelin
Hi Stefan, On Tue, 14 Aug 2018, Stefan Beller wrote: > On Tue, Aug 14, 2018 at 11:54 AM Johannes Schindelin > wrote: > > > > On Mon, 13 Aug 2018, Stefan Beller wrote: > > > > > > > The later lines that indicate a change to the Makefile will be > > > > > treated as context both in the outer and

Re: "less -F" is broken

2018-08-16 Thread Ævar Arnfjörð Bjarmason
On Wed, Aug 15 2018, Linus Torvalds wrote: > On Wed, Aug 15, 2018 at 2:29 PM Ævar Arnfjörð Bjarmason > wrote: >> >> Downloading & trying versions of it locally reveals that it's as of >> version 520, not 530. The last version before 520 is 487. Presumably >> it's covered by this item in the

[PATCH] branch: support configuring --sort via .gitconfig

2018-08-16 Thread samuel . maftoul
From: Samuel Maftoul Add support for configuring default sort ordering for git branches. Command line option will override this configured value, using the exact same syntax. Signed-off-by: Samuel Maftoul --- Documentation/config.txt | 6 + Documentation/git-branch.txt | 3 +++

Incomplete bash completion on git commit: --allow-empty-message and --allow-empty

2018-08-16 Thread Hadi Safari
Hi! I'm wondering why there isn't --allow-empty and --allow-empty-message in completeion list of git commit command. I'm getting only following flags from v2.18.0 on `git commit --`: --ahead-behind --include --reedit-message= --all --interactive

Re: "Changes not staged for commit" after cloning a repo on macOS

2018-08-16 Thread Hadi Safari
On 25/5/1397 AP 10:53 AM, Torsten Bögershausen wrote: This repo seams not ment to be cloned onto a file system, which is case-insensitive. For example, (see below), this 2 files a different in the repo, but the file system can not have 'WordPress' and 'Wordpres's as different files or

non-smooth progress indication for git fsck and git gc

2018-08-16 Thread Ulrich Windl
Hi! I'd like to point out some minor issue observed while processing some 5-object repository with many binary objects, but most are rather small: Between the two phases of "git fsck" (checking directories and checking objects) there was a break of several seconds where no progress was

[PATCH] l10n: ru.po: fix misguiding translations

2018-08-16 Thread Basin Ilya
The removed word suggested that there was nothing to do while it's not always the case. --- po/ru.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ru.po b/po/ru.po index 9dd5dfb14..77690c8b3 100644 --- a/po/ru.po +++ b/po/ru.po @@ -14110,22 +14110,22 @@ msgstr

Re: "Changes not staged for commit" after cloning a repo on macOS

2018-08-16 Thread Torsten Bögershausen
On Thu, Aug 16, 2018 at 12:25:24AM +0430, Hadi Safari wrote: > Hi everyone! > > I encountered a strange situation on OS X recently. I cloned a repository > (https://github.com/kevinxucs/Sublime-Gitignore.git), went to folder, and > saw "Changes not staged for commit" message for four specific

Re: [PATCH v5 0/7] [PATCH v4 0/7] Add delta islands support

2018-08-16 Thread Christian Couder
Sorry, I made a copy paste error in the subject there should not be "[PATCH v4 0/7]" in it. On Thu, Aug 16, 2018 at 8:13 AM, Christian Couder wrote: > This patch series is upstreaming work made by GitHub and available in: [...]

[PATCH v5 6/7] pack-objects: move tree_depth into 'struct packing_data'

2018-08-16 Thread Christian Couder
This reduces the size of 'struct object_entry' and therefore makes packing objects more efficient. This also renames cmp_tree_depth() into tree_depth_compare(), as it is more modern to have the name of the compare functions end with "compare". Helped-by: Jeff King Helped-by: Duy Nguyen

[PATCH v5 5/7] t: add t5319-delta-islands.sh

2018-08-16 Thread Christian Couder
From: Jeff King Signed-off-by: Jeff King Signed-off-by: Christian Couder --- t/t5319-delta-islands.sh | 143 +++ 1 file changed, 143 insertions(+) create mode 100755 t/t5319-delta-islands.sh diff --git a/t/t5319-delta-islands.sh b/t/t5319-delta-islands.sh

[PATCH v5 4/7] repack: add delta-islands support

2018-08-16 Thread Christian Couder
From: Jeff King Implement simple support for --delta-islands option and repack.useDeltaIslands config variable in git repack. This allows users to setup delta islands in their config and get the benefit of less disk usage while cloning and fetching is still quite fast and not much more CPU

[PATCH v5 2/7] pack-objects: refactor code into compute_layer_order()

2018-08-16 Thread Christian Couder
In a following commit, as we will use delta islands, we will have to compute the write order for different layers, not just for one. Let's prepare for that by refactoring the code that will be used to compute the write order for a given layer into a new compute_layer_order() function. This will

[PATCH v5 3/7] pack-objects: add delta-islands support

2018-08-16 Thread Christian Couder
From: Jeff King Implement support for delta islands in git pack-objects and document how delta islands work in "Documentation/git-pack-objects.txt" and Documentation/config.txt. This allows users to setup delta islands in their config and get the benefit of less disk usage while cloning and

[PATCH v5 7/7] pack-objects: move 'layer' into 'struct packing_data'

2018-08-16 Thread Christian Couder
This reduces the size of 'struct object_entry' from 88 bytes to 80 and therefore makes packing objects more efficient. For example on a Linux repo with 12M objects, `git pack-objects --all` needs extra 96MB memory even if the layer feature is not used. Helped-by: Jeff King Helped-by: Duy Nguyen

[PATCH v5 1/7] Add delta-islands.{c,h}

2018-08-16 Thread Christian Couder
From: Jeff King Hosting providers that allow users to "fork" existing repos want those forks to share as much disk space as possible. Alternates are an existing solution to keep all the objects from all the forks into a unique central repo, but this can have some drawbacks. Especially when

[PATCH v5 0/7] [PATCH v4 0/7] Add delta islands support

2018-08-16 Thread Christian Couder
This patch series is upstreaming work made by GitHub and available in: https://github.com/peff/git/commits/jk/delta-islands The above work has been already described in the following article: https://githubengineering.com/counting-objects/ The above branch contains only one patch. In this

Re: [PATCH v4 1/7] Add delta-islands.{c,h}

2018-08-16 Thread Christian Couder
On Mon, Aug 13, 2018 at 9:00 PM, Jeff King wrote: > On Mon, Aug 13, 2018 at 05:33:59AM +0200, Christian Couder wrote: > >> >> + memcpy(_core, oid->hash, sizeof(uint64_t)); >> >> + rl->hash += sha_core; >> > >> > Hmm, so the first 64-bits of the oid of each ref that is part of >> > this

Re: [PATCH v4 1/7] Add delta-islands.{c,h}

2018-08-16 Thread Christian Couder
On Mon, Aug 13, 2018 at 8:11 PM, Jeff King wrote: > On Mon, Aug 13, 2018 at 01:17:18PM +0100, Ramsay Jones wrote: > >> >>> +struct island_bitmap { >> >>> + uint32_t refcount; >> >>> + uint32_t bits[]; >> >> >> >> Use FLEX_ARRAY here? We are slowly moving toward requiring >> >> certain C99