Re: [PATCH] rebase --abort: cleanup refs/rewritten

2019-04-30 Thread Phillip Wood
Hi Dscho On 29/04/2019 17:07, Johannes Schindelin wrote: Hi Phillip, On Fri, 26 Apr 2019, Phillip Wood wrote: From: Phillip Wood When `rebase -r` finishes it removes any refs under refs/rewritten that it has created. However if the rebase is aborted these refs are not removed. This can caus

Re: [PATCH] rebase -r: always reword merge -c

2019-04-30 Thread Phillip Wood
Hi Dscho On 29/04/2019 17:14, Johannes Schindelin wrote: Hi Phillip, On Fri, 26 Apr 2019, Phillip Wood wrote: From: Phillip Wood If a merge can be fast-forwarded then make sure that we still edit the commit message if the user specifies -c. The implementation follows the same pattern that i

Re: [PATCH v2] status: add an empty line when there is no hint

2019-04-30 Thread Phillip Wood
Hi John On 30/04/2019 07:02, John Lin wrote: When typing "git status", there is an empty line between the "Changes not staged for commit:" block and the list of changed files. I'm a bit confused by this as you change a status test below by inserting these blank lines into the expected output,

Re: Bug: fatal: Unable to create '.../.git/index.lock': File exists.

2019-04-30 Thread Aleksey Midenkov
On Mon, Apr 29, 2019 at 2:35 PM Duy Nguyen wrote: > > On Mon, Apr 29, 2019 at 6:03 PM Aleksey Midenkov wrote: > > > > Reproduce: > > ``` > > cat << EOF >> /tmp/check.sh > > #!/bin/sh > > git log HEAD~..HEAD | cat > > # sleep 1 > > EOF > > chmod +x /tmp/check.sh > > git rebase -p -x /tmp/check.sh

[PATCH] ci: install 'libsvn-perl' instead of 'git-svn'

2019-04-30 Thread SZEDER Gábor
Since e7e9f5e7a1 (travis-ci: enable Git SVN tests t91xx on Linux, 2016-05-19) some of our Travis CI build jobs install the 'git-svn' package, because it was a convenient way to install its dependencies, which are necessary to run our 'git-svn' tests (we don't actually need the 'git-svn' package its

[PATCH] rebase: fix garbled progress display with '-x'

2019-04-30 Thread SZEDER Gábor
When running a command with the 'exec' instruction during an interactive rebase session, or for a range of commits using 'git rebase -x', the output can be a bit garbled when the name of the command is short enough: $ git rebase -x true HEAD~5 Executing: true Executing: true Executing: tru

Re: [PATCH 3/6] config.c: add repo_config_set_worktree_gently()

2019-04-30 Thread Derrick Stolee
On 12/27/2018 10:56 AM, Nguyễn Thái Ngọc Duy wrote: > diff --git a/config.h b/config.h > index ee5d3fa7b4..62204dc252 100644 > --- a/config.h > +++ b/config.h > @@ -103,6 +103,9 @@ extern int git_config_color(char *, const char *, const > char *); > extern int git_config_set_in_file_gently(const

Re: Bug: fatal: Unable to create '.../.git/index.lock': File exists.

2019-04-30 Thread Jeff King
On Tue, Apr 30, 2019 at 02:19:11PM +0300, Aleksey Midenkov wrote: > > I gave it about 2000 commits (from v2.20.1 to master on git.git) to > > rebase. No luck. > > Please, try on this repo: g...@github.com:tempesta-tech/mariadb > > ``` > git checkout 62a082f573 > git rebase -p -x /tmp/check.sh ca

Re: Resolving deltas dominates clone time

2019-04-30 Thread Jeff King
On Tue, Apr 23, 2019 at 05:08:40PM +0700, Duy Nguyen wrote: > On Tue, Apr 23, 2019 at 11:45 AM Jeff King wrote: > > > > On Mon, Apr 22, 2019 at 09:55:38PM -0400, Jeff King wrote: > > > > > Here are my p5302 numbers on linux.git, by the way. > > > > > > Test

Re: Resolving deltas dominates clone time

2019-04-30 Thread Jeff King
On Tue, Apr 23, 2019 at 02:09:31PM -0600, Martin Fick wrote: > Here are my index-pack results (I only ran them once since they take a while) > using vgit 1.8.3.2: > > Threads real usersys > 1 108m46.151s 106m14.420s 1m57.192s > 2 58m14.274s 106m23.158s 5m32.736s > 3

Contributing with documentation/translation

2019-04-30 Thread Priscila Gutierres
Hi I want to contribute to git by creating and/or translating documentation. Where may I find the info to do this? Priscila.

Good Day,

2019-04-30 Thread Bar. Eric Marshall
Hello, I am Mr. Eric Marshall, Your email still valid? I seek your attention have business to discuss with you Please reply me for more details. Best Regards, Mr. Eric Marshall,

[PATCH v2 0/5] Fix and extend encoding handling in fast export/import

2019-04-30 Thread Elijah Newren
While stress testing `git filter-repo`, I noticed an issue with encoding; further digging led to the fixes and features in this series. See the individual commit messages for details. Changes since v1 (full range-diff below): * Applied style fixes Eric pointed out in his review (thanks!) * Reb

[PATCH v2 4/5] fast-export: differentiate between explicitly utf-8 and implicitly utf-8

2019-04-30 Thread Elijah Newren
The find_encoding() function returned the encoding used by a commit message, returning a default of git_commit_encoding (usually utf-8). Although the current code does not differentiate between a commit which explicitly requested utf-8 and one where we just assume utf-8 because no encoding is set,

[PATCH v2 2/5] fast-import: support 'encoding' commit header

2019-04-30 Thread Elijah Newren
Since git supports commit messages with an encoding other than utf-8, allow fast-import to import such commits. This may be useful for folks who do not want to reencode commit messages from an external system, and may also be useful to achieve reversible history rewrites (e.g. sha1sum <-> sha256su

[PATCH v2 3/5] fast-export: avoid stripping encoding header if we cannot reencode

2019-04-30 Thread Elijah Newren
When fast-export encounters a commit with an 'encoding' header, it tries to reencode in utf-8 and then drops the encoding header. However, if it fails to reencode in utf-8 because e.g. one of the characters in the commit message was invalid in the old encoding, then we need to retain the original

[PATCH v2 5/5] fast-export: do automatic reencoding of commit messages only if requested

2019-04-30 Thread Elijah Newren
Automatic re-encoding of commit messages (and dropping of the encoding header) hurts attempts to do reversible history rewrites (e.g. sha1sum <-> sha256sum transitions, some subtree rewrites), and seems inconsistent with the general principle followed elsewhere in fast-export of requiring explicit

[PATCH v2 1/5] t9350: fix encoding test to actually test reencoding

2019-04-30 Thread Elijah Newren
This test used an author with non-ascii characters in the name, but no special commit message. It then grep'ed for those non-ascii characters, but those are guaranteed to exist regardless of the reencoding process since the reencoding only affects the commit message, not the author or committer na

Re: Resolving deltas dominates clone time

2019-04-30 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 30 2019, Jeff King wrote: > On Tue, Apr 23, 2019 at 05:08:40PM +0700, Duy Nguyen wrote: > >> On Tue, Apr 23, 2019 at 11:45 AM Jeff King wrote: >> > >> > On Mon, Apr 22, 2019 at 09:55:38PM -0400, Jeff King wrote: >> > >> > > Here are my p5302 numbers on linux.git, by the way. >> > >

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

2019-04-30 Thread Josh Steadmon
Just a couple typo fixes listed below: On 2019.04.23 12:34, Emily Shaffer wrote: [snip] > +=== Implementation > + > +It's probably useful to do at least something besides printing out a string. > +Let's start by having a look at everything we get. > + > +Modify your `cmd_psuh` implementation to d

Re: Resolving deltas dominates clone time

2019-04-30 Thread Jeff King
On Tue, Apr 30, 2019 at 08:48:08PM +0200, Ævar Arnfjörð Bjarmason wrote: > > So I'd say the right answer is probably either online_cpus() or half > > that. The latter would be more appropriate for the machines I have, but > > I'd worry that it would leave performance on the table for non-intel > >

Re: How to undo previously set configuration? (again)

2019-04-30 Thread Jeff King
On Fri, Apr 26, 2019 at 04:36:40PM +0700, Duy Nguyen wrote: > > I'm confused. Isn't that bog-standard Git usage, not a custom hack? > > That is, I thought the intended behavior is always > > > > 1. For single-valued options, last value wins. > > 2. For multi-valued options, empty clears the lis

Re: [PATCH 0/5] Multiple hook support

2019-04-30 Thread Jeff King
On Wed, Apr 24, 2019 at 12:49:43AM +, brian m. carlson wrote: > I've talked with some people about this approach, and they've indicated > they would prefer a configuration-based approach. I think I'm some people. :) I agree with the thoughts that Jonathan pointed out in [1], but I wanted to

Re: [PATCH v10 0/3]

2019-04-30 Thread Johannes Schindelin
Hi Nickolai, On Mon, 29 Apr 2019, Nickolai Belakovski wrote: > Sorry, I'm not very accustomed to mailing list development. I had assumed > that this was being threaded with the other messages in the series, hence > leaving the subject blank and only putting new info in the body. The openness of

Re: [PATCH v3] config: correct '**' matching in includeIf patterns

2019-04-30 Thread Jason Karns
On Tue, Mar 26, 2019 at 5:42 AM Nguyễn Thái Ngọc Duy wrote: > > The current wildmatch() call for includeIf's gitdir pattern does not > pass the WM_PATHNAME flag. Without this flag, '*' is treated _almost_ > the same as '**' (because '*' also matches slashes) with one exception: > > '/**/' can matc

Re: [PATCH 1/1] credential: do not mask the username

2019-04-30 Thread Johannes Schindelin
Hi Peff, On Mon, 29 Apr 2019, Jeff King wrote: > On Mon, Apr 29, 2019 at 03:06:11PM -0700, Jarosław Honkis via GitGitGadget > wrote: > > > From: =?UTF-8?q?Jaros=C5=82aw=20Honkis?= > > > > When a user is asked for credentials there is no need to mask the > > username, so the PROMPT_ASKPASS flag

Re: Resolving deltas dominates clone time

2019-04-30 Thread Martin Fick
On Tuesday, April 30, 2019 2:02:32 PM MDT Jeff King wrote: > On Tue, Apr 23, 2019 at 02:09:31PM -0600, Martin Fick wrote: > > I think that if there were no default limit during a clone it could have > > disastrous effects on people using the repo tool from the android project, > > or any other "sub

Re: [PATCH v2 19/20] diff --no-index: use parse_options() instead of diff_opt_parse()

2019-04-30 Thread Johannes Schindelin
Hi Duy, On Tue, 30 Apr 2019, Duy Nguyen wrote: > On Tue, Apr 30, 2019 at 8:02 AM Johannes Schindelin > wrote: > > > > Hi Duy, > > > > On Sun, 24 Mar 2019, Nguyễn Thái Ngọc Duy wrote: > > > > > While at there, move exit() back to the caller. It's easier to see the > > > flow that way than burying

Re: [PATCH] ci: install 'libsvn-perl' instead of 'git-svn'

2019-04-30 Thread Johannes Schindelin
Hi, On Tue, 30 Apr 2019, SZEDER Gábor wrote: > Since e7e9f5e7a1 (travis-ci: enable Git SVN tests t91xx on Linux, > 2016-05-19) some of our Travis CI build jobs install the 'git-svn' > package, because it was a convenient way to install its dependencies, > which are necessary to run our 'git-svn'

Re: [PATCH 1/1] credential: do not mask the username

2019-04-30 Thread Jeff King
On Tue, Apr 30, 2019 at 06:07:15PM -0400, Johannes Schindelin wrote: > > 2. Use another tool besides askpass. I don't know of any askpass > > implementations that take something like our ECHO flag, but there > > are lots of other tools. I doubt there's any easy portable > > soluti

Re: [PATCH v2] status: add an empty line when there is no hint

2019-04-30 Thread 林自均
Hi Phillip, Phillip Wood 於 2019年4月30日 週二 下午7:15寫道: > > Hi John > > On 30/04/2019 07:02, John Lin wrote: > > When typing "git status", there is an empty line between > > the "Changes not staged for commit:" block and the list > > of changed files. > > I'm a bit confused by this as you change a sta

Re: [PATCH] rebase: fix garbled progress display with '-x'

2019-04-30 Thread Johannes Schindelin
Hi, On Tue, 30 Apr 2019, SZEDER Gábor wrote: > When running a command with the 'exec' instruction during an > interactive rebase session, or for a range of commits using 'git > rebase -x', the output can be a bit garbled when the name of the > command is short enough: > > $ git rebase -x true H

Re: [PATCH 1/1] mingw: optionally disable side-band-64k for transport

2019-04-30 Thread Johannes Schindelin
Hi Hannes, On Tue, 30 Apr 2019, Johannes Sixt wrote: > Am 30.04.19 um 01:17 schrieb Johannes Schindelin: > > On Mon, 29 Apr 2019, Eric Sunshine wrote: > >> On Mon, Apr 29, 2019 at 6:04 PM Thomas Braun via GitGitGadget > >>> diff --git a/Documentation/config/sendpack.txt > >>> b/Documentation/con

Re: [PATCH 1/1] mingw: optionally disable side-band-64k for transport

2019-04-30 Thread Johannes Schindelin
Hi brian, On Mon, 29 Apr 2019, brian m. carlson wrote: > On Mon, Apr 29, 2019 at 03:04:36PM -0700, Thomas Braun via GitGitGadget wrote: > > From: Thomas Braun > > > > Since commit 0c499ea60f (send-pack: demultiplex a sideband stream with > > status data, 2010-02-05) the built-in send-pack uses t

Re: [PATCH 2/2] mingw: enable DEP and ASLR

2019-04-30 Thread Johannes Schindelin
Hi Hannes, On Tue, 30 Apr 2019, Johannes Sixt wrote: > [had to add Dscho as recipient manually, mind you] I usually pick up responses to GitGitGadget patch series even if I am not on explicit Cc: (but it might take a couple of days when I am too busy elsewhere to read the Git mailing list). > A

Re: [PATCH] rebase --abort: cleanup refs/rewritten

2019-04-30 Thread Johannes Schindelin
Hi Phillip, On Tue, 30 Apr 2019, Phillip Wood wrote: > On 29/04/2019 17:07, Johannes Schindelin wrote: > > > > On Fri, 26 Apr 2019, Phillip Wood wrote: > > > > > From: Phillip Wood > > > > > > When `rebase -r` finishes it removes any refs under refs/rewritten > > > that it has created. However i

Re: [PATCH] rebase -r: always reword merge -c

2019-04-30 Thread Johannes Schindelin
Hi Phillip, On Tue, 30 Apr 2019, Phillip Wood wrote: > On 29/04/2019 17:14, Johannes Schindelin wrote: > > Hi Phillip, > > > > On Fri, 26 Apr 2019, Phillip Wood wrote: > > > > > ret = !!run_git_commit(r, git_path_merge_msg(r), opts, > > > run_commit_flags); > > > > > > diff --git

Re: [PATCH 1/1] mingw: optionally disable side-band-64k for transport

2019-04-30 Thread Johannes Sixt
Am 01.05.19 um 00:33 schrieb Johannes Schindelin: > On Tue, 30 Apr 2019, Johannes Sixt wrote: >> Am 30.04.19 um 01:17 schrieb Johannes Schindelin: >>> You're right, this is confusing, especially since Git for Windows 2.x does >>> not have that bug. >> >> If there is no bug, why do we need the patch

Re: [PATCH 2/2] mingw: enable DEP and ASLR

2019-04-30 Thread Johannes Sixt
Am 01.05.19 um 00:41 schrieb Johannes Schindelin: > On Tue, 30 Apr 2019, Johannes Sixt wrote: >> Am 29.04.19 um 23:56 schrieb İsmail Dönmez via GitGitGadget: >>> diff --git a/config.mak.uname b/config.mak.uname >>> index e7c7d14e5f..a9edcc5f0b 100644 >>> --- a/config.mak.uname >>> +++ b/config.mak.

Re: Stage or discard a hunk at a time?

2019-04-30 Thread Johannes Schindelin
Hi, On Mon, 22 Apr 2019, Jeff King wrote: > On Wed, Jan 16, 2019 at 01:09:03PM -0600, Cameron Steffen wrote: > > > I have this feature idea for git. There should be a command that > > effectively combines git add -p and git checkout -p so that I can > > navigate changed hunks and either stage or

Re: [PATCH v3 0/4] remove extern from function declarations

2019-04-30 Thread Johannes Schindelin
Hi, On Thu, 25 Apr 2019, SZEDER Gábor wrote: > On Mon, Apr 22, 2019 at 05:49:01PM -0400, Jeff King wrote: > > On Wed, Apr 17, 2019 at 12:58:31AM -0700, Denton Liu wrote: > > > > compat/mingw.c| 2 +- > > > compat/mingw.h| 6 +- > > > compat/nedmalloc/m

Re: [PATCH 01/11] Start to implement a built-in version of `git add --interactive`

2019-04-30 Thread Johannes Schindelin
Hi Jeff & Jeff, On Thu, 18 Apr 2019, Jeff King wrote: > On Thu, Apr 18, 2019 at 10:31:30AM -0400, Jeff Hostetler wrote: > > > Currently, neither function looks at any other k/v pairs, so > > this is a bit of a moot point, but I'm wondering if this should > > look like this: > > > > int add_co

Re: [PATCH 01/11] Start to implement a built-in version of `git add --interactive`

2019-04-30 Thread Jeff King
On Tue, Apr 30, 2019 at 07:40:06PM -0400, Johannes Schindelin wrote: > > Yeah, I agree this split seems a bit more natural. It is worth > > propagating errors from add_i_config(), though, like: > > > > if (add_i_config(var, value, data)) > > return -1; > > > > so that any key-specific errors