Re: [PATCH] Replaced read with xread in transport-helper.c to fix SSIZE_MAX overun in t5509

On Thu, Jan 11, 2018 at 12:40:05AM -0500, Randall S. Becker wrote: > diff --git a/transport-helper.c b/transport-helper.c > index 3640804..68a4e30 100644 > --- a/transport-helper.c > +++ b/transport-helper.c > @@ -1202,7 +1202,7 @@ static int udt_do_read(struct unidirectional_transfer > *t) >

Re: [PATCH] Replaced read with xread in transport-helper.c to fix SSIZE_MAX overun in t5509

On Thu, Jan 11, 2018 at 12:40:05AM -0500, Randall S. Becker wrote: > This fix was needed on HPE NonStop NSE where SSIZE_MAX is less than > BUFFERSIZE resulting in EINVAL. The call to read in transport-helper.c > was the only place outside of wrapper.c. For my own curiosity, what is SSIZE_MAX on

RE: [PATCH] Replaced read with xread in transport-helper.c to fix SSIZE_MAX overun in t5509

On January 11, 2018 12:40 AM, I wrote: > Subject: [PATCH] Replaced read with xread in transport-helper.c to fix > SSIZE_MAX overun in t5509 > > This fix was needed on HPE NonStop NSE where SSIZE_MAX is less than > BUFFERSIZE resulting in EINVAL. The call to read in transport-helper.c > was the

[PATCH] Replaced read with xread in transport-helper.c to fix SSIZE_MAX overun in t5509

This fix was needed on HPE NonStop NSE where SSIZE_MAX is less than BUFFERSIZE resulting in EINVAL. The call to read in transport-helper.c was the only place outside of wrapper.c. Signed-off-by: Randall S. Becker --- transport-helper.c | 2 +- 1 file changed, 1

Re: [PATCH] bisect: debug: convert struct object to object_id

On Tue, Jan 09, 2018 at 08:03:56PM +0900, Yasushi SHOJI wrote: > The commit f2fd0760f62e79609fef7bfd7ecebb002e8e4ced converted struct > object to object_id but a debug function show_list(), which is > ifdef'ed to noop, in bisect.c wasn't. > > So fix it. Thanks. This is obviously the right

Re: [PATCH 26/26] remote-curl: implement connect-half-duplex command

On 01/10, Jonathan Tan wrote: > On Tue, 2 Jan 2018 16:18:28 -0800 > Brandon Williams wrote: > > > +static size_t proxy_in(void *ptr, size_t eltsize, > > + size_t nmemb, void *buffer_) > > OK, I managed to look at the Curl stuff in more detail. > > I know

git svn clone of messy repository

Hi, I'm in the process of using git svn to migrate several repos over to git and one repo, in particular, has a very challenging format. During the migration, I would also like to reorganize the repo. It looks something like this in svn: myrepo trunk project_of_interest other_project1

Re: [PATCH 00/26] protocol version 2

On 01/09, Jonathan Tan wrote: > On Tue, 2 Jan 2018 16:18:02 -0800 > Brandon Williams wrote: > > > * Introduce a new remote-helper command 'connect-half-duplex' which is > >implemented by remote-curl (the http remote-helper). This allows for a > >client to establish

Re: Test failure for v2.16.0-rc0 on cygwin

On 04/01/18 20:55, Johannes Schindelin wrote: > On Tue, 2 Jan 2018, Ramsay Jones wrote: [snip] >> Also, when logged-in remotely it fails consistently, when logged-in >> directly it passes consistently. :-D > > You are most likely hitting cmd.exe at some point there. In cmd.exe, there > are some

Re: [PATCH v2] t3900: add some more quotes

Hi Beat, On Wed, 10 Jan 2018, Beat Bolli wrote: > diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh > index 9e4e694d9..dc00db87b 100755 > --- a/t/t3900-i18n-commit.sh > +++ b/t/t3900-i18n-commit.sh > @@ -40,7 +40,7 @@ test_expect_success 'UTF-16 refused because of NULs' ' > ' > >

Re: [PATCH v2] t3900: add some more quotes

Beat Bolli writes: > In 89a70b80 ("t0302 & t3900: add forgotten quotes", 2018-01-03), quotes > were added to protect against spaces in $HOME. In the test_when_finished > handler, two files are deleted which must be quoted individually. > > Signed-off-by: Beat Bolli

Re: [PATCH v5 8/9] sequencer: try to commit without forking 'git commit'

Hi, On Wed, 10 Jan 2018, Jonathan Nieder wrote: > Phillip Wood wrote: > > > From: Phillip Wood > > > > If the commit message does not need to be edited then create the > > commit without forking 'git commit'. Taking the best time of ten runs > > with a warm cache

[PATCH v2] t3900: add some more quotes

In 89a70b80 ("t0302 & t3900: add forgotten quotes", 2018-01-03), quotes were added to protect against spaces in $HOME. In the test_when_finished handler, two files are deleted which must be quoted individually. Signed-off-by: Beat Bolli --- Diff to v1: s/hander/handler/ in

Re: [PATCH 1/2] cat-file doc: document that -e will return some output

Junio C Hamano writes: > Ævar Arnfjörð Bjarmason writes: > >> The -e option added in 7950571ad7 ("A few more options for >> git-cat-file", 2005-12-03) has always errored out with message on >> stderr saying that the provided object is malformed, currently:

Re: What's cooking in git.git (Jan 2018, #02; Tue, 9)

On 1/10/2018 2:57 PM, Junio C Hamano wrote: Jeff Hostetler writes: On 1/9/2018 6:33 PM, Junio C Hamano wrote: -- [Cooking] * jh/fsck-promisors (2017-12-08) 10 commits [...] * jh/partial-clone (2017-12-08) 13

Re: [PATCH v1 2/2] submodule: port submodule subcommand 'deinit' from shell to C

Prathamesh Chavan writes: > Thanks for pointing out that we can introduce the flag > REMOVE_DIR_KEEP_TOPLEVEL > which solves the issue. And for the case where no directory exists: we > create an empty > directory.Since this won't be similar to what happens in the shell >

Re: [PATCH 1/2] cat-file doc: document that -e will return some output

Ævar Arnfjörð Bjarmason writes: > The -e option added in 7950571ad7 ("A few more options for > git-cat-file", 2005-12-03) has always errored out with message on > stderr saying that the provided object is malformed, currently: > > $ git cat-file -e malformed; echo $? >

Re: [PATCH] t3900: add some more quotes

Jeff King writes: > Yeah. One of the reasons for both of the errors in this thread is the > nested double-quoting. Using single quotes is awkward because we're > already using them to delimit the whole snippet. I've often wondered if > our tests would be more readable taking the

Re: prepare-commit-msg hook no longer run for cherry-pick?

Dmitry Torokhov writes: > Right, so it looks like the master works well, it is next(?) branch > that is troublesome (apparently we pack experimental internally?). > > I bisected it down to: > > commit 356ee4659bb551cd9464b317d691827276752c2d (refs/bisect/bad) > Author:

Re: [RFC PATCH 00/18] Multi-pack index (MIDX)

On Wednesday, January 10, 2018 02:39:13 PM Derrick Stolee wrote: > On 1/10/2018 1:25 PM, Martin Fick wrote: > > On Sunday, January 07, 2018 01:14:41 PM Derrick Stolee > > > > wrote: > >> This RFC includes a new way to index the objects in > >> multiple packs using one file, called the multi-pack

information required

-- Thanks for your last email response to me. The information required should include the following-: Your full names Your address Telephone number Your private email Occupation Age This is to enable my further discussion with you in confidence. Best regards and wishes to you. Mohammad Amir

Re: [PATCH v5 8/9] sequencer: try to commit without forking 'git commit'

Hi, Phillip Wood wrote: > From: Phillip Wood > > If the commit message does not need to be edited then create the > commit without forking 'git commit'. Taking the best time of ten runs > with a warm cache this reduces the time taken to cherry-pick 10 > commits by

Re: [PATCH 0/2] the cat-file -e option doesn't work as documented

Junio C Hamano writes: > I am kind of confused. > > When the doc there says "no output", I read it as "no output", and > no other restriction (like suppressing an error diagnosis, which is > not even sent to the standard output stream). Ah, OK, so you were saying with 1/2

Re: [PATCH v2 1/2] Doc/gitsubmodules: make some changes to improve readability and syntax

On Tue, Jan 9, 2018 at 10:49 PM, Kaartic Sivaraam wrote: > * Only mention porcelain commands in examples > > * Split a sentence for better readability > > * Add missing apostrophes > > * Clearly specify the advantages of using submodules > > * Avoid abbreviations > > *

Re: [PATCH 0/2] the cat-file -e option doesn't work as documented

Ævar Arnfjörð Bjarmason writes: > The -e option to cat-file will emit output, after promising not to. > > We should take either 1/2 or 2/2, but not both. I'm partial to just > documenting the existing behavior and dropping 2/2, it's useful to > know if you passed in something

Re: [PATCH v4 8/7] wildmatch test: skip file creation tests on Windows proper

Hi Duy, On Wed, 10 Jan 2018, Duy Nguyen wrote: > On Mon, Jan 08, 2018 at 01:25:04PM +0100, Johannes Schindelin wrote: > > I agree that it would make a ton of sense to use a proper, portable test > > framework written in pure, portable C. > > > > However, this ship has long sailed, hasn't it? >

Re: [PATCH v1 2/2] submodule: port submodule subcommand 'deinit' from shell to C

On Wed, Jan 10, 2018 at 2:54 AM, Junio C Hamano wrote: > Prathamesh Chavan writes: > >> The same mechanism is used even for porting this submodule >> subcommand, as used in the ported subcommands till now. >> The function cmd_deinit in split up after porting

Re: [PATCH v4 0/4] Add --no-ahead-behind to status

Jeff King writes: > To be clear, which approach are we talking about? I think there are > three options: > > 1. The user tells us not to bother computing real ahead/behind values. > We always say "same" or "not the same". > > 2. The user tells us not to bother computing

Re: [ANNOUNCE] Git v2.16.0-rc1

Johannes Schindelin writes: > No, the only thing that changed was the introduction of Git::Packet (and > t0021/*.perl uses that). And that Perl module is not yet installed. Ahh, that is the difference among other users of split(/:/, $ENV{GITPERLLIB}). Scripts other

Re: What's cooking in git.git (Jan 2018, #02; Tue, 9)

Ævar Arnfjörð Bjarmason writes: > On Tue, Jan 09 2018, Junio C. Hamano jotted: > >> * ab/wildmatch-tests (2018-01-04) 7 commits >> (merged to 'next' on 2018-01-09 at 09f0b84098) >> + wildmatch test: create & test files on disk in addition to in-memory >> + wildmatch test:

Re: What's cooking in git.git (Jan 2018, #02; Tue, 9)

Jeff Hostetler writes: > On 1/9/2018 6:33 PM, Junio C Hamano wrote: >> -- >> [Cooking] >> >> >> * jh/fsck-promisors (2017-12-08) 10 commits > [...] > >> * jh/partial-clone (2017-12-08) 13 commits > [...] > > Parts 2 and 3 of

Re: [PATCH] t3900: add some more quotes

On Wed, Jan 10, 2018 at 08:02:09PM +0100, Johannes Sixt wrote: > > diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh > > index 9e4e694d9..dc00db87b 100755 > > --- a/t/t3900-i18n-commit.sh > > +++ b/t/t3900-i18n-commit.sh > > @@ -40,7 +40,7 @@ test_expect_success 'UTF-16 refused because

Re: [PATCH/RFC] add--interactive: ignore all internal submodule changes

On Wed, Jan 10, 2018 at 3:06 AM, Nguyễn Thái Ngọc Duy wrote: > For 'add -i' and 'add -p' the only action we can take on a dirty > submodule entry (from the superproject perspective) is its SHA-1. The > content changes inside do not matter, at least until interactive add has >

Re: [PATCH] t3900: add some more quotes

Johannes Sixt writes: >> test_expect_success 'UTF-8 invalid characters refused' ' >> -test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" && >> +test_when_finished "rm -f \"$HOME/stderr\" \"$HOME/invalid\"" && > > Should that not better be > >

Re: [RFC PATCH 00/18] Multi-pack index (MIDX)

On 1/10/2018 1:25 PM, Martin Fick wrote: On Sunday, January 07, 2018 01:14:41 PM Derrick Stolee wrote: This RFC includes a new way to index the objects in multiple packs using one file, called the multi-pack index (MIDX). ... The main goals of this RFC are: * Determine interest in this

Re: [PATCH] run-command.c: print env vars when GIT_TRACE is set

On Wed, Jan 10, 2018 at 11:26 AM, Brandon Williams wrote: > On 01/10, Stefan Beller wrote: >> On Wed, Jan 10, 2018 at 10:09 AM, Brandon Williams wrote: >> > At first when i read this I was under the impression that the whole >> > environment was going to be

Re: [PATCH] run-command.c: print env vars when GIT_TRACE is set

On 01/10, Stefan Beller wrote: > On Wed, Jan 10, 2018 at 10:09 AM, Brandon Williams wrote: > > At first when i read this I was under the impression that the whole > > environment was going to be printed out...but i now realize that this > > tracing will only print out the

Re: prepare-commit-msg hook no longer run for cherry-pick?

On Tue, Jan 9, 2018 at 6:24 PM, Junio C Hamano wrote: > > Dmitry Torokhov writes: > > >> I had prepare-commit-msg hook that would scrub "Patchwork-ID: " tags > >> form commit messages and would update input mailing list patchwork to > >> mark

Re: [PATCH] run-command.c: print env vars when GIT_TRACE is set

On Wed, Jan 10, 2018 at 10:09 AM, Brandon Williams wrote: > On 01/10, Nguyễn Thái Ngọc Duy wrote: >> Occasionally submodule code could execute new commands with GIT_DIR set >> to some submodule. GIT_TRACE prints just the command line which makes it >> hard to tell that it's not

Re: [PATCH] t3900: add some more quotes

Am 10.01.2018 um 10:58 schrieb Beat Bolli: In 89a70b80 ("t0302 & t3900: add forgotten quotes", 2018-01-03), quotes were added to protect against spaces in $HOME. In the test_when_finished hander, two files are deleted which must be quoted individually. Signed-off-by: Beat Bolli

[BUG] Breakage in t5509 # 2 from read(stdin) EINVAL

Hi All, Here’s the situation. In the NonStop port, since time immemorial, we’ve had a breakage in 5509 that I’ve finally had the chance to track down. The error report at the breakage is: ./trash directory.t5509-fetch-push-namespaces/original: GIT_TRACE=true GIT_PACKET_TRACE=true

RE: [PATCH] Prototype PATH_MAX length detection in tests, demonstrated in t0001-init.sh

On January 10, 2018 1:16 PM, Johannes Sixt wrote: > Am 10.01.2018 um 01:12 schrieb Randall S. Becker: > > On January 9, 2018 6:01 PM, Johannes Sixt wrote: > > I'm encountering strange warnings, while looking into the details of what > test t0001 fails in spots. These include: > > #24 warning:

Re: [RFC PATCH 00/18] Multi-pack index (MIDX)

On Sunday, January 07, 2018 01:14:41 PM Derrick Stolee wrote: > This RFC includes a new way to index the objects in > multiple packs using one file, called the multi-pack > index (MIDX). ... > The main goals of this RFC are: > > * Determine interest in this feature. > > * Find other use cases

Re: [PATCH] Prototype PATH_MAX length detection in tests, demonstrated in t0001-init.sh

Am 10.01.2018 um 01:12 schrieb Randall S. Becker: > On January 9, 2018 6:01 PM, Johannes Sixt wrote: > I'm encountering strange warnings, while looking into the details of what > test t0001 fails in spots. These include: > #24 warning: templates not found x00...[lots of 0 >

Re: [PATCH] run-command.c: print env vars when GIT_TRACE is set

On 01/10, Nguyễn Thái Ngọc Duy wrote: > Occasionally submodule code could execute new commands with GIT_DIR set > to some submodule. GIT_TRACE prints just the command line which makes it > hard to tell that it's not really executed on this repository. > > Print env variables in this case. Note

Please reply immediately,

Dear Friend, I know that this message will look strange, surprising and probably unbelievable to you, but it is true and reality. I want to transfer the sum of: ￡35,000,000 (Thirty Five Million British Pounds) to you. THIS IS NOT A JOKE, but after reading if it does not interest you please

Re: [PATCH 26/26] remote-curl: implement connect-half-duplex command

On Tue, 2 Jan 2018 16:18:28 -0800 Brandon Williams wrote: > +static size_t proxy_in(void *ptr, size_t eltsize, > +size_t nmemb, void *buffer_) OK, I managed to look at the Curl stuff in more detail. I know that these parameter names are what

Re: [git-for-windows] Re: [ANNOUNCE] Git v2.16.0-rc1

Am 10.01.2018 um 18:37 schrieb Johannes Schindelin: On Tue, 9 Jan 2018, Junio C Hamano wrote: Johannes Schindelin writes: diff --git a/t/t0021/rot13-filter.pl b/t/t0021/rot13-filter.pl index f1678851de9..470107248eb 100644 --- a/t/t0021/rot13-filter.pl +++

Subject for default customers

Dear Sir or Madam, this is a default email message that gets sent out automatically in the licensed version. This is written in English and will be send out to all people if not some other template might match (e.g. the *@*.de one). As you may see here, you can use different tags like word1

Re: [PATCH] t3900: add some more quotes

On Wed, Jan 10, 2018 at 4:58 AM, Beat Bolli wrote: > In 89a70b80 ("t0302 & t3900: add forgotten quotes", 2018-01-03), quotes > were added to protect against spaces in $HOME. In the test_when_finished > hander, two files are deleted which must be quoted individually.

Re: [ANNOUNCE] Git v2.16.0-rc1

Hi Junio, On Tue, 9 Jan 2018, Junio C Hamano wrote: > Junio C Hamano writes: > > > Johannes Schindelin writes: > > > >> diff --git a/t/t0021/rot13-filter.pl b/t/t0021/rot13-filter.pl > >> index f1678851de9..470107248eb 100644 > >> ---

Re: [ANNOUNCE] Git v2.16.0-rc1

Hi Junio, On Tue, 9 Jan 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > diff --git a/t/t0021/rot13-filter.pl b/t/t0021/rot13-filter.pl > > index f1678851de9..470107248eb 100644 > > --- a/t/t0021/rot13-filter.pl > > +++ b/t/t0021/rot13-filter.pl > >

Re: [PATCH] t3900: add some more quotes

Hi, On Wed, 10 Jan 2018, Jeff King wrote: > On Wed, Jan 10, 2018 at 10:58:32AM +0100, Beat Bolli wrote: > > > In 89a70b80 ("t0302 & t3900: add forgotten quotes", 2018-01-03), quotes > > were added to protect against spaces in $HOME. In the test_when_finished > > hander, two files are deleted

Re: [RFC PATCH 00/18] Multi-pack index (MIDX)

Hi Stefan, On Tue, 9 Jan 2018, Stefan Beller wrote: > On Tue, Jan 9, 2018 at 5:05 AM, Johannes Schindelin > wrote: > > > Just to throw this out there: --abbrev=8! would be one possible > > convention to state "I want exactly 8 hex digits, don't bother > > checking

Re: upstreaming https://github.com/cgwalters/git-evtag ?

> > push for hash-agnosticity. I don't know if git-evtag is hash agnostic, > > but if it is not, then we have two transition plans to think about. > > I don't think there's even a question here: Git has to transition off > of SHA-1. > > In that context, Stefan's comment is a welcome one: once

Re: How to use multiple SSH keys on Git exe (not bash)

Aha, thanks, I'll go annoy them :P On 10 January 2018 at 16:29, Randall S. Becker wrote: > OpenSSH generally. Other providers (and platform providers) exist as well. It > is hard to know which is really involved, but not git. > >> -Original Message- >> From: Sam

RE: How to use multiple SSH keys on Git exe (not bash)

OpenSSH generally. Other providers (and platform providers) exist as well. It is hard to know which is really involved, but not git. > -Original Message- > From: Sam Millman [mailto:sam.mill...@gmail.com] > Sent: January 10, 2018 11:26 AM > To: Randall S. Becker

Re: How to use multiple SSH keys on Git exe (not bash)

Does the ssh.exe come from OpenSSH? I thought it was Git's implementation of the SSH protocol On 10 January 2018 at 16:23, Randall S. Becker wrote: > May I, with respect, ask you to take this to the OpenSSH email list? > (openssh-unix-...@mindrot.org) I think the

Re: What's cooking in git.git (Jan 2018, #02; Tue, 9)

On 1/9/2018 6:33 PM, Junio C Hamano wrote: -- [Cooking] * jh/fsck-promisors (2017-12-08) 10 commits [...] * jh/partial-clone (2017-12-08) 13 commits [...] Parts 2 and 3 of partial clone have been simmering for a while now. I was wondering

RE: How to use multiple SSH keys on Git exe (not bash)

May I, with respect, ask you to take this to the OpenSSH email list? (openssh-unix-...@mindrot.org) I think the discussion better belongs there and you're likely to get more detailed information from that team. Sincerely, Randall > -Original Message- > From: git-ow...@vger.kernel.org

RE: How to use multiple SSH keys on Git exe (not bash)

On January 10, 2018 11:01 AM Sam Millman wrote: > That would mean I would need to change the case for a letter everytime I > have a repo with a new key, that would mean I would be restricted to > 12 client repos at a time :\, seems very hacky to me > > On 10 January 2018 at 15:58, Randall S.

Re: How to use multiple SSH keys on Git exe (not bash)

I actually played a bit more and got this: Host * IdentityFile ~/.ssh/id_rsa_d IdentityFile ~/.ssh/id_rsa Host bitbucket_1 User git HostName bitbucket.org IdentityFile ~/.ssh/id_rsa_d Host bitbucket_2 User git HostName bitbucket.org IdentityFile ~/.ssh/id_rsa And from basic testing it seems to

Re: How to use multiple SSH keys on Git exe (not bash)

That would mean I would need to change the case for a letter everytime I have a repo with a new key, that would mean I would be restricted to 12 client repos at a time :\, seems very hacky to me On 10 January 2018 at 15:58, Randall S. Becker wrote: > On January 10, 2018

Re: How to use multiple SSH keys on Git exe (not bash)

On Wed, Jan 10 2018, Sam Millman jotted: > I am trying, for the sake of PhpStorm, to get multiple SSH keys > working using git . exe, which means no GitBash. > > I can get the keys to work just fine with GitBash. > > I edited my .ssh/config to look like (I know this is incorrect): > > Host

RE: How to use multiple SSH keys on Git exe (not bash)

On January 10, 2018 10:31 AM Sam Millman wrote: > I am trying, for the sake of PhpStorm, to get multiple SSH keys working using > git . exe, which means no GitBash. > > I can get the keys to work just fine with GitBash. > > I edited my .ssh/config to look like (I know this is incorrect): > >

Re: How to use multiple SSH keys on Git exe (not bash)

I am trying, for the sake of PhpStorm, to get multiple SSH keys working using git . exe, which means no GitBash. I can get the keys to work just fine with GitBash. I edited my .ssh/config to look like (I know this is incorrect): Host bitucket . org IdentityFile ~/.ssh/id_rsa1 Host bitbucket .

Re: [PATCH 0/4] "Fast-"track Git GUI changes

Hi, On Tue, 9 Jan 2018, Junio C Hamano wrote: > Junio C Hamano writes: > > > Johannes Schindelin writes: > > > >> As it seems to be impossible to get the attention of the Git GUI > >> maintainer these "days" (I have opened Pull Requests on

Re: merge-base --is-ancestor A B is unreasonably slow with unrelated history B

On Tue, Jan 09 2018, Derrick Stolee jotted: > On 1/9/2018 10:17 AM, Ævar Arnfjörð Bjarmason wrote: >> This is a pathological case I don't have time to dig into right now: >> >> git branch -D orphan; >> git checkout --orphan orphan && >> git reset --hard && >> touch foo && >>

Re: How to view diff when doing `git push --force`

> At this point, no, but in the future instead of --force use > --force-with-lease=: where is e.g. $(git > rev-parse HEAD). Thank you. But I have found next command to see what were changed. For example if someone did forced push and I wanna see changes before merge remote git log --graph

information required

-- Thanks for your last email response to me. The information required should include the following-: Your full names Your address Telephone number Your private email Occupation Age This is to enable my further discussion with you in confidence. Best regards and wishes to you. Mohammad Amir

[PATCH 0/2] the cat-file -e option doesn't work as documented

The -e option to cat-file will emit output, after promising not to. We should take either 1/2 or 2/2, but not both. I'm partial to just documenting the existing behavior and dropping 2/2, it's useful to know if you passed in something that didn't look like a SHA-1. But if others disagree we can

[PATCH 2/2] cat-file: -e should not emit output on stderr

Change "cat-file -e some-garbage" to work as documented. Before it would emit: $ git cat-file -e some-garbage; echo $? fatal: Not a valid object name some-garbage 128 Now: $ ./git-cat-file -e some-garbage; echo $? 1 This is a change to longstanding behavior established in

[PATCH 1/2] cat-file doc: document that -e will return some output

The -e option added in 7950571ad7 ("A few more options for git-cat-file", 2005-12-03) has always errored out with message on stderr saying that the provided object is malformed, currently: $ git cat-file -e malformed; echo $? fatal: Not a valid object name malformed 128 A careful

[PATCH/RFC] add--interactive: ignore all internal submodule changes

For 'add -i' and 'add -p' the only action we can take on a dirty submodule entry (from the superproject perspective) is its SHA-1. The content changes inside do not matter, at least until interactive add has --recurse-submodules or something. Ignore all dirty changes to reduce the questions 'add

Re: [RFC PATCH 00/18] Multi-pack index (MIDX)

On Tue, Jan 09, 2018 at 02:05:09PM +0100, Johannes Schindelin wrote: > > I think that could be easily worked around for rebase by asking git to > > check ambiguity during the conversion. > > Sure. > > It also points to a flaw in your reasoning, and you should take my example > further:

Re: [PATCH v4 8/7] wildmatch test: skip file creation tests on Windows proper

On Wed, Jan 10, 2018 at 5:38 PM, Adam Dinwoodie wrote: >> One disadvantage of this though, if this kind of framework does not >> get popular, then any new test feature must be added at both places >> but it's a waste of time to support both. So... > > I don't follow: if we end

[PATCH] run-command.c: print env vars when GIT_TRACE is set

Occasionally submodule code could execute new commands with GIT_DIR set to some submodule. GIT_TRACE prints just the command line which makes it hard to tell that it's not really executed on this repository. Print env variables in this case. Note that the code deliberately ignore variables

Re: [PATCH v4 8/7] wildmatch test: skip file creation tests on Windows proper

On Wednesday 10 January 2018 at 04:07 pm +0700, Duy Nguyen wrote: > On Mon, Jan 08, 2018 at 01:25:04PM +0100, Johannes Schindelin wrote: > > I agree that it would make a ton of sense to use a proper, portable test > > framework written in pure, portable C. > > > > However, this ship has long

Re: [PATCH] t3900: add some more quotes

On Wed, Jan 10, 2018 at 10:58:32AM +0100, Beat Bolli wrote: > In 89a70b80 ("t0302 & t3900: add forgotten quotes", 2018-01-03), quotes > were added to protect against spaces in $HOME. In the test_when_finished > hander, two files are deleted which must be quoted individually. Doh. I can't believe

[PATCH] t3900: add some more quotes

In 89a70b80 ("t0302 & t3900: add forgotten quotes", 2018-01-03), quotes were added to protect against spaces in $HOME. In the test_when_finished hander, two files are deleted which must be quoted individually. Signed-off-by: Beat Bolli --- t/t3900-i18n-commit.sh | 8

[PATCH v2 09/18] cat-file: simplify expand_atom function

Not sure, but looks like there is no need in that checking. There is a checking before whether it is null and we die in such case. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King ---

[PATCH v2 03/18] ref-filter: make valid_atom as function parameter

Make valid_atom as a function parameter, there could be another variable further. Need that for further reusing of formatting logic in cat-file.c. We do not need to allow users to pass their own valid_atom variable in global functions like verify_ref_format because in the end we want to have same

[PATCH v2 06/18] ref-filter: reuse parse_ref_filter_atom

Continue migrating formatting logic from cat-file to ref-filter. Reuse parse_ref_filter_atom for unifying all processes in ref-filter and further reducing of expand_atom_into_fields function. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder

[PATCH v2 04/18] cat-file: move struct expand_data into ref-filter

Need that for further reusing of formatting logic in cat-file. Have plans to get rid of using expand_data in cat-file at all, and use it only in ref-filter for collecting, formatting and printing needed data. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder

[PATCH v2 12/18] ref-filter: make populate_value global

Make function global for further using in cat-file. Also added return value for handling errors. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- ref-filter.c | 4 ++-- ref-filter.h | 3

[PATCH v2 13/18] cat-file: start reusing populate_value

Move logic related to getting object info from cat-file to ref-filter. It will help to reuse whole formatting logic from ref-filter further. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King

[PATCH v2 11/18] cat-file: start use ref_array_item struct

Moving from using expand_data to ref_array_item structure. That helps us to reuse functions from ref-filter easier. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- builtin/cat-file.c |

[PATCH v2 10/18] cat-file: get rid of duplicate checking

We could remove this because we have already checked that at verify_ref_format function in ref-filter. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- builtin/cat-file.c | 2 -- 1 file

[PATCH v2 07/18] cat-file: remove unused code

No further need in mark_query parameter. All logic related to expand_atom_into_fields is not needed here also, we are doing that in ref-filter. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King

[PATCH v2 17/18] cat-file: move skip_object_info into ref-filter

Move logic related to skip_object_info into ref-filter, so that cat-file does not use that field at all. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- builtin/cat-file.c | 7 +--

[PATCH v2 05/18] cat-file: start migrating to ref-filter

Start moving all formatting stuff from cat-file to ref-filter. Start from simple moving, it would be integrated into all ref-filter processes further. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King

[PATCH v2 02/18] cat-file: reuse struct ref_format

Start using ref_format struct instead of simple char*. Need that for further reusing of formatting logic from ref-filter. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King ---

[PATCH v2 18/18] ref-filter: make cat_file_info independent

Remove connection between expand_data variable in cat-file and in ref-filter. It will help further to get rid of using expand_data in cat-file. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King

[PATCH v2 01/18] cat-file: split expand_atom into 2 functions

Split expand_atom function into 2 different functions, expand_atom_into_fields prepares variable for further filling, (new) expand_atom creates resulting string. Need that for further reusing of formatting logic from ref-filter. Signed-off-by: Olga Telezhnaia

[PATCH v2 15/18] ref-filter: add is_cat flag

Add is_cat flag, further it helps to get rid of cat_file_data field in ref_format. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- builtin/cat-file.c | 1 + ref-filter.c | 8

[PATCH v2 14/18] ref-filter: get rid of expand_atom_into_fields

Remove expand_atom_into_fields function and create same logic in terms of ref-filter style. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- ref-filter.c | 45

[PATCH v2 16/18] ref_format: add split_on_whitespace flag

Add flag to ref_format struct so that we could pass needed info to cat-file. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- builtin/cat-file.c | 1 + ref-filter.c | 4 ++--

[PATCH v2 08/18] ref-filter: get rid of goto

Get rid of goto command in ref-filter for better readability. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- ref-filter.c | 103

Re: [PATCH] status: handle worktree renames

On Wed, Jan 3, 2018 at 4:14 AM, Jeff Hostetler wrote: > Also, does this introduce any new cases for reporting conflicts? > I haven't really thought about it too much yet, but if there was a > divergent rename in both branches of a merge, do we now have to handle > showing

Re: [PATCH v4 8/7] wildmatch test: skip file creation tests on Windows proper

On Mon, Jan 08, 2018 at 01:25:04PM +0100, Johannes Schindelin wrote: > I agree that it would make a ton of sense to use a proper, portable test > framework written in pure, portable C. > > However, this ship has long sailed, hasn't it? If you meant converting the whole test suite, oh yeah that's

  1   2   >