[Suggestion] Alternative way for displaying help menu of patch flow

2017-04-27 Thread Kaartic Sivaraam
Hello community, I would like to state about a small issue I face when I use the `git add -i` command. I guess it's expressed easily with an example. Start Imagine a situation in which you accidentally made a reasonable amount of change to your code from your last commit. You

Re: [PATCH] t7400: add BSLASHPSPEC prerequisite to 'add with \\ in path'

2017-04-27 Thread Junio C Hamano
Ramsay Jones writes: > Commit cf9e55f494 ("submodule: prevent backslash expantion in submodule > names", 07-04-2017) added a test which creates a git repository with > some backslash characters in the name. This test cannot work on windows, > since the backslash is

Re: [PATCH v2] status: add color config slots for branch info in "--short --branch"

2017-04-27 Thread Junio C Hamano
Jeff King writes: > As we discussed elsewhere, it would be nice if this tested remoteBranch, > too. IMHO the simplest thing to is to rebase it on the t7508 update I > just posted. > > The other option is to add config for remoteBranch which would do > nothing for now, and then

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

2017-04-27 Thread Junio C Hamano
Junio C Hamano writes: > Yes. The "pretty_given" trick is one example that the underlying > implementation can change over time. If you wrote this patch before > 66b2ed09 ("Fix "log" family not to be too agressive about showing > notes", 2010-01-20) happened, you wouldn't

Re: Submodule/contents conflict

2017-04-27 Thread Junio C Hamano
"Philip Oakley" writes: >> In the modern day, it might be useful if the "--working-tree-only" >> mode added a new file as an intent-to-add entry to the index, but >> that is not what "git apply (no other options)" (which is the gold > > did you mean `git add` ? Or am I

[PATCH] t7400: add BSLASHPSPEC prerequisite to 'add with \\ in path'

2017-04-27 Thread Ramsay Jones
Commit cf9e55f494 ("submodule: prevent backslash expantion in submodule names", 07-04-2017) added a test which creates a git repository with some backslash characters in the name. This test cannot work on windows, since the backslash is used as the directory separator. In order to suppress this

Re: [PATCH 35/53] Convert the verify_pack callback to struct object_id

2017-04-27 Thread Jeff King
On Fri, Apr 28, 2017 at 12:17:54AM +, brian m. carlson wrote: > > What's the gain in converting it here? I know we want to get rid of the > > bare "20", but we could switch it out for GIT_SHA1_RAWSZ. I suspect you > > prefer in the long run to get rid of even those GIT_SHA1_RAWSZ defines, > >

Re: [PATCH 35/53] Convert the verify_pack callback to struct object_id

2017-04-27 Thread brian m. carlson
On Thu, Apr 27, 2017 at 01:52:09AM -0400, Jeff King wrote: > On Sun, Apr 23, 2017 at 09:34:35PM +, brian m. carlson wrote: > > Use a > > struct object_id to hold the pack checksum, even though it is not > > strictly an object ID. Doing so ensures resilience against future hash > > size

Re: [PATCH v3 4/9] rebase -i: also expand/collapse the SHA-1s via the rebase--helper

2017-04-27 Thread Junio C Hamano
Johannes Schindelin writes: >> > + out = fopen(todo_file, "w"); >> >> The usual "open lockfile, write to it and then rename" dance is not >> necessary for the purpose of preventing other people from reading >> this file while we are writing to it. But if we fail

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

2017-04-27 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Junio, > > On Wed, 26 Apr 2017, Junio C Hamano wrote: > >> Johannes Schindelin writes: >> >> > diff --git a/sequencer.c b/sequencer.c >> > index 77afecaebf0..e858a976279 100644 >> > --- a/sequencer.c >> >

git with ssh won't pull submodule

2017-04-27 Thread Erik Haller
Getting the following error for a submodule when using git/ssh: $ git clone --recursive ssh://incense:/home/erik/git/nacl.git Cloning into 'nacl'... remote: Counting objects: 32, done. remote: Compressing objects: 100% (25/25), done. remote: Total 32 (delta 5), reused 0 (delta 0) Receiving

Re: [PATCH 14/26] setup_bare_git_dir(): fix memory leak

2017-04-27 Thread Johannes Schindelin
Hi Hannes, On Thu, 27 Apr 2017, Johannes Sixt wrote: > Am 26.04.2017 um 22:20 schrieb Johannes Schindelin: > > Reported by Coverity. > > > > Signed-off-by: Johannes Schindelin > > --- > > setup.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff

Re: [PATCH 14/26] setup_bare_git_dir(): fix memory leak

2017-04-27 Thread Johannes Schindelin
Hi Stefan, On Wed, 26 Apr 2017, Stefan Beller wrote: > On Wed, Apr 26, 2017 at 1:20 PM, Johannes Schindelin > wrote: > > Reported by Coverity. > > > > Signed-off-by: Johannes Schindelin > > --- > > setup.c | 2 +- > > 1 file changed, 1

Re: Submodule/contents conflict

2017-04-27 Thread Philip Oakley
From: "Jeff King" Sent: Tuesday, April 25, 2017 4:22 AM Just catching up - sorry it's late.. On Mon, Apr 24, 2017 at 04:43:28PM -0700, Stefan Beller wrote: >> On the main list thare is a similar "issue" [1] regarding the >> expectation for `git checkout`, >> and importantly

Re: [PATCH 00/26] Address a couple of issues identified by Coverity

2017-04-27 Thread Johannes Schindelin
Hi Stefan, On Wed, 26 Apr 2017, Stefan Beller wrote: > On Wed, Apr 26, 2017 at 1:19 PM, Johannes Schindelin > wrote: > > I recently registered the git-for-windows fork with Coverity to ensure > > that even the Windows-specific patches get some static analysis love. >

Re: [PATCH v3 0/5] clone: --no-tags option

2017-04-27 Thread Brandon Williams
On 04/26, Ævar Arnfjörð Bjarmason wrote: > This is an expansion of the previously solo 02/05 "clone: add a > --no-tags option to clone without tags" patch (see > <20170418191553.15464-1-ava...@gmail.com>). > > This addresses the comments by Junio & Jonathan Nieder on v2 (thanks a > lot), and in

Re: [PATCH v3 4/5] clone: add a --no-tags-submodules to pass --no-tags to submodules

2017-04-27 Thread Brandon Williams
On 04/27, Stefan Beller wrote: > On Wed, Apr 26, 2017 at 4:12 PM, Ævar Arnfjörð Bjarmason > wrote: > > From: Brandon Williams > > > > Add a --no-tags-submodules which does for --no-tags what the existing > > --shallow-submodules does for --depth, i.e. doing:

Re: [PATCH v3 3/5] tests: rename a test having to do with shallow submodules

2017-04-27 Thread Brandon Williams
On 04/27, Stefan Beller wrote: > On Wed, Apr 26, 2017 at 4:12 PM, Ævar Arnfjörð Bjarmason > wrote: > > Rename the t5614-clone-submodules.sh test to > > t5614-clone-submodules-shallow.sh. It's not a general test of > > submodules, but of shallow cloning in relation to submodules.

Re: [PATCH v3 2/5] clone: add a --no-tags option to clone without tags

2017-04-27 Thread Brandon Williams
On 04/27, Stefan Beller wrote: > I like the option, though I dislike the implementation, specifically as you > brought up e.g. "[PATCH] various: disallow --no-no-OPT for --no-opt options". > > Can we have an option "--tags" instead, which is on by default > and then you can negate it to

Re: Submodule/contents conflict

2017-04-27 Thread Philip Oakley
From: "Junio C Hamano" Sent: Wednesday, April 26, 2017 3:51 AM "Philip Oakley" writes: As I recall Christoph was using checkout to copy a file (e.g. a template file) from an older commit/revision into his worktree, and was suprised that this (git

Re: [PATCH v3 5/9] t3404: relax rebase.missingCommitsCheck tests

2017-04-27 Thread Johannes Schindelin
Hi Junio, On Wed, 26 Apr 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > These tests were a bit anal about the *exact* warning/error message > > printed by git rebase. But those messages are intended for the *end > > user*, therefore it does not make

Re: [PATCH 53/53] object: convert parse_object* to take struct object_id

2017-04-27 Thread Stefan Beller
On Sun, Apr 23, 2017 at 2:34 PM, brian m. carlson wrote: > Make parse_object, parse_object_or_die, and parse_object_buffer take a > pointer to struct object_id. Remove the temporary variables inserted > earlier, since they are no longer necessary. Transform all of

Re: [PATCH v3 4/9] rebase -i: also expand/collapse the SHA-1s via the rebase--helper

2017-04-27 Thread Johannes Schindelin
Hi Junio, On Wed, 26 Apr 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > > index 214af0372ba..52a19e0bdb3 100644 > > --- a/git-rebase--interactive.sh > > +++

Re: [PATCH] diff: prefer indent heuristic over compaction heuristic

2017-04-27 Thread Stefan Beller
picking up this old topic, with Martin, Marc and SZEDER cc'd, as we got patch proposals regarding the indent heuristic. On Sat, Dec 24, 2016 at 4:55 AM, Michael Haggerty wrote: > On 12/23/2016 10:17 PM, Junio C Hamano wrote: >> Junio C Hamano writes: >>

[PATCH 0/2] Make diff plumbing commands respect the indentHeuristic.

2017-04-27 Thread Marc Branchaud
So here's my attempt at fixing this. The thing I was missing is that init_revisions() calls diff_setup(), which sets the xdl options. It's therefore necessary to have the diff_indent_heuristic flag set before calling init_revisions(). A naive way to get the indentHeuristic config option

[PATCH 2/2] Have the diff-* builtins configure diff before initializing revisions.

2017-04-27 Thread Marc Branchaud
This makes the commands respect diff configuration options, such as indentHeuristic. Signed-off-by: Marc Branchaud --- builtin/diff-files.c | 2 +- builtin/diff-index.c | 2 +- builtin/diff-tree.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git

[PATCH 1/2] Make the indent heuristic part of diff's basic configuration.

2017-04-27 Thread Marc Branchaud
Signed-off-by: Marc Branchaud --- diff.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/diff.c b/diff.c index 11eef1c85..da96577ea 100644 --- a/diff.c +++ b/diff.c @@ -290,9 +290,6 @@ int git_diff_ui_config(const char *var, const char *value,

Re: [PATCH] Add --indent-heuristic to bash completion.

2017-04-27 Thread SZEDER Gábor
> The patch adds BASH completion for a newly added option. There is a '--no-indent-heuristic' option, too, and a 'diff.indentHeuristic' config variable as well. I'm not sure it's worth it, though. As far as I remember the future plans for indent heuristics, this option and config variable are

Re: 30min Script in git 2.7.4 takes 22+ hrs in git 2.9.3

2017-04-27 Thread Jeff King
On Thu, Apr 27, 2017 at 04:09:56PM -0400, Jeff King wrote: > On Thu, Apr 27, 2017 at 12:36:54PM -0400, Robert Stryker wrote: > > > The problem: the script takes 30 minutes for one environment > > including git 2.7.4, and generates a repo of about 30mb. When run by > > a coworker using git

Re: What's cooking in git.git (Apr 2017, #06; Wed, 26)

2017-04-27 Thread René Scharfe
Am 27.04.2017 um 04:54 schrieb Junio C Hamano: > * rs/large-zip (2017-04-24) 5 commits >(merged to 'next' on 2017-04-26 at a6beab60f2) > + archive-zip: support files bigger than 4GB > + archive-zip: support archives bigger than 4GB > + archive-zip: write ZIP dir entry directly to strbuf

Re: push fails with return code 22

2017-04-27 Thread Jeff King
On Thu, Apr 27, 2017 at 02:37:19PM -0400, Andrew Watson wrote: > I'm trying to setup git with Smart HTTP so we can move off of SVN. > > I've used the blog post: https://git-scm.com/blog/2010/03/04/smart-http.html I'm not sure how that post will have aged. You might check your setup against the

Re: 30min Script in git 2.7.4 takes 22+ hrs in git 2.9.3

2017-04-27 Thread Jeff King
On Thu, Apr 27, 2017 at 12:36:54PM -0400, Robert Stryker wrote: > The problem: the script takes 30 minutes for one environment > including git 2.7.4, and generates a repo of about 30mb. When run by > a coworker using git 2.9.3, it takes 22+ hours and generates a 10gb > repo. > > Clearly

Re: [PATCH v3 4/5] archive-zip: support archives bigger than 4GB

2017-04-27 Thread René Scharfe
Am 27.04.2017 um 06:57 schrieb Peter Krefting: > René Scharfe: >> Windows XP. Don't laugh. ;) > > You can always install 7-zip or something to extract on XP. Sure, but if we were to start emitting zip64 records regardless of the size of entries then we'd break compatibility. We should have a

Re: [RFC/PATCH v3 5/5] WIP clone: add a --[no-]recommend-tags & submodule.NAME.tags config

2017-04-27 Thread Stefan Beller
On Wed, Apr 26, 2017 at 4:12 PM, Ævar Arnfjörð Bjarmason wrote: > @@ -855,7 +856,7 @@ static int prepare_to_clone_next_submodule(const struct > cache_entry *ce, > argv_array_pushl(>args, "--prefix", suc->prefix, NULL); > if (suc->recommend_shallow &&

push fails with return code 22

2017-04-27 Thread Andrew Watson
Hi, I'm trying to setup git with Smart HTTP so we can move off of SVN. I've used the blog post: https://git-scm.com/blog/2010/03/04/smart-http.html I'm getting "error: Cannot access URL ... return code 22" when I try to push. Clone works fine. I verified authentication by replacing my LDAP

Re: [PATCH v3 4/5] clone: add a --no-tags-submodules to pass --no-tags to submodules

2017-04-27 Thread Stefan Beller
On Wed, Apr 26, 2017 at 4:12 PM, Ævar Arnfjörð Bjarmason wrote: > From: Brandon Williams > > Add a --no-tags-submodules which does for --no-tags what the existing > --shallow-submodules does for --depth, i.e. doing: > > git clone --recurse-submodules

Re: [PATCH v3 3/5] tests: rename a test having to do with shallow submodules

2017-04-27 Thread Stefan Beller
On Wed, Apr 26, 2017 at 4:12 PM, Ævar Arnfjörð Bjarmason wrote: > Rename the t5614-clone-submodules.sh test to > t5614-clone-submodules-shallow.sh. It's not a general test of > submodules, but of shallow cloning in relation to submodules. Move it > to create another similar

Re: [PATCH v3 2/5] clone: add a --no-tags option to clone without tags

2017-04-27 Thread Stefan Beller
On Wed, Apr 26, 2017 at 4:12 PM, Ævar Arnfjörð Bjarmason wrote: > Add a --no-tags option to clone without fetching any tags. > > Without this change there's no easy way to clone a repository without > also fetching its tags. > > When supplying --single-branch the primary remote

Re: [PATCH 07/15] remote.c: report error on failure to fopen()

2017-04-27 Thread Johannes Sixt
Am 27.04.2017 um 11:14 schrieb Duy Nguyen: On Thu, Apr 27, 2017 at 12:07 PM, Johannes Sixt wrote: Am 27.04.2017 um 02:57 schrieb Junio C Hamano: Johannes Sixt writes: +++ git ls-remote 'refs*master' +warning: unable to access '.git/branches/refs*master':

Re: [PATCH 00/26] Address a couple of issues identified by Coverity

2017-04-27 Thread Johannes Sixt
Am 26.04.2017 um 22:19 schrieb Johannes Schindelin: I recently registered the git-for-windows fork with Coverity to ensure that even the Windows-specific patches get some static analysis love. While at it, I squashed a couple of obvious issues in the part that is not Windows-specific. Thanks

Re: [PATCH 22/26] add_reflog_for_walk: avoid memory leak

2017-04-27 Thread Johannes Sixt
Am 26.04.2017 um 22:21 schrieb Johannes Schindelin: We free()d the `log` buffer when dwim_log() returned 1, but not when it returned a larger value (which meant that it still allocated the buffer but we simply ignored it). Identified by Coverity. Signed-off-by: Johannes Schindelin

GOOD DAY.

2017-04-27 Thread CHENGSHAN
-- Did you receive my email, reply via ( chenginsh...@gmail.com ) for further details.

Re: [PATCH 20/26] line-log: avoid memory leak

2017-04-27 Thread Johannes Sixt
Am 26.04.2017 um 22:21 schrieb Johannes Schindelin: Discovered by Coverity. Signed-off-by: Johannes Schindelin --- line-log.c | 1 + 1 file changed, 1 insertion(+) diff --git a/line-log.c b/line-log.c index a23b910471b..19d46e9ea2c 100644 --- a/line-log.c +++

Re: [PATCH] read-cache: close index.lock in do_write_index

2017-04-27 Thread Jeff Hostetler
On 4/26/2017 11:13 PM, Jeff King wrote: On Wed, Apr 26, 2017 at 10:05:23PM +0200, Johannes Schindelin wrote: From: Jeff Hostetler Teach do_write_index() to close the index.lock file before getting the mtime and updating the istate.timestamp fields. On Windows, a

Re: [PATCH] read-cache: close index.lock in do_write_index

2017-04-27 Thread Jeff Hostetler
On 4/26/2017 11:21 PM, Junio C Hamano wrote: Johannes Schindelin writes: From: Jeff Hostetler Teach do_write_index() to close the index.lock file before getting the mtime and updating the istate.timestamp fields. On Windows, a file's

Re: [PATCH 18/26] fast-export: avoid leaking memory in handle_tag()

2017-04-27 Thread Johannes Sixt
Am 26.04.2017 um 22:21 schrieb Johannes Schindelin: Reported by, you guessed it, Coverity. Signed-off-by: Johannes Schindelin --- builtin/fast-export.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index

Re: [PATCH] Add --indent-heuristic to bash completion.

2017-04-27 Thread Stefan Beller
On Thu, Apr 27, 2017 at 2:09 AM, Martin Liška wrote: > On 04/26/2017 09:38 PM, Stefan Beller wrote: >> On Tue, Apr 25, 2017 at 4:37 AM, Martin Liška wrote: >>> Hello. >>> >>> The patch adds BASH completion for a newly added option. >>> >> >> The looks good, though

30min Script in git 2.7.4 takes 22+ hrs in git 2.9.3

2017-04-27 Thread Robert Stryker
Hi all: The following script attempts to merge 4 git repos into one, maintaining tag and branch content (but not SHAs). Each original repo basically gets its own subfolder in the new one. Original repos are first rewritten to have their history think they always belonged in the target subfolder.

Re: [PATCH v3 4/5] clone: add a --no-tags-submodules to pass --no-tags to submodules

2017-04-27 Thread Brandon Williams
On 04/26, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > > > From: Brandon Williams > > > > Add a --no-tags-submodules which does for --no-tags what the existing > > --shallow-submodules does for --depth, i.e. doing: > > > > git clone

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

2017-04-27 Thread Johannes Schindelin
Hi Junio, On Wed, 26 Apr 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > diff --git a/sequencer.c b/sequencer.c > > index 77afecaebf0..e858a976279 100644 > > --- a/sequencer.c > > +++ b/sequencer.c > > @@ -2388,3 +2388,48 @@ void

Re: [PATCH v2] git-gui--askpass: generalize the wording

2017-04-27 Thread Johannes Schindelin
+ Pat On Thu, 27 Apr 2017, Sebastian Schuberth wrote: > + Pat > > On 2017-04-27 08:38, Sebastian Schuberth wrote: > > > git-gui--askpass is not only used for SSH authentication, but also for > > HTTPS. In that context it is confusing to only rfer to "OpenSSH", also > > because another SSH

Re: [PATCH] rebase -i: reread the todo list if `exec` touched it

2017-04-27 Thread Johannes Schindelin
Hi Steve, On Wed, 26 Apr 2017, Steve Hicks wrote: > On Wed, Apr 26, 2017 at 12:17 PM, Johannes Schindelin > wrote: > > From: Stephen Hicks > > > > In the scripted version of the interactive rebase, there was no > > internal representation of the

Re: Possible regression in git-http-backend

2017-04-27 Thread Jeff King
On Tue, Apr 25, 2017 at 05:39:16PM -0600, Daniel Wallace wrote: > I am not sure if this is a regression or not, but I wanted to get feedback. > > It looks like this commit changed some behavior in git-http-backend > >

Re: [PATCH v2] git-gui--askpass: generalize the wording

2017-04-27 Thread Sebastian Schuberth
+ Pat On 2017-04-27 08:38, Sebastian Schuberth wrote: git-gui--askpass is not only used for SSH authentication, but also for HTTPS. In that context it is confusing to only rfer to "OpenSSH", also because another SSH client like PuTTY might be in use. So generalize wording and also say which

Re: [PATCH 07/15] remote.c: report error on failure to fopen()

2017-04-27 Thread Duy Nguyen
On Thu, Apr 27, 2017 at 12:07 PM, Johannes Sixt wrote: > Am 27.04.2017 um 02:57 schrieb Junio C Hamano: >> >> Johannes Sixt writes: >> >>> +++ git ls-remote 'refs*master' >>> +warning: unable to access '.git/branches/refs*master': Invalid argument >>> fatal:

Re: [PATCH] Add --indent-heuristic to bash completion.

2017-04-27 Thread Martin Liška
On 04/26/2017 09:38 PM, Stefan Beller wrote: > On Tue, Apr 25, 2017 at 4:37 AM, Martin Liška wrote: >> Hello. >> >> The patch adds BASH completion for a newly added option. >> > > The looks good, though the format is unusual. (We prefer the > format to be inline instead of an

Re: [PATCH v2] status: add color config slots for branch info in "--short --branch"

2017-04-27 Thread Jeff King
On Fri, Apr 21, 2017 at 10:42:02PM -0700, Stephen Kent wrote: > Add color config slots to be used in the status short-format when > displaying local and remote tracking branch information. > > Signed-off-by: Stephen Kent This looks good to me, and I'd be happy if we took it

[PATCH] status: fix missing newline when comment chars are disabled

2017-04-27 Thread Jeff King
When git-status shows tracking data for the current branch in the long format, we try to end the stanza with a blank line. When status.displayCommentPrefix is true, we call color_fprintf_ln() to do so. But when it's false, we call the enigmatic: fputs("", s->fp); which does nothing at all!

Re: [PATCH] Add color slots for branch names in "git status --short --branch"

2017-04-27 Thread Jeff King
On Fri, Apr 21, 2017 at 10:40:30PM -0700, Stephen Kent wrote: > I've updated the commit message and updated one of the existing unit tests > for this feature. Patch version 2 will follow shortly after this email. Thanks, and sorry for the slow reply. > There is an existing color slot

git loses a commit after reordering.

2017-04-27 Thread Nikita Orlov
Hello, my name is Nikita (male). Could you explain this (subject) is a bug or a feature? I follow Pro Git Reordering Commits (https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History) to reorder commits and lose one without any conflict. I've got git under Windows 10 Enterprise 64-bit

Re: [PATCH v3 4/9] rebase -i: also expand/collapse the SHA-1s via the rebase--helper

2017-04-27 Thread Junio C Hamano
Junio C Hamano writes: > Johannes Schindelin writes: > >> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh >> index 214af0372ba..52a19e0bdb3 100644 >> --- a/git-rebase--interactive.sh >> +++ b/git-rebase--interactive.sh >> @@

Re: [PATCH 12/26] checkout: fix memory leak

2017-04-27 Thread Junio C Hamano
Johannes Schindelin writes: > Discovered via Coverity. > > Signed-off-by: Johannes Schindelin > --- > builtin/checkout.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/builtin/checkout.c b/builtin/checkout.c > index

[PATCH v2] git-gui--askpass: generalize the wording

2017-04-27 Thread Sebastian Schuberth
git-gui--askpass is not only used for SSH authentication, but also for HTTPS. In that context it is confusing to only rfer to "OpenSSH", also because another SSH client like PuTTY might be in use. So generalize wording and also say which parent process, i.e. Git, requires authentication.

Re: [PATCH 14/26] setup_bare_git_dir(): fix memory leak

2017-04-27 Thread Johannes Sixt
Am 26.04.2017 um 22:20 schrieb Johannes Schindelin: Reported by Coverity. Signed-off-by: Johannes Schindelin --- setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.c b/setup.c index 0309c278218..0320a9ad14c 100644 --- a/setup.c +++

Re: [PATCH 10/26] Check for EOF while parsing mails

2017-04-27 Thread Jeff King
On Wed, Apr 26, 2017 at 10:20:16PM +0200, Johannes Schindelin wrote: > diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c > index 30681681c13..c0d88f97512 100644 > --- a/builtin/mailsplit.c > +++ b/builtin/mailsplit.c > @@ -232,7 +232,7 @@ static int split_mbox(const char *file, const char

Re: [PATCH 10/26] Check for EOF while parsing mails

2017-04-27 Thread Johannes Sixt
Am 26.04.2017 um 22:20 schrieb Johannes Schindelin: Reported via Coverity. Signed-off-by: Johannes Schindelin --- builtin/mailsplit.c | 2 +- mailinfo.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/mailsplit.c

Re: [PATCH 06/26] get_mail_commit_oid(): avoid resource leak

2017-04-27 Thread Johannes Sixt
Am 26.04.2017 um 22:19 schrieb Johannes Schindelin: When we fail to read, or parse, the file, we still want to close the file descriptor and release the strbuf. Reported via Coverity. Signed-off-by: Johannes Schindelin --- builtin/am.c | 11 ++- 1 file

Re: [PATCH 11/26] cat-file: fix memory leak

2017-04-27 Thread Junio C Hamano
Johannes Schindelin writes: > Discovered by Coverity. > > Signed-off-by: Johannes Schindelin > --- > builtin/cat-file.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/builtin/cat-file.c b/builtin/cat-file.c > index

Re: [PATCH 10/26] Check for EOF while parsing mails

2017-04-27 Thread Junio C Hamano
Johannes Schindelin writes: > Reported via Coverity. > > Signed-off-by: Johannes Schindelin > --- > builtin/mailsplit.c | 2 +- > mailinfo.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Good find. I'd retitle with

Re: [PATCH 08/26] difftool: close file descriptors after reading

2017-04-27 Thread Junio C Hamano
Johannes Schindelin writes: > Spotted by Coverity. > > Signed-off-by: Johannes Schindelin > --- > builtin/difftool.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/builtin/difftool.c b/builtin/difftool.c > index

Re: [PATCH 07/26] http-backend: avoid memory leaks

2017-04-27 Thread Junio C Hamano
Johannes Schindelin writes: > Reported via Coverity. > > Signed-off-by: Johannes Schindelin > --- > http-backend.c | 6 +- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/http-backend.c b/http-backend.c > index