Re: [PATCH 1/2] archive: replace write_or_die() calls with write_block_or_die()

2019-04-13 Thread Rohit Ashiwal
Hey jch! I'll change the signature of the function in next revision. Thanks Rohit

Re: [PATCH 1/2] archive: replace write_or_die() calls with write_block_or_die()

2019-04-13 Thread Rohit Ashiwal
Hey Peff! On 2019-04-13 1:34 UTC Jeff King wrote: > What is gzwrite()? > [...] > I think it would be less confusing if this just factored out > write_block_or_die(), which starts as a thin wrapper and then grows the > gzip parts in the next patch. You are right, it might appear to someone as a

Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)

2019-04-13 Thread Junio C Hamano
Christian Couder writes: > I can send a new version where the top two commits have the following titles: > > - replace: peel tag when passing a tag first to --graft > - replace: peel tag when passing a tag as parent to --graft If/when there are other things that needs fixing in the series, t

Re: [PATCH v6 6/6] blame: use a fingerprint heuristic to match ignored lines

2019-04-13 Thread Junio C Hamano
Barret Rhoden writes: > This replaces the heuristic used to identify lines from ignored commits > with one that finds likely candidate lines in the parent's version of > the file. > > The old heuristic simply assigned lines in the target to the same line > number (plus offset) in the parent. The

Re: [PATCH v6 4/6] blame: add config options to handle output for ignored lines

2019-04-13 Thread Junio C Hamano
Barret Rhoden writes: > Sometimes we are unable to even guess at what commit touched a line. > These lines are 'unblamable.' The second option, > blame.maskIgnoredUnblamables, will zero the hash of any unblamable line. > > For example, say we ignore e5e8d36d04cbe: > e5e8d36d04cbe (Barret R

Re: [PATCH v2 8/8] tests: disallow the use of abbreviated options (by default)

2019-04-13 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > + disallow_abbreviated_options = > + git_env_bool("GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS", 0); ... which means that the value of the environment variable follows the usual "true, yes and 1 all activate it"; very good, > diff --git

Re: [BUG] rebase --interactive silently overwrites ignored files

2019-04-13 Thread wh
Thanks for the info about the upcoming "precious" attribute. Looks useful. I didn't get the impression that Git normally overwrites ignored files. I ran some more experiments: git rebase FETCH_HEAD# bails git rebase -i FETCH_HEAD # overwrites git merge FETCH_HEAD # bails git r

[PATCH v2] send-email: default to quoted-printable when CR is present

2019-04-13 Thread brian m. carlson
In 7a36987fff ("send-email: add an auto option for transfer encoding", 2018-07-08), git send-email learned how to automatically determine the transfer encoding for a patch. However, the only criterion considered was the length of the lines. Another case we need to consider is that of carriage retu

Re: [PATCH 2/2] archive: avoid spawning `gzip`

2019-04-13 Thread brian m. carlson
On Fri, Apr 12, 2019 at 09:51:02PM -0400, Jeff King wrote: > I wondered how you were going to kick this in, since users can define > arbitrary filters. I think it's kind of neat to automagically convert > "gzip -cn" (which also happens to be the default). But I think we should > mention that in the

Re: [PATCH 2/2] archive: avoid spawning `gzip`

2019-04-13 Thread René Scharfe
Am 13.04.2019 um 03:51 schrieb Jeff King: > On Fri, Apr 12, 2019 at 04:04:40PM -0700, Rohit Ashiwal via GitGitGadget > wrote: > >> From: Rohit Ashiwal >> >> As we already link to the zlib library, we can perform the compression >> without even requiring gzip on the host machine. > > Very cool. It

Re: [BUG] GIT_SSH_COMMAND is not being decomposed

2019-04-13 Thread SZEDER Gábor
On Sat, Apr 13, 2019 at 10:39:35PM +0200, Ævar Arnfjörð Bjarmason wrote: > > On Sat, Apr 13 2019, Randall S. Becker wrote: > > > I am encountering a problem on one of our NonStop platform variants where > > the GIT_SSH_COMMAND string is not being broken into constituent parts. This > > is causing

Re: [PATCH v3 0/4] rebase: teach rebase --keep-base

2019-04-13 Thread Ævar Arnfjörð Bjarmason
On Sat, Apr 06 2019, Denton Liu wrote: > On Sat, Apr 06, 2019 at 09:44:49PM +0200, Ævar Arnfjörð Bjarmason wrote: >> >> On Mon, Apr 01 2019, Denton Liu wrote: >> >> > Thanks again for your feedback, Ævar! I think we're both on the same page >> > now. >> > Hopefully I've addressed all of your hi

RE: [BUG] GIT_SSH_COMMAND is not being decomposed

2019-04-13 Thread Randall S. Becker
On April 13, 2019 16:40, Ævar Arnfjörð Bjarmason wrote: > On Sat, Apr 13 2019, Randall S. Becker wrote: > > > I am encountering a problem on one of our NonStop platform variants > > where the GIT_SSH_COMMAND string is not being broken into constituent > > parts. This is causing SSH to not run prop

Re: [BUG] GIT_SSH_COMMAND is not being decomposed

2019-04-13 Thread Ævar Arnfjörð Bjarmason
On Sat, Apr 13 2019, Randall S. Becker wrote: > I am encountering a problem on one of our NonStop platform variants where > the GIT_SSH_COMMAND string is not being broken into constituent parts. This > is causing SSH to not run properly. As background, SSH is not in a standard > location and has

[BUG] GIT_SSH_COMMAND is not being decomposed

2019-04-13 Thread Randall S. Becker
I am encountering a problem on one of our NonStop platform variants where the GIT_SSH_COMMAND string is not being broken into constituent parts. This is causing SSH to not run properly. As background, SSH is not in a standard location and has non-standard required arguments. This also occurs with c

Re: Repositories stucture

2019-04-13 Thread Mateusz Loskot
On Sat, 13 Apr 2019 at 07:32, Mgr Georg Black wrote: > People from big company(BC) wanna to have only one big repository with all > code in it. BC wanna have to folders structure for language and projects. But > for us is that idea bit uncomfortable because we rather have more > repositories by

[PATCH v3 1/1] Use size_t instead of 'unsigned long' for data in memory

2019-04-13 Thread tboegi
From: Torsten Bögershausen Currently the length of data which is stored in memory is stored in "unsigned long" at many places in the code base. This is OK when both "unsigned long" and size_t are 32 bits, (and is OK when both are 64 bits). On a 64 bit Windows system am "unsigned long" is 32 bit,

Re: [PATCH v3 00/33] nd/sha1-name-c-wo-the-repository updates

2019-04-13 Thread Duy Nguyen
On Sat, Apr 13, 2019 at 7:14 PM SZEDER Gábor wrote: > > On Fri, Apr 12, 2019 at 04:25:08PM +0200, Johannes Schindelin wrote: > > Hi, > > > > On Fri, 12 Apr 2019, SZEDER Gábor wrote: > > > > > On Thu, Apr 11, 2019 at 10:58:57PM +0200, SZEDER Gábor wrote: > > > > On Thu, Apr 11, 2019 at 10:51:46PM +

Re: [PATCH v3* 11/33] commit.c: add repo_get_commit_tree()

2019-04-13 Thread SZEDER Gábor
On Sat, Apr 13, 2019 at 05:16:00PM +0700, Nguyễn Thái Ngọc Duy wrote: > OK how about this? set_commit_tree() is added to keeps that long line > in commit.cocci down. I also make commit.cocci generate invalid > repo_get_commit_tree() code this time. > diff --git a/contrib/coccinelle/commit.cocci

Re: [PATCH v3 00/33] nd/sha1-name-c-wo-the-repository updates

2019-04-13 Thread SZEDER Gábor
On Fri, Apr 12, 2019 at 04:25:08PM +0200, Johannes Schindelin wrote: > Hi, > > On Fri, 12 Apr 2019, SZEDER Gábor wrote: > > > On Thu, Apr 11, 2019 at 10:58:57PM +0200, SZEDER Gábor wrote: > > > On Thu, Apr 11, 2019 at 10:51:46PM +0200, SZEDER Gábor wrote: > > > > On Wed, Apr 10, 2019 at 10:56:52P

Re: [PATCH v2 00/16] Add new command 'restore'

2019-04-13 Thread Duy Nguyen
On Fri, Apr 12, 2019 at 12:14 PM Junio C Hamano wrote: > > - git-rm learns about --staged as an alias of --cached (in fact it's > > more the other way around). This is to keep suggestions consistent > > because we tell people to do "git foo --staged" everywhere. > > I am not sure 100% about th

Re: [PATCH] Introduce "precious" file concept

2019-04-13 Thread Duy Nguyen
I've had enough. Please drop this nd/precious. I'm not updating it anymore. On Sat, Apr 13, 2019 at 4:54 AM Ævar Arnfjörð Bjarmason wrote: > > > On Tue, Apr 09 2019, Nguyễn Thái Ngọc Duy wrote: > > > Here's the replacement patch that keeps "git clean" behavior the same > > as before and only ch

[PATCH v3* 11/33] commit.c: add repo_get_commit_tree()

2019-04-13 Thread Nguyễn Thái Ngọc Duy
Remove the implicit dependency on the_repository in this function. It will be used in sha1-name.c functions when they are updated to take any 'struct repository'. get_commit_tree() remains as a compat wrapper, to be slowly replaced later. set_commit_tree() is added just to simplify the filtering i

Re: fatal: unable to read after commit - deeper analysis

2019-04-13 Thread Klaus Ethgen
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Hi, I did a deep analysis of the problem and found that the trouble finally was caused of some change in git (I did not search, when this changed. But maybe you can tell me.) Finally, the error was a combination of 4 tools, git, vim, the mentioned

Re: [PATCH 1/2] t9822: skip tests if file names cannot be ISO-8895-1 encoded

2019-04-13 Thread Luke Diamand
On Fri, 12 Apr 2019 at 12:39, Johannes Schindelin via GitGitGadget wrote: > > From: Johannes Schindelin > > Most notably, it seems that macOS' APFS does not allow that. Did you mean in the subject "ISO-8895-1" encoded or "ISO-8859-1" encoded? It seems reasonable other than that! > > Signed-off