Re: [PATCH v15 3/7] t0040-parse-options: improve test coverage

2016-05-04 Thread Pranit Bauva
On Wed, May 4, 2016 at 2:06 PM, Eric Sunshine wrote: > On Sat, Apr 30, 2016 at 4:03 PM, Pranit Bauva wrote: >> Include tests to check for multiple levels of quiet and to check if the >> '--no-quiet' option sets it to 0. > > As this patch is also

possible problem / bug

2016-05-04 Thread Bryant Bernstein
Both windows and linux support links but both git and the git bash seem to have a problem with them. In my source, (originally on Linux) I have a link in my source directory to a config file which I normally import into python. This allows me to have something.py pointing to config.txt .

Re: [PATCH] submodule: stop sanitizing config options

2016-05-04 Thread Jeff King
On Wed, May 04, 2016 at 03:53:26PM -0700, Stefan Beller wrote: > > I think we'd actually do it all in one, and that patch looks something > > like the one below (on top of jk/submodule-config-sanitize-fix). > > $ git checkout origin/jk/submodule-config-sanitize-fix > $ git am p >

Re: [PATCHv4] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-04 Thread Jonathan Nieder
Stefan Beller wrote: > On Wed, May 4, 2016 at 4:26 PM, Jonathan Nieder wrote: >> I think this paragraph could be removed. --all is explained lower >> down and the error message points it out to users who need it. > > When we want to keep supporting '.' forever, I would

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Jeff King
On Wed, May 04, 2016 at 07:41:53PM -0400, Jeff King wrote: > On Wed, May 04, 2016 at 04:28:31PM -0700, Junio C Hamano wrote: > > > Junio C Hamano writes: > > > > > Gaah, the Makefile part of the final patch is wrong; we do not check > > > the included sources at all if we

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Jeff King
On Wed, May 04, 2016 at 04:28:31PM -0700, Junio C Hamano wrote: > Junio C Hamano writes: > > > Gaah, the Makefile part of the final patch is wrong; we do not check > > the included sources at all if we only passed the top-level targets' > > sources. > > I ended up queuing an

Re: [PATCHv4] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-04 Thread Stefan Beller
On Wed, May 4, 2016 at 4:26 PM, Jonathan Nieder wrote: > Hi, > > Stefan Beller wrote: > >> Signed-off-by: Stefan Beller >> --- >> * reworded commit message slightly (realize, pathspec) >> * reworded the documentation > > Yay, thanks for your work on this.

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Junio C Hamano
Junio C Hamano writes: > Gaah, the Makefile part of the final patch is wrong; we do not check > the included sources at all if we only passed the top-level targets' > sources. I ended up queuing an enhanced version of File::Find based one on 'pu', but I won't be posting it

Re: [PATCHv4] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-04 Thread Jonathan Nieder
Hi, Stefan Beller wrote: > Signed-off-by: Stefan Beller > --- > * reworded commit message slightly (realize, pathspec) > * reworded the documentation Yay, thanks for your work on this. [...] > +++ b/Documentation/git-submodule.txt > @@ -13,7 +13,7 @@ SYNOPSIS >

Re: [PATCH v6 0/4] githooks.txt improvements + core.hooksDirectory

2016-05-04 Thread Junio C Hamano
Thanks, will replace. Let's start moving this to 'next'. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: unary minus operator applied to unsigned type, result still unsigned?

2016-05-04 Thread Junio C Hamano
"Philip Oakley" writes: > I'm working on building Git on Visual Studio as part of the Git for Windows > capability. > > The MSVC compiler is reporting: > > 1>..\sha1-lookup.c(100) : warning C4146: unary minus operator applied to > unsigned type, result still unsigned >

Re: [PATCHv4] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-04 Thread Junio C Hamano
Stefan Beller writes: > +When the command is run without pathspec, it errors out, > +instead of deinit-ing everything, to prevent mistakes. In > +version 2.8 and before the command gave a suggestion to use > +'.' to unregister all submodules when it was invoked without > +any

Re: [PATCH v2 3/3] http: expand http.cookieFile as a path

2016-05-04 Thread Junio C Hamano
Brian Norris writes: > On Wed, May 04, 2016 at 03:30:51PM -0400, Jeff King wrote: >> On Wed, May 04, 2016 at 11:42:15AM -0700, Brian Norris wrote: >> >> > diff --git a/Documentation/config.txt b/Documentation/config.txt >> > index e655b9729a7d..4c3cd7621ad0 100644

unary minus operator applied to unsigned type, result still unsigned?

2016-05-04 Thread Philip Oakley
I'm working on building Git on Visual Studio as part of the Git for Windows capability. The MSVC compiler is reporting: 1>..\sha1-lookup.c(100) : warning C4146: unary minus operator applied to unsigned type, result still unsigned 1>..\sha1-lookup.c(316) : warning C4146: unary minus operator

[PATCH v6 3/4] githooks.txt: Minor improvements to the grammar & phrasing

2016-05-04 Thread Ævar Arnfjörð Bjarmason
Change: * Sentences that needed "the" or "a" to either add those or change them so they don't need them. * The little tangent about "You can use this to do X (if your project wants to do X)" can just be shortened to "e.g. if you want to do X". * s/parameter/parameters/ when the plural

[PATCH v6 2/4] githooks.txt: Amend dangerous advice about 'update' hook ACL

2016-05-04 Thread Ævar Arnfjörð Bjarmason
Any ACL you implement via an 'update' hook isn't actual access control if the user has login access to the machine running git, because they can trivially just build their own git version which doesn't run the hook. Change the documentation to take this dangerous edge case into account, and

[PATCH v6 1/4] githooks.txt: Improve the intro section

2016-05-04 Thread Ævar Arnfjörð Bjarmason
Change the documentation so that: * We don't talk about "little scripts". Hooks can be as big as you want, and don't have to be scripts, just call them "programs". * We note that we change the working directory before a hook is called, nothing documented this explicitly, but the current

[PATCH v6 4/4] hooks: Add ability to specify where the hook directory is

2016-05-04 Thread Ævar Arnfjörð Bjarmason
Change the hardcoded lookup for .git/hooks/* to optionally lookup in $(git config core.hooksPath)/* instead. This is essentially a more intrusive version of the git-init ability to specify hooks on init time via init templates. The difference between that facility and this feature is that this

[PATCH v6 0/4] githooks.txt improvements + core.hooksDirectory

2016-05-04 Thread Ævar Arnfjörð Bjarmason
Changed to reflect Junio's latest comment, diff between the whole series and the last one here at the end (made with -U0). Ævar Arnfjörð Bjarmason (4): githooks.txt: Improve the intro section githooks.txt: Amend dangerous advice about 'update' hook ACL githooks.txt: Minor improvements to

Re: [PATCH] submodule: stop sanitizing config options

2016-05-04 Thread Stefan Beller
> I don't think there was any documentation for the _old_ behavior, and > certainly jk/submodule-c-credential didn't add any. But it probably is > worth document, maybe as part of "-c"? Care to roll a patch on top? Sure. > > I think we'd actually do it all in one, and that patch looks something

[PATCHv4] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-04 Thread Stefan Beller
The discussion in [1] pointed out that '.' is a faulty suggestion as there is a corner case where it fails: > "submodule deinit ." may have "worked" in the sense that you would > have at least one path in your tree and avoided this "nothing > matches" most of the time. It would have still failed

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Junio C Hamano
Junio C Hamano writes: > Jeff King writes: > >> But I think the point remains, >> which is that your perl script is an implementation detail of the >> Makefile process. I thought the "ci" directory was supposed to be for >> ci-specific scripts that would be

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Junio C Hamano
Jeff King writes: > But I think the point remains, > which is that your perl script is an implementation detail of the > Makefile process. I thought the "ci" directory was supposed to be for > ci-specific scripts that would be driven directly by Travis, etc. True. Documentation/

Re: [PATCH v5 0/4] githooks.txt improvements + core.hooksDirectory

2016-05-04 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > For convenience & ease of review a diff between the bits of v4 and v5 > that I changed follows below. Thanks. > diff --git a/Documentation/config.txt b/Documentation/config.txt > ... > +This configuration variable is useful in cases where

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Jeff King
On Wed, May 04, 2016 at 11:54:52PM +0200, Ævar Arnfjörð Bjarmason wrote: > > my @files = map { chomp; $_ } `git ls-files`; > > As a minor sidenote you can equivalently write that as: > > chomp(my @files = `git ls-files`); > > I.e. chomp itself when given a list will chomp each item of

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Jeff King
On Wed, May 04, 2016 at 02:52:27PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > This dependency feels funny. Wouldn't CI want to invoke this as: > > > > make -C Documentation lint-docs > > I expected CI to do this instead > > make check-docs Ah, sure, that

Re: [PATCHv3] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-04 Thread Junio C Hamano
Stefan Beller writes: >> IOW, the latter part _might_ be better if it were >> >> if test $# = 0 && test -z "$deinit_all" >> then >> echo >&2 "info: not deinitializing anything." >> echo >&2 "info: Use --all to deinitialize all

Re: [PATCHv3] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-04 Thread Stefan Beller
On Wed, May 4, 2016 at 2:49 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >>> +if test -n "$deinit_all" && test "$#" -ne 0 >>> +then >>> +die "$(eval_gettext "usage: $dashless [--quiet] deinit >>> [-f|--force] (--all | [--]

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Ævar Arnfjörð Bjarmason
On Wed, May 4, 2016 at 10:06 PM, Jeff King wrote: > Would: > > open(my $files, '-|', qw(git ls-files)); > while (<$files>) { > chomp; > ... > } > > make sense? Or a simpler but non-streaming spelling: > > my @files = map { chomp; $_ } `git ls-files`; As a minor

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Junio C Hamano
Jeff King writes: > This dependency feels funny. Wouldn't CI want to invoke this as: > > make -C Documentation lint-docs I expected CI to do this instead make check-docs -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

Re: [PATCHv3] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-04 Thread Junio C Hamano
Stefan Beller writes: >> I think some attempts like 06cdac5a (git-reset.txt: use "working >> tree" consistently, 2010-09-15) were made to clean things up even >> before "worktree" started to mean an entirely different thing, and >> we shouldn't make things worse by adding

Re: [PATCHv3] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-04 Thread Junio C Hamano
Junio C Hamano writes: >> +if test -n "$deinit_all" && test "$#" -ne 0 >> +then >> +die "$(eval_gettext "usage: $dashless [--quiet] deinit >> [-f|--force] (--all | [--] ...)")" > > I doubt that "usage:" wants to go thru l10n. > > I suspect that it is more

Re: [PATCHv3] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-04 Thread Stefan Beller
On Wed, May 4, 2016 at 2:43 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> (e.g. work tree for working tree?) > > This was probably primarily my fault, not just because I've written > more than my share of documentation (compared to the code that >

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Jeff King
On Wed, May 04, 2016 at 02:34:23PM -0700, Junio C Hamano wrote: > Third time's a charm, perhaps? > > -- >8 -- > Subject: [PATCH] ci: validate "gitlink:" in documentation > > It is easy to add incorrect "linkgit:[]" references > to our documentation suite. Catch these common classes of errors:

Re: [PATCHv3] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-04 Thread Junio C Hamano
Stefan Beller writes: > (e.g. work tree for working tree?) This was probably primarily my fault, not just because I've written more than my share of documentation (compared to the code that touched), but I was deliberately writing "work tree" when both "work tree" and

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Junio C Hamano
Third time's a charm, perhaps? -- >8 -- Subject: [PATCH] ci: validate "gitlink:" in documentation It is easy to add incorrect "linkgit:[]" references to our documentation suite. Catch these common classes of errors: * Referring to Documentation/.txt that does not exist. * Referring to a

Re: [PATCHv3] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-04 Thread Stefan Beller
On Wed, May 4, 2016 at 1:44 PM, Junio C Hamano wrote: > I think this sentence talks about "working tree" (as opposed to > "worktree"), so s/work tree/working tree/. I'll fix this up in a resend, though it may be a fix on its own. So the two "official" terms are working tree

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Jeff King
On Wed, May 04, 2016 at 02:15:39PM -0700, Junio C Hamano wrote: > > make sense? Or a simpler but non-streaming spelling: > > > > my @files = map { chomp; $_ } `git ls-files`; > > I forgot to say that I wanted not to rely on "git" (i.e. OK to use > this on tarball extract). Oh, that's a good

Re: Portability of git shell scripts?

2016-05-04 Thread Jeff King
On Wed, May 04, 2016 at 08:17:38PM +0200, Armin Kunaschik wrote: > I'm trying to compile/test/use git 2.8.2 on AIX 6.1 with no bash available. > /bin/sh is a hard link to /bin/ksh which is a ksh88, a posix shell. > Is this supposed to work? We aim for a practical subset of Bourne shells,

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Junio C Hamano
Jeff King writes: > On Wed, May 04, 2016 at 12:57:31PM -0700, Junio C Hamano wrote: > >> > Is it worth just making this a perl script, rather than a shell script >> > with a giant inline perl script? Perl is actually really good at doing >> > that "grep" as it reads the file. :)

Re: [RFD/PATCH] submodule doc: describe where we can configure them

2016-05-04 Thread Junio C Hamano
Jonathan Nieder writes: > This design is somewhat problematic for a few reasons: > > - When I want to stop paying attention to a particular submodule and > start paying attention to it again later, all my local settings are > gone. True; "[submodule "foo"] enabled = no"

Re: [RFD/PATCH] submodule doc: describe where we can configure them

2016-05-04 Thread Stefan Beller
On Wed, May 4, 2016 at 8:01 AM, Heiko Voigt wrote: > On Tue, May 03, 2016 at 05:59:58PM -0700, Stefan Beller wrote: >> On Tue, May 3, 2016 at 4:56 PM, Jonathan Nieder wrote: >> > Stefan Beller wrote: >> > >> >> This is similar to the gitignore document, but

Re: [RFD/PATCH] submodule doc: describe where we can configure them

2016-05-04 Thread Junio C Hamano
Stefan Beller writes: > This is similar to the gitignore document, but doesn't mirror > the current situation. It is rather meant to start a discussion for > the right approach for mirroring repositories with submodules. > > Signed-off-by: Stefan Beller >

Re: [PATCHv3] submodule deinit: require '--all' instead of '.' for all submodules

2016-05-04 Thread Junio C Hamano
Stefan Beller writes: > The discussion in [1] realized that '.' is a faulty suggestion as > there is a corner case where it fails: A discussion does not "realize" (you may say "the discussion made me realize" but that gets personal and subjective description that is

Re: git status core dump with bad sector!

2016-05-04 Thread Eric Chamberland
Hi, sorry for the delay... On 22/04/16 01:11 AM, Jeff King wrote: On Thu, Apr 14, 2016 at 10:59:57AM -0400, Eric Chamberland wrote: just cloned a repo and it checked-out wihtout any error (with git 2.2.0) but got come corrupted files (because I got some sdd failures). Then, I get a git core

[PATCH v5 2/4] githooks.txt: Amend dangerous advice about 'update' hook ACL

2016-05-04 Thread Ævar Arnfjörð Bjarmason
Any ACL you implement via an 'update' hook isn't actual access control if the user has login access to the machine running git, because they can trivially just build their own git version which doesn't run the hook. Change the documentation to take this dangerous edge case into account, and

[PATCH v5 0/4] githooks.txt improvements + core.hooksDirectory

2016-05-04 Thread Ævar Arnfjörð Bjarmason
This is hopefully the last version of this series. I've hopefully addressed the comments that came up and fixed a couple of other minor things. Changes since v4: * Changed wording to config.txt's core.hooksPath documentation as suggested. * Ditto for githooks.txt, and I tried to make the

[PATCH v5 4/4] hooks: Add ability to specify where the hook directory is

2016-05-04 Thread Ævar Arnfjörð Bjarmason
Change the hardcoded lookup for .git/hooks/* to optionally lookup in $(git config core.hooksPath)/* instead. This is essentially a more intrusive version of the git-init ability to specify hooks on init time via init templates. The difference between that facility and this feature is that this

[PATCH v5 1/4] githooks.txt: Improve the intro section

2016-05-04 Thread Ævar Arnfjörð Bjarmason
Change the documentation so that: * We don't talk about "little scripts". Hooks can be as big as you want, and don't have to be scripts, just call them "programs". * We note that we change the working directory before a hook is called, nothing documented this explicitly, but the current

[PATCH v5 3/4] githooks.txt: Minor improvements to the grammar & phrasing

2016-05-04 Thread Ævar Arnfjörð Bjarmason
Change: * Sentences that needed "the" or "a" to either add those or change them so they don't need them. * The little tangent about "You can use this to do X (if your project wants to do X)" can just be shortened to "e.g. if you want to do X". * s/parameter/parameters/ when the plural

Re: [PATCH 04/14] connect: rewrite feature parsing to work on string_list

2016-05-04 Thread Junio C Hamano
Stefan Beller writes: > Later on when we introduce the version 2 transport protocol, the > capabilities will not be transported in one lone string but each s/lone/long/, I think. > capability will be carried in its own pkt line. > > To reuse existing infrastructure we would

Re: [PATCH 03/14] upload-pack-2: Implement the version 2 of upload-pack

2016-05-04 Thread Junio C Hamano
David Turner writes: > On Fri, 2016-04-29 at 16:34 -0700, Stefan Beller wrote: >> In upload-pack-2 we send each capability in its own packet buffer. >> The construction of upload-pack-2 is a bit unfortunate as I would >> like >> it to not be depending on a symlink

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Jeff King
On Wed, May 04, 2016 at 12:57:31PM -0700, Junio C Hamano wrote: > > Is it worth just making this a perl script, rather than a shell script > > with a giant inline perl script? Perl is actually really good at doing > > that "grep" as it reads the file. :) > > OK. Hmm. This new version uses

Re: [PATCH 02/14] upload-pack.c: Refactor capability advertising

2016-05-04 Thread Junio C Hamano
Stefan Beller writes: > Instead of having the capabilities in a local string, keep them > in a struct outside the function. This will allow us in a later patch > to easily reuse the capabilities in version 2 of the protocol. > > Signed-off-by: Stefan Beller

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Junio C Hamano
Jeff King writes: > Likewise, I think we could build the whole HTML source and then actually > just look for broken links in it. But that script would probably end up > looking similar to this one, with s/linkgit/href/. But it does more > directly measure what we want, which is

Re: [PATCH v2 3/3] http: expand http.cookieFile as a path

2016-05-04 Thread Brian Norris
On Wed, May 04, 2016 at 03:30:51PM -0400, Jeff King wrote: > On Wed, May 04, 2016 at 11:42:15AM -0700, Brian Norris wrote: > > > diff --git a/Documentation/config.txt b/Documentation/config.txt > > index e655b9729a7d..4c3cd7621ad0 100644 > > --- a/Documentation/config.txt > > +++

Re: [PATCH v2] gitweb: apply fallback encoding before highlight

2016-05-04 Thread Junio C Hamano
Shin Kojima writes: > I can say this patch, to consider $fallback_encoding while > highlighting, is fairly rational. But I also feel this is too much > just for specific outdated character encodings, it is completely > useless for the most part of gitweb users in the world.

Re: [PATCH v2 3/3] http: expand http.cookieFile as a path

2016-05-04 Thread Jeff King
On Wed, May 04, 2016 at 11:42:15AM -0700, Brian Norris wrote: > diff --git a/Documentation/config.txt b/Documentation/config.txt > index e655b9729a7d..4c3cd7621ad0 100644 > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -1664,7 +1664,8 @@ http.emptyAuth:: >

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Jeff King
On Wed, May 04, 2016 at 11:52:52AM -0700, Junio C Hamano wrote: > > I do not think there is any false positive above, so perhaps the > > checker script below can be used as the link checker we discussed? > > -- >8 -- > Subject: [PATCH] ci: validate "gitlink:" in documentation > > It is easy to

[PATCH] config: consistently format $variables in monospaced font

2016-05-04 Thread Brian Norris
We don't consistently use `backticks` for formatting shell variables. This patch improves the consistency on shell variables (and a few nearby mentions of "gpg" commands), though it still doesn't straighten out the use of "quotes." Signed-off-by: Brian Norris ---

Re: avoid duplicate patches from git log ?

2016-05-04 Thread Junio C Hamano
Johannes Schindelin writes: > Please note that I do drop some patches from time to time, so what Junio > fears is actually not a time bomb, but rather the intended benefit. OK. As long as all the dropped patches are intentional, by definition nothing is lost ;-) --

Re: [PATCH 2/2] bisect: rewrite `check_term_format` shell function in C

2016-05-04 Thread Junio C Hamano
Johannes Schindelin writes: > Maybe something like instead? > > static int one_of(const char *term, ...) > { > int res = 0; > va_list matches; > const char *match; > > va_start(matches, term); >

Re: [PATCH] submodule: stop sanitizing config options

2016-05-04 Thread Jeff King
On Wed, May 04, 2016 at 11:43:47AM -0700, Junio C Hamano wrote: > Jeff King writes: > > > diff --git a/git-submodule.sh b/git-submodule.sh > > index 3a40d4b..c9d53e1 100755 > > --- a/git-submodule.sh > > +++ b/git-submodule.sh > > @@ -197,9 +197,9 @@ isnumber() > > # of the

Re: [PATCH 1/2] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

2016-05-04 Thread Christian Couder
Hi Dscho, On Wed, May 4, 2016 at 4:56 PM, Johannes Schindelin wrote: > Hi Christian, > > On Wed, 4 May 2016, Christian Couder wrote: > >> My intent was to try to show that there is some important value to make >> the subject close to the "low level" thing the patch

Re: [PATCH] mingw: introduce the 'core.hideDotFiles' setting

2016-05-04 Thread Junio C Hamano
Johannes Schindelin writes: > diff --git a/builtin/init-db.c b/builtin/init-db.c > index b2d8d40..c4269ac 100644 > --- a/builtin/init-db.c > +++ b/builtin/init-db.c > @@ -370,6 +370,7 @@ int init_db(const char *template_dir, unsigned int flags) >

Re: [PATCH] submodule: stop sanitizing config options

2016-05-04 Thread Jeff King
On Wed, May 04, 2016 at 10:58:26AM -0700, Stefan Beller wrote: > > So this whitelist is probably not giving us any benefit, and > > is already creating a hassle as people propose things to put > > on it. Let's just drop it entirely. > > Just to recap: > Before jk/submodule-config-sanitize-fix

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Junio C Hamano
Junio C Hamano writes: > I do not think there is any false positive above, so perhaps the > checker script below can be used as the link checker we discussed? -- >8 -- Subject: [PATCH] ci: validate "gitlink:" in documentation It is easy to add incorrect "linkgit:[]"

Re: [PATCH] submodule: stop sanitizing config options

2016-05-04 Thread Junio C Hamano
Jeff King writes: > diff --git a/git-submodule.sh b/git-submodule.sh > index 3a40d4b..c9d53e1 100755 > --- a/git-submodule.sh > +++ b/git-submodule.sh > @@ -197,9 +197,9 @@ isnumber() > # of the settings from GIT_CONFIG_PARAMETERS. > sanitize_submodule_env() > { > -

[PATCH v2 1/3] config: describe 'pathname' value type

2016-05-04 Thread Brian Norris
From: Junio C Hamano We have a dedicated section for various value-types used in the configuration variables already, because we needed to describe how booleans and scaled integers can be spelled, and the pathname type would fit there. Adjust the description of

[PATCH v2 2/3] Documentation: config: improve word ordering for http.cookieFile

2016-05-04 Thread Brian Norris
Signed-off-by: Brian Norris --- v2: no change Documentation/config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 7264abf7f85e..e655b9729a7d 100644 --- a/Documentation/config.txt +++

[PATCH v2 3/3] http: expand http.cookieFile as a path

2016-05-04 Thread Brian Norris
This should handle .gitconfig files that specify things like: [http] cookieFile = "~/.gitcookies" Signed-off-by: Brian Norris --- v2: rework documentation now that 'pathname' is documented centrally Documentation/config.txt | 3 ++- http.c

Re: Portability of git shell scripts?

2016-05-04 Thread Torsten Bögershausen
On 04.05.16 20:17, Armin Kunaschik wrote: > Hi list, > > I'm trying to compile/test/use git 2.8.2 on AIX 6.1 with no bash available. > /bin/sh is a hard link to /bin/ksh which is a ksh88, a posix shell. > Is this supposed to work? > > As an example: make test fails on nearly every t34* test and

Re: [PATCH v6 0/2] Add support for sending additional HTTP headers

2016-05-04 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Junio, > > On Wed, 4 May 2016, Junio C Hamano wrote: > >> Jeff King writes: >> >> >> submodule: pass on http.extraheader config settings >> > >> > IMHO this should come on top of jk/submodule-config-sanitize-fix (I

Portability of git shell scripts?

2016-05-04 Thread Armin Kunaschik
Hi list, I'm trying to compile/test/use git 2.8.2 on AIX 6.1 with no bash available. /bin/sh is a hard link to /bin/ksh which is a ksh88, a posix shell. Is this supposed to work? As an example: make test fails on nearly every t34* test and on tests which contain rebase. The installation of bash

Re: [PATCH 2/2] bisect: rewrite `check_term_format` shell function in C

2016-05-04 Thread Pranit Bauva
On Wed, May 4, 2016 at 11:19 PM, Eric Sunshine wrote: > On Wed, May 4, 2016 at 7:58 AM, Pranit Bauva wrote: >> On Wed, May 4, 2016 at 1:58 PM, Eric Sunshine >> wrote: >>> On Wed, May 4, 2016 at 3:36 AM, Pranit Bauva

Re: [PATCH] submodule: stop sanitizing config options

2016-05-04 Thread Stefan Beller
On Wed, May 4, 2016 at 1:00 AM, Jeff King wrote: > [+cc Stefan and Jacob since this is really resuming that earlier thread] > > On Wed, May 04, 2016 at 03:45:59AM -0400, Jeff King wrote: > >> On Wed, May 04, 2016 at 02:26:18AM -0400, Jeff King wrote: >> >> > > submodule: pass on

Re: [PATCH 2/2] bisect: rewrite `check_term_format` shell function in C

2016-05-04 Thread Eric Sunshine
On Wed, May 4, 2016 at 7:58 AM, Pranit Bauva wrote: > On Wed, May 4, 2016 at 1:58 PM, Eric Sunshine wrote: >> On Wed, May 4, 2016 at 3:36 AM, Pranit Bauva wrote: >>> On Wed, May 4, 2016 at 12:22 PM, Eric Sunshine

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Junio C Hamano
Junio C Hamano writes: > So I used the script attached at the bottom to audit the whole > thing, and the result is here. > ... While I was at it, I just did this to make the documentation set lint clean. -- >8 -- There are a handful of incorrect "linkgit:[]" instances in

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Junio C Hamano
Ramsay Jones writes: >>> diff --git a/Documentation/git-check-ignore.txt >>> b/Documentation/git-check-ignore.txt >>> index e94367a..9a85998 100644 >>> --- a/Documentation/git-check-ignore.txt >>> +++ b/Documentation/git-check-ignore.txt >>> @@ -112,7 +112,7 @@ EXIT

Re: [PATCH 06/14] remote.h: add get_remote_capabilities, request_capabilities

2016-05-04 Thread Stefan Beller
On Tue, May 3, 2016 at 2:21 PM, David Turner wrote: > On Tue, 2016-05-03 at 01:33 -0400, Jeff King wrote: >> On Mon, May 02, 2016 at 02:57:43PM -0400, David Turner wrote: >> >> > On Fri, 2016-04-29 at 16:34 -0700, Stefan Beller wrote: >> > >> > > +const char

Re: [PATCH] mingw: introduce the 'core.hideDotFiles' setting

2016-05-04 Thread Ramsay Jones
On 04/05/16 15:40, Johannes Schindelin wrote: > From: Erik Faye-Lund > > On Unix (and Linux) it is common that files and directories whose names > start with a dot are not shown by default. This convention is used by Git: > the .git/ directory should be left alone by

Re: [RFD/PATCH] submodule doc: describe where we can configure them

2016-05-04 Thread Heiko Voigt
On Tue, May 03, 2016 at 05:59:58PM -0700, Stefan Beller wrote: > On Tue, May 3, 2016 at 4:56 PM, Jonathan Nieder wrote: > > Stefan Beller wrote: > > > >> This is similar to the gitignore document, but doesn't mirror > >> the current situation. It is rather meant to start a

Re: [PATCH 1/2] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

2016-05-04 Thread Johannes Schindelin
Hi Christian, On Wed, 4 May 2016, Christian Couder wrote: > My intent was to try to show that there is some important value to make > the subject close to the "low level" thing the patch actually does. I disagree. The place to describe low-level details that are not immediately obvious from the

[PATCH] mingw: introduce the 'core.hideDotFiles' setting

2016-05-04 Thread Johannes Schindelin
From: Erik Faye-Lund On Unix (and Linux) it is common that files and directories whose names start with a dot are not shown by default. This convention is used by Git: the .git/ directory should be left alone by regular users, and only accessed through Git itself. On

Re: [PATCH 1/2] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

2016-05-04 Thread Christian Couder
Hi Dscho, On Wed, May 4, 2016 at 2:21 PM, Johannes Schindelin wrote: > If your patch series contained *one* patch whose intent was to prepare for > a libified 'apply', yes, indeed, I would think that it would make for a > fine commit subject. Especially if the other

Re: [PATCH 1/2] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

2016-05-04 Thread Johannes Schindelin
Hi Chris, On Wed, 4 May 2016, Christian Couder wrote: > On Wed, May 4, 2016 at 1:05 PM, Johannes Schindelin > wrote: > > > So... why not just say "bisect--helper: prepare for modes other than > > 'next-all'"? > > For (an extreme) example, in my patch series about

Re: [PATCH 2/2] bisect: rewrite `check_term_format` shell function in C

2016-05-04 Thread Christian Couder
On Wed, May 4, 2016 at 1:13 PM, Johannes Schindelin wrote: > Maybe something like instead? > > static int one_of(const char *term, ...) > { > int res = 0; > va_list matches; > const char *match; > >

Re: [PATCH 1/2] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

2016-05-04 Thread Christian Couder
On Wed, May 4, 2016 at 1:05 PM, Johannes Schindelin wrote: > Hi Christian, > > On Wed, 4 May 2016, Christian Couder wrote: > >> On Wed, May 4, 2016 at 8:07 AM, Eric Sunshine >> wrote: >> > On Wed, May 4, 2016 at 1:07 AM, Pranit Bauva

Re: [PATCH 1/2] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

2016-05-04 Thread Pranit Bauva
On Wed, May 4, 2016 at 4:35 PM, Johannes Schindelin wrote: > Hi Christian, > > On Wed, 4 May 2016, Christian Couder wrote: > >> On Wed, May 4, 2016 at 8:07 AM, Eric Sunshine >> wrote: >> > On Wed, May 4, 2016 at 1:07 AM, Pranit Bauva

Re: [PATCH 2/2] bisect: rewrite `check_term_format` shell function in C

2016-05-04 Thread Pranit Bauva
On Wed, May 4, 2016 at 4:43 PM, Johannes Schindelin wrote: > Hi Pranit, > > On Wed, 4 May 2016, Pranit Bauva wrote: > >> On Wed, May 4, 2016 at 12:22 PM, Eric Sunshine >> wrote: >> > On Wed, May 4, 2016 at 1:07 AM, Pranit Bauva

Re: avoid duplicate patches from git log ?

2016-05-04 Thread Johannes Schindelin
Hi Philip, On Tue, 3 May 2016, Philip Oakley wrote: > From: "Junio C Hamano" > > Jeff King writes: > > > > > On Tue, May 03, 2016 at 09:11:55PM +0100, Philip Oakley wrote: > > > > > > > However, as the G4W project (https://github.com/git-for-windows/git/) > >

Re: [PATCH 2/2] bisect: rewrite `check_term_format` shell function in C

2016-05-04 Thread Pranit Bauva
On Wed, May 4, 2016 at 1:58 PM, Eric Sunshine wrote: > On Wed, May 4, 2016 at 3:36 AM, Pranit Bauva wrote: >> On Wed, May 4, 2016 at 12:22 PM, Eric Sunshine >> wrote: >>> On Wed, May 4, 2016 at 1:07 AM, Pranit Bauva

Re: [PATCH 82/83] environment: add set_index_file()

2016-05-04 Thread Christian Couder
On Tue, May 3, 2016 at 5:36 PM, Junio C Hamano wrote: > Christian Couder writes: > >> +void set_index_file(char *index_file) >> +{ >> + git_index_file = index_file; >> +} > > What's the rationale for this change, and more importantly, the >

Re: avoid duplicate patches from git log ?

2016-05-04 Thread Johannes Schindelin
Hi Philip, On Tue, 3 May 2016, Philip Oakley wrote: > I was trying to search the Git for Windows (G4W) history for commits that > touched MSVC. > > I've used 'git log -SMSVC --pretty='tformat:%h (%s, %ad)' --date=short > --reverse' to get a nice list of those commits. > > However, as the G4W

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Ramsay Jones
On 04/05/16 09:43, Lars Schneider wrote: > > On 04 May 2016, at 10:38, larsxschnei...@gmail.com wrote: > >> From: Lars Schneider >> >> Signed-off-by: Lars Schneider >> --- >> Documentation/config.txt| 4 ++-- >>

Re: [PATCH 78/83] Move libified code from builtin/apply.c to apply.{c,h}

2016-05-04 Thread Duy Nguyen
On Wed, May 4, 2016 at 5:39 PM, Christian Couder wrote: > On Mon, Apr 25, 2016 at 3:46 PM, Duy Nguyen wrote: >> On Sun, Apr 24, 2016 at 8:34 PM, Christian Couder >> wrote: >>> Signed-off-by: Christian Couder

Re: [PATCH v3 2/2] travis-ci: build documentation

2016-05-04 Thread Matthieu Moy
Christian Couder writes: > You might also want to check: > > http://www.shellcheck.net/ Indeed, it's also an excellent tool to check for common mistakes in shell scripts (there are many, and shellcheck is good at pointing them out and explaining them).

Re: [PATCH] submodule: stop sanitizing config options

2016-05-04 Thread Johannes Schindelin
Hi, On Wed, 4 May 2016, Junio C Hamano wrote: > Jeff King writes: > > > [+cc Stefan and Jacob since this is really resuming that earlier thread] > > ... > >> > >> So I think we'd actually want my series as a preliminary fix, followed > >> by dropping the whitelist entirely on

Re: [PATCH v6 0/2] Add support for sending additional HTTP headers

2016-05-04 Thread Johannes Schindelin
Hi Junio, On Wed, 4 May 2016, Junio C Hamano wrote: > Jeff King writes: > > >> submodule: pass on http.extraheader config settings > > > > IMHO this should come on top of jk/submodule-config-sanitize-fix (I was > > surprised at first that your test worked at all, but that is

Re: [PATCH 2/2] bisect: rewrite `check_term_format` shell function in C

2016-05-04 Thread Johannes Schindelin
Hi Pranit, On Wed, 4 May 2016, Pranit Bauva wrote: > On Wed, May 4, 2016 at 12:22 PM, Eric Sunshine > wrote: > > On Wed, May 4, 2016 at 1:07 AM, Pranit Bauva wrote: > > > >> +static int one_of(const char *term, ...) > >> +{ > >> + va_list

  1   2   >