Re: [PATCHv3 4/4] clone: use free_refspec() to free refspec list

2017-05-23 Thread Jeff King
On Tue, May 23, 2017 at 04:38:07PM +0900, Junio C Hamano wrote: > > First, the unchanged commit message is now (i.e. by using the parsed > > refspecs returned by remote_get()) completely outdated. > > Second, while it properly frees those refspecs, i.e. the array and all > > its string fields, it

Re: [PATCH v2 0/2] Update sha1dc from upstream & optionally make it a submodule

2017-05-23 Thread Ævar Arnfjörð Bjarmason
On Tue, May 23, 2017 at 12:27 AM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> I liked the suggestion to make the URL a relative path, but this would >> require you to maintain a mirror in the same places you push git.git >> to, is that something you'd be willing to do? > > After

Re: [PATCH 0/2] Fix warnings on access of a remote with Windows paths

2017-05-23 Thread Johannes Schindelin
Hi Hannes (& Junio, see below), On Mon, 22 May 2017, Johannes Sixt wrote: > Am 22.05.2017 um 13:59 schrieb Johannes Schindelin: > > On Sat, 20 May 2017, Johannes Sixt wrote: > > > This small series fixes these warnings on Windows: > > > > > > C:\Temp\gittest>git fetch C:\Temp\gittest > > > warnin

Re: [PATCH 0/2] Fix warnings on access of a remote with Windows paths

2017-05-23 Thread Johannes Schindelin
Hi Hannes, On Mon, 22 May 2017, Johannes Sixt wrote: > Am 22.05.2017 um 16:01 schrieb Johannes Schindelin: > > On Mon, 22 May 2017, stefan.na...@atlas-elektronik.com wrote: > > > Am 20.05.2017 um 08:28 schrieb Johannes Sixt: > > > > This small series fixes these warnings on Windows: > > > > > > >

git --merge and option parsing

2017-05-23 Thread Holst, Henrik
Hi, I am not sure if this is a bug but it was surprising to me so I thought I'd report it here. I added `ui.column=auto` to my gitconfig and that does not work so well with pipes so I want to use `--no-column` option. I was a bit surprised that this does not work? It seems that `--merged` pick

Re: BUG: The .gitignore rules can't be made to cross submodule boundaries

2017-05-23 Thread Ævar Arnfjörð Bjarmason
On Tue, May 23, 2017 at 11:17 AM, Johannes Schindelin wrote: > Hi Ævar, > > On Mon, 22 May 2017, Ævar Arnfjörð Bjarmason wrote: > >> When I was adding the sha1collisiondetection submodule to git.git I >> noticed that building git would dirty the submodule. >> >> This is because our own Makefile ad

Hello beautiful, I'm just seeking for serious friendship

2017-05-23 Thread Wesley
My name is Wesley. from the US but currently in Syria for peace keeping mission. I want to get to know you better, if I may be so bold. I consider myself an easy-going man, and I am currently looking for a relationship in which I feel loved. Please forgive my manners am not good when it comes to

Re: [PATCH] tag: duplicate mention of --contains should mention --no-contains

2017-05-23 Thread Ævar Arnfjörð Bjarmason
On Mon, May 15, 2017 at 2:23 PM, Ævar Arnfjörð Bjarmason wrote: > Fix a duplicate mention of --contains in the SYNOPSIS to mention > --no-contains. > > This fixes an error introduced in my commit ac3f5a3468 ("ref-filter: > add --no-contains option to tag/branch/for-each-ref", 2017-03-24). > > Sign

[PATCH v5 4/6] dir: hide untracked contents of untracked dirs

2017-05-23 Thread Samuel Lijin
When we taught read_directory_recursive() to recurse into untracked directories in search of ignored files given DIR_SHOW_IGNORED_TOO, that had the side effect of teaching it to collect the untracked contents of untracked directories. It doesn't always make sense to return these, though (we do need

[PATCH v5 5/6] dir: expose cmp_name() and check_contains()

2017-05-23 Thread Samuel Lijin
We want to use cmp_name() and check_contains() (which both compare `struct dir_entry`s, the former in terms of the sort order, the latter in terms of whether one lexically contains another) outside of dir.c, so we have to (1) change their linkage and (2) rename them as appropriate for the global na

[PATCH v5 0/6] Fix clean -d and status --ignored

2017-05-23 Thread Samuel Lijin
Incorporates latest round of feedback from Junio about how to best structure the changes to cmd_clean() for maintainability. Samuel Lijin (6): t7300: clean -d should skip dirs with ignored files t7061: status --ignored should search untracked dirs dir: recurse into untracked dirs for ignored

[PATCH v5 3/6] dir: recurse into untracked dirs for ignored files

2017-05-23 Thread Samuel Lijin
We consider directories containing only untracked and ignored files to be themselves untracked, which in the usual case means we don't have to search these directories. This is problematic when we want to collect ignored files with DIR_SHOW_IGNORED_TOO, though, so we teach read_directory_recursive(

[PATCH v5 1/6] t7300: clean -d should skip dirs with ignored files

2017-05-23 Thread Samuel Lijin
If git sees a directory which contains only untracked and ignored files, clean -d should not remove that directory. It was recently discovered that this is *not* true of git clean -d, and it's possible that this has never worked correctly; this test and its accompanying patch series aims to fix tha

[PATCH v5 6/6] clean: teach clean -d to preserve ignored paths

2017-05-23 Thread Samuel Lijin
There is an implicit assumption that a directory containing only untracked and ignored paths should itself be considered untracked. This makes sense in use cases where we're asking if a directory should be added to the git database, but not when we're asking if a directory can be safely removed fro

Re: BUG: The .gitignore rules can't be made to cross submodule boundaries

2017-05-23 Thread Johannes Schindelin
Hi Ævar, On Mon, 22 May 2017, Ævar Arnfjörð Bjarmason wrote: > When I was adding the sha1collisiondetection submodule to git.git I > noticed that building git would dirty the submodule. > > This is because our own Makefile adds .depend/ directories. I hacked > around it by just getting the upstr

[PATCH v5 2/6] t7061: status --ignored should search untracked dirs

2017-05-23 Thread Samuel Lijin
Per eb8c5b87, `status --ignored` by design does not list ignored files if they are in a directory which contains only ignored and untracked files (which is itself considered to be untracked) without `-uall`. This does not make sense for `--ignored`, which claims to "Show ignored files as well." Th

Re: [PATCH v3 1/6] Fix build with core.autocrlf=true

2017-05-23 Thread Johannes Schindelin
Hi, On Tue, 23 May 2017, Junio C Hamano wrote: > Jonathan Nieder writes: > > > Junio, how do you prefer to handle this in git.git? Would you need to > > amend the patch to remove the git-gui/.gitattributes change and wait > > to get it from Pat, or is getting the same change twice okay? > > Y

Re: [PATCH v4 4/4] convert: add "status=delayed" to filter process protocol

2017-05-23 Thread Lars Schneider
> On 23 May 2017, at 07:22, Junio C Hamano wrote: > > Lars Schneider writes: > + sigchain_pop(SIGPIPE); + + if (err || errno == EPIPE) { >>> >>> This looks strange, at first glance. >>> Do we set errno to 0 before ? >>> Or is there a trick that EPIPE can only be reached, >>>

Re: [PATCH v5] send-email: --batch-size to work around some SMTP server limit

2017-05-23 Thread Jan Viktorin
On Tue, 23 May 2017 16:46:27 +0900 Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > > > Looking at this the Nth time now though I wonder about this approach > > in general. In all your E-Mails I don't think you ever said /what/ > > sort of error you had from the SMTP server, you just s

What's cooking in git.git (May 2017, #07; Tue, 23)

2017-05-23 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. The 'maint' branch is now for the

Re: [Bug] cloning a repository with a default MASTER branch tries to check out the master branch

2017-05-23 Thread Samuel Lijin
For some reason the repo on GH does not have a HEAD pointer: $ git ls-remote https://github.com/passcod/UPPERCASE-NPM.git efc7dbfd6ca155d5d19ce67eb98603896062f35arefs/heads/MASTER e60ea8e6ec45ec45ff44ac8939cb4105b16477darefs/pull/1/head f35a73dcb151d336dc3d30c9a2c7423ecdb7bd1c

Re: [PATCH v4 6/6] clean: teach clean -d to skip dirs containing ignored files

2017-05-23 Thread Junio C Hamano
Samuel Lijin writes: >> As I said, I am undecided if the result is easier to follow than >> your version ;-) > > I think I'll defer to your patch: I do agree that your version is > easier to follow and understand. Should I reroll just this patch and > its commit message, or would you prefer to ha

Re: [PATCH v5] send-email: --batch-size to work around some SMTP server limit

2017-05-23 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Looking at this the Nth time now though I wonder about this approach > in general. In all your E-Mails I don't think you ever said /what/ > sort of error you had from the SMTP server, you just said you had a > failure or an error, I assume you hit one of the die'

Re: Git 2.13 silent install

2017-05-23 Thread Konstantin Khomoutov
On Mon, May 22, 2017 at 05:41:52PM +0200, Johannes Schindelin wrote: > > > Just wondering if someone can send me the instructions for an > > > unattended/silent install for Git 2.13. > > > > This guide [1] is outdated but should be applicable (see the new > > installer file [2] and its "[Compone

Re: [PATCHv3 4/4] clone: use free_refspec() to free refspec list

2017-05-23 Thread Junio C Hamano
SZEDER Gábor writes: > On Mon, May 15, 2017 at 1:05 PM, SZEDER Gábor wrote: >> From: Jeff King >> >> Using free() on a refspec was always leaky, as its string >> fields also need freed. But it became more so when ad00f128d >> (clone: respect configured fetch respecs during initial >> fetch, 201

<    1   2