Re: Suspicious fetch-pack behaviour

2019-01-06 Thread brian m. carlson
On Thu, Jan 03, 2019 at 10:52:48AM +0100, Guilhem Bonnefille wrote: > Hi, > > One of my users reported a strange problem: a simple HTTPS clone did > not work with Git 1.8.3.1 on RedHat 7. > I did many tests and I was not able to understand why his clone don't > work while I'm able to do it on othe

Re: [PATCH v12 25/26] stash: optionally use the scripted version again

2019-01-06 Thread Thomas Gummerer
On 12/20, Paul-Sebastian Ungureanu wrote: > From: Johannes Schindelin > > We recently converted the `git stash` command from Unix shell scripts > to builtins. > > Let's end users a way out when they discover a bug in the s/Let's/& give/ maybe? The rest of the patch looks good to me. > builtin

Re: [PATCH 3/3] object-store: use one oid_array per subdirectory for loose cache

2019-01-06 Thread René Scharfe
Am 06.01.2019 um 21:38 schrieb Ævar Arnfjörð Bjarmason: >> $ git count-objects >> 26733 objects, 68808 kilobytes >> >> TestHEAD^ HEAD >> >> 4205.1: log with %H 0.51(0.47+0.04) 0.51(0.4

gitk shows local uncommit changes after touch file + reload

2019-01-06 Thread Jacob Kroon
Hi, Not sure if this has already been reported, but I observe this odd behaviour in gitk from master: git status gitk # everything looks good touch gitk # gitk shows "local uncomitted changes" on the file I touched git status gitk # gitk is back to normal again, showing no local uncommitted chan

"git p4" fails when perforce login not needed

2019-01-06 Thread Peter Osterlund
Hi, When I use "git p4 sync" to update a git repository from a perforce depot, the operation fails with error message: failure accessing depot: unknown error code info When I run "p4 login -s" from a shell it reports: 'login' not necessary, no password set for this user. The followi

Re: [PATCH v12 21/26] stash: optimize `get_untracked_files()` and `check_changes()`

2019-01-06 Thread Thomas Gummerer
On 12/20, Paul-Sebastian Ungureanu wrote: > This commits introduces a optimization by avoiding calling the > same functions again. For example, `git stash push -u` > would call at some points the following functions: > > * `check_changes()` (inside `do_push_stash()`) > * `do_create_stash()`, whi

Re: [PATCH 3/3] object-store: use one oid_array per subdirectory for loose cache

2019-01-06 Thread Ævar Arnfjörð Bjarmason
On Sun, Jan 06 2019, René Scharfe wrote: Thanks. I haven't done my own performance testing but at a glance this looks good. > The cache is used for collision checks for the log placeholders %h, %t > and %p, and we can see the change speeding them up in a repository with > ca. 100 objects per su

Re: [PATCH v2 8/8] checkout: introduce checkout.overlayMode config

2019-01-06 Thread Thomas Gummerer
On 01/02, Junio C Hamano wrote: > Thomas Gummerer writes: > > > In the previous patch we introduced a new no-overlay mode for git > > checkout. Some users (such as the author of this commit) may want to > > have this mode turned on by default as it matches their mental model > > more closely. M

Re: [PATCH] doc/config: do a better job of introducing 'worktree.guessRemote'

2019-01-06 Thread Eric Sunshine
On Sun, Jan 6, 2019 at 1:09 PM Thomas Gummerer wrote: > On 12/23, Eric Sunshine wrote: > > The documentation for this option jumps right in with "With `add`", > > without explaining that `add` is a sub-command of "git worktree". > > Together with rather odd grammatical structure of the remainder o

Re: [PATCH] config.mak.dev: add -Wformat

2019-01-06 Thread Thomas Gummerer
On 01/03, Junio C Hamano wrote: > Jonathan Nieder writes: > > > In October, Thomas Gummerer wrote: > >> On 10/12, Jonathan Nieder wrote: > >>> Jeff King wrote: > >>> ... > -Wformat is part of -Wall, which we already turn on by default (even for > non-developer builds). > > ... > > As di

Re: [PATCH v2 7/8] checkout: introduce --{,no-}overlay option

2019-01-06 Thread Thomas Gummerer
On 12/23, Eric Sunshine wrote: > On Sun, Dec 23, 2018 at 3:05 AM Duy Nguyen wrote: > > On Thu, Dec 20, 2018 at 2:48 PM Thomas Gummerer > > wrote: > > > +--[no-]overlay:: > > > + In the default overlay mode files `git checkout` never > > > > -ECANTPARSE. Maybe "files" should be removed from

Re: [PATCH] doc/config: do a better job of introducing 'worktree.guessRemote'

2019-01-06 Thread Thomas Gummerer
On 12/23, Eric Sunshine wrote: > The documentation for this option jumps right in with "With `add`", > without explaining that `add` is a sub-command of "git worktree". > Together with rather odd grammatical structure of the remainder of the > sentence, the description can be difficult for newcomer

Re: [PATCH] t5570: drop racy test

2019-01-06 Thread Thomas Gummerer
On 12/21, Johannes Schindelin wrote: > Hi Thomas & Peff, > > On Thu, 20 Dec 2018, Jeff King wrote: > > > On Thu, Dec 20, 2018 at 04:41:50PM +, Thomas Gummerer wrote: > > > > > Dscho also mentioned on #git-devel a while ago that he may have a look > > > at actually making this test race-proof

[PATCH 2/1] Revert "t/lib-git-daemon: record daemon log"

2019-01-06 Thread Thomas Gummerer
This reverts commit 314a73d658 (t/lib-git-daemon: record daemon log, 2018-01-25), which let tests use the output of git-daemon. The previous commit removed the last user of deamon.log in the tests, there's no good way to make checking for output in the log race-proof. Revert this commit as well,

[PATCH 3/3] object-store: use one oid_array per subdirectory for loose cache

2019-01-06 Thread René Scharfe
The loose objects cache is filled one subdirectory at a time as needed. It is stored in an oid_array, which has to be resorted after each add operation. So when querying a wide range of objects, the partially filled array needs to be resorted up to 255 times, which takes over 100 times longer than

[PATCH 2/3] object-store: factor out odb_clear_loose_cache()

2019-01-06 Thread René Scharfe
Add and use a function for emptying the loose object cache, so callers don't have to know any of its implementation details. Signed-off-by: Rene Scharfe --- object-store.h | 3 +++ object.c | 2 +- packfile.c | 7 ++- sha1-file.c| 7 +++ 4 files changed, 13 insertions(+), 6

[PATCH 1/3] object-store: factor out odb_loose_cache()

2019-01-06 Thread René Scharfe
Add and use a function for loading the entries if a loose object subdirectory for a given object ID. It frees callers from deriving the fanout key; they can use the returned oid_array reference for lookups or forward range scans. Suggested-by: Jeff King Signed-off-by: Rene Scharfe --- object-s

jk/loose-object-cache

2019-01-06 Thread René Scharfe
Am 28.12.2018 um 19:04 schrieb Junio C Hamano: > * jk/loose-object-cache (2018-11-24) 10 commits > (merged to 'next' on 2018-12-28 at 5a5faf384e) > + odb_load_loose_cache: fix strbuf leak > + fetch-pack: drop custom loose object cache > + sha1-file: use loose object cache for quick existence c

[PATCH v3 3/4] t3502: validate '-m 1' argument is now accepted for non-merge commits

2019-01-06 Thread Sergey Organov
Signed-off-by: Sergey Organov --- t/t3502-cherry-pick-merge.sh | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/t/t3502-cherry-pick-merge.sh b/t/t3502-cherry-pick-merge.sh index b160271..8b635a1 100755 --- a/t/t3502-cherry-pick-merge.sh +++ b/t/t3502-cherry-pick-me

[PATCH v3 4/4] t3506: validate '-m 1 -ff' is now accepted for non-merge commits

2019-01-06 Thread Sergey Organov
Signed-off-by: Sergey Organov --- t/t3506-cherry-pick-ff.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/t3506-cherry-pick-ff.sh b/t/t3506-cherry-pick-ff.sh index fb889ac..127dd00 100755 --- a/t/t3506-cherry-pick-ff.sh +++ b/t/t3506-cherry-pick-ff.sh @@ -64,10 +64,1

[PATCH v3 0/4] Allow 'cherry-pick -m 1' for non-merge commits

2019-01-06 Thread Sergey Organov
Change from v2: t/t3502: disambiguation added to prevent failing on case-insensitive file systems. When cherry-picking multiple commits, it's impossible to have both merge- and non-merge commits on the same command-line. Not specifying '-m 1' results in cherry-pick refusing to handle merge commits

[PATCH v3 1/4] t3510: stop using '-m 1' to force failure mid-sequence of cherry-picks

2019-01-06 Thread Sergey Organov
We are going to allow 'git cherry-pick -m 1' for non-merge commits, so this method to force failure will stop to work. Use '-m 4' instead as it's very unlikely we will ever have such an octopus in this test setup. Signed-off-by: Sergey Organov --- t/t3510-cherry-pick-sequence.sh | 8 ++-- 1

[PATCH v3 2/4] cherry-pick: do not error on non-merge commits when '-m 1' is specified

2019-01-06 Thread Sergey Organov
When cherry-picking multiple commits, it's impossible to have both merge- and non-merge commits on the same command-line. Not specifying '-m 1' results in cherry-pick refusing to handle merge commits, while specifying '-m 1' fails on non-merge commits. This patch allows '-m 1' for non-merge commit

[PATCH] helper/test-ref-store: fix "new-sha1" vs "old-sha1" typo

2019-01-06 Thread Christian Couder
It looks like it is a copy-paste error made in 80f2a6097c (t/helper: add test-ref-store to test ref-store functions, 2017-03-26) to pass "old-sha1" instead of "new-sha1" to notnull() when we get the new sha1 argument from const char **argv. Signed-off-by: Christian Couder --- t/helper/test-ref-

Re: [PATCH v2 3/4] t3502: validate '-m 1' argument is now accepted for non-merge commits

2019-01-06 Thread Sergey Organov
SZEDER Gábor writes: > On Fri, Dec 14, 2018 at 07:53:51AM +0300, Sergey Organov wrote: >> Signed-off-by: Sergey Organov [...] >> >> @@ -84,12 +84,12 @@ test_expect_success 'cherry pick a merge relative to >> nonexistent parent should f >> >> ' >> >> -test_expect_success 'revert a non-m