Re: [PATCH] submodule.c: use GIT_DIR_ENVIRONMENT consistently

2016-12-29 Thread René Scharfe
Am 30.12.2016 um 01:47 schrieb Stefan Beller: diff --git a/submodule.c b/submodule.c index ece17315d6..973b9f3f96 100644 --- a/submodule.c +++ b/submodule.c @@ -1333,5 +1333,6 @@ void prepare_submodule_repo_env(struct argv_array *out) if (strcmp(*var, CONFIG_DATA_ENVIRONMENT))

Re: [PATCH v2] remote helpers: avoid blind fall-back to ".git" when setting GIT_DIR

2016-12-29 Thread Jeff King
On Thu, Dec 29, 2016 at 04:37:30PM -0800, Stefan Beller wrote: > > + mkdir lsremote-root && > > + ( > > + GIT_CEILING_DIRECTORIES=$(pwd) && > > + export GIT_CEILING_DIRECTORIES && > > + cd lsremote-root && > > + git ls-remote

[PATCH] submodule.c: use GIT_DIR_ENVIRONMENT consistently

2016-12-29 Thread Stefan Beller
In C code we have the luxury of having constants for all the important things that are hard coded. This is the only place in C, that hard codes the git directory environment variable, so fix it. Signed-off-by: Stefan Beller --- Signed-off-by-the-format-patch-config ;)

Re: [PATCH v2] remote helpers: avoid blind fall-back to ".git" when setting GIT_DIR

2016-12-29 Thread Jeff King
On Thu, Dec 29, 2016 at 04:11:14PM -0800, Jonathan Nieder wrote: > Thanks. Here's the patch again, now with commit messages and a test. > Thanks for the analysis and sorry for the slow turnaround. Thanks for following up. While working on a similar one recently, I had the nagging feeling that

Re: [PATCH v2] remote helpers: avoid blind fall-back to ".git" when setting GIT_DIR

2016-12-29 Thread Stefan Beller
> + mkdir lsremote-root && > + ( > + GIT_CEILING_DIRECTORIES=$(pwd) && > + export GIT_CEILING_DIRECTORIES && > + cd lsremote-root && > + git ls-remote "$HTTPD_URL/smart/repo.git" >../actual > + ) && We could avoid the

[PATCH v2] remote helpers: avoid blind fall-back to ".git" when setting GIT_DIR

2016-12-29 Thread Jonathan Nieder
To push from or fetch to the current repository, remote helpers need to know what repository that is. Accordingly, Git sets the GIT_DIR environment variable to the path to the current repository when invoking remote helpers. There is a special case it does not handle: "git ls-remote" and "git

Re: Bug: Assertion failed: function prefix_pathspec, file pathspec.c, line 317.

2016-12-29 Thread Stefan Beller
On Thu, Dec 29, 2016 at 3:37 PM, Rafal W wrote: > The following error happens when I'm running "git add ." in the submodule dir: > Thanks for reporting! Please see the patch that I sent out earlier today: https://public-inbox.org/git/20161229192908.32633-1-sbel...@google.com/

Bug: Assertion failed: function prefix_pathspec, file pathspec.c, line 317.

2016-12-29 Thread Rafal W
The following error happens when I'm running "git add ." in the submodule dir: $ GIT_TRACE=1 git add . 23:25:18.313575 git.c:350 trace: built-in: git 'add' '.' Assertion failed: (item->nowildcard_len <= item->len && item->prefix <= item->len), function prefix_pathspec, file

Re: [PATCH] am: add am.signoff add config variable

2016-12-29 Thread Stefan Beller
On Thu, Dec 29, 2016 at 2:43 PM, Junio C Hamano wrote: > Stefan Beller writes: > >>> IANAL either, but we have been striving to keep output of >>> >>>$ git grep '\.signoff' Documentation >> >>> >>> empty to keep Sign-off meaningful. >> >> Try again with

Re: [PATCH] am: add am.signoff add config variable

2016-12-29 Thread Junio C Hamano
Stefan Beller writes: >> IANAL either, but we have been striving to keep output of >> >>$ git grep '\.signoff' Documentation > >> >> empty to keep Sign-off meaningful. > > Try again with -i ;) > and you'll find format.signOff Mistakes happen. Finding an old mistake is

Re: [PATCH] am: add am.signoff add config variable

2016-12-29 Thread Stefan Beller
On Thu, Dec 29, 2016 at 1:42 PM, Junio C Hamano wrote: > Eric Wong writes: > >> Eduardo Habkost wrote: >>> git-am has options to enable --message-id and --3way by default, >>> but no option to enable --signoff by default. Add a

Re: [PATCH] am: add am.signoff add config variable

2016-12-29 Thread Eduardo Habkost
On Thu, Dec 29, 2016 at 01:42:13PM -0800, Junio C Hamano wrote: > Eric Wong writes: > > > Eduardo Habkost wrote: > >> git-am has options to enable --message-id and --3way by default, > >> but no option to enable --signoff by default. Add a "am.signoff" > >>

Re: [PATCH] am: add am.signoff add config variable

2016-12-29 Thread Junio C Hamano
Eric Wong writes: > Eduardo Habkost wrote: >> git-am has options to enable --message-id and --3way by default, >> but no option to enable --signoff by default. Add a "am.signoff" >> config option. > > I'm not sure this is a good idea. IANAL, but a sign-off

[PATCHv2] unpack-trees: move checkout state into check_updates

2016-12-29 Thread Stefan Beller
The checkout state was introduced via 16da134b1f9 (read-trees: refactor the unpack_trees() part, 2006-07-30). An attempt to refactor the checkout state was done in b56aa5b268e (unpack-trees: pass checkout state explicitly to check_updates(), 2016-09-13), but we can go even further. The `struct

[PATCH] pathspec: give better message for submodule related pathspec error

2016-12-29 Thread Stefan Beller
Every once in a while someone complains to the mailing list to have run into this weird assertion[1]. The usual response from the mailing list is link to old discussions[2], and acknowledging the problem stating it is known. For now just improve the user visible error message. [1]

Re: [PATCH] am: add am.signoff add config variable

2016-12-29 Thread Jacob Keller
On December 29, 2016 12:47:01 AM PST, Eric Wong wrote: >Eduardo Habkost wrote: >> git-am has options to enable --message-id and --3way by default, >> but no option to enable --signoff by default. Add a "am.signoff" >> config option. > >I'm not sure this is a

Re: [PATCH v3] am: add am.signoff add config variable

2016-12-29 Thread Eduardo Habkost
On Thu, Dec 29, 2016 at 08:58:36AM +0100, Andreas Schwab wrote: > On Dez 28 2016, Eduardo Habkost wrote: > > > @@ -32,10 +32,12 @@ OPTIONS > > If you supply directories, they will be treated as Maildirs. > > > > -s:: > > ---signoff:: > > +--[no-]-signoff:: > > That's

Re: [PATCH] am: add am.signoff add config variable

2016-12-29 Thread Eduardo Habkost
On Thu, Dec 29, 2016 at 08:47:01AM +, Eric Wong wrote: > Eduardo Habkost wrote: > > git-am has options to enable --message-id and --3way by default, > > but no option to enable --signoff by default. Add a "am.signoff" > > config option. > > I'm not sure this is a good

Re: [PATCH v2] am: add am.signoff add config variable

2016-12-29 Thread Eduardo Habkost
On Thu, Dec 29, 2016 at 01:29:33PM +0530, Pranit Bauva wrote: > Hey Eduardo, > > On Thu, Dec 29, 2016 at 12:49 AM, Eduardo Habkost wrote: > >> test_expect_success '--no-signoff overrides am.signoff' ' > >> rm -fr .git/rebase-apply && > >> git reset --hard first

Re: [PATCH] string-list: make compare function compatible with qsort(3)

2016-12-29 Thread René Scharfe
Am 21.12.2016 um 17:12 schrieb Jeff King: On Wed, Dec 21, 2016 at 10:36:41AM +0100, René Scharfe wrote: One shortcoming is that the comparison function is restricted to working with the string members of items; util is inaccessible to it. Another one is that the value of cmp is passed in a

Re: [PATCH] unpack-trees: move checkout state into check_updates

2016-12-29 Thread René Scharfe
Am 29.12.2016 um 00:26 schrieb Stefan Beller: The checkout state was introduced via 16da134b1f9 (read-trees: refactor the unpack_trees() part, 2006-07-30). An attempt to refactor the checkout state was done in b56aa5b268e (unpack-trees: pass checkout state explicitly to check_updates(),

Re: HowTo distribute a hook with the reposity.

2016-12-29 Thread Lars Schneider
> On 28 Dec 2016, at 19:53, Jacob Keller wrote: > > On Tue, Dec 27, 2016 at 10:08 PM, Jeff King wrote: >> >> https://github.com/Autodesk/enterprise-config-for-git >> >> (with the disclaimer that I've never used it myself, so I have no >>

[PATCH v2] git-p4: do not pass '-r 0' to p4 commands

2016-12-29 Thread Igor Kushnir
git-p4 crashes when used with a very old p4 client version that does not support the '-r ' option in its commands. Allow making git-p4 work with old p4 clients by setting git-p4.retries to 0. Alternatively git-p4.retries could be made opt-in. But since only very old, barely maintained p4

Re: What's cooking in git.git (Dec 2016, #08; Tue, 27)

2016-12-29 Thread Lars Schneider
> On 28 Dec 2016, at 00:11, Junio C Hamano wrote: > > > * bw/realpath-wo-chdir (2016-12-22) 5 commits > (merged to 'next' on 2016-12-22 at fea8fa870f) > + real_path: canonicalize directory separators in root parts > + real_path: have callers use real_pathdup and

Re: What's cooking in git.git (Dec 2016, #08; Tue, 27)

2016-12-29 Thread Duy Nguyen
On Thu, Dec 29, 2016 at 1:18 AM, Brandon Williams wrote: > On 12/27, Junio C Hamano wrote: >> * bw/pathspec-cleanup (2016-12-14) 16 commits >> - pathspec: rename prefix_pathspec to init_pathspec_item >> - pathspec: small readability changes >> - pathspec: create strip

Re: [PATCH] git-p4: do not pass '-r 0' to p4 commands

2016-12-29 Thread Lars Schneider
> On 29 Dec 2016, at 10:05, Igor Kushnir wrote: > > git-p4 crashes when used with a very old p4 client version > that does not support the '-r ' option in its commands. > > Allow making git-p4 work with old p4 clients by setting git-p4.retries to 0. > > Alternatively

Re: How can I make a best dissertation paper?

2016-12-29 Thread neiljakson
I am very glad to learn a lot from you this meaningful knowledge. From an article describing your unique way , we can see that you are an approachable , humorous person. Not only that, your article is rich with a lot of useful knowledge and helpful information. Dissertation writing services

Re: [PATCH] git-p4: do not pass '-r 0' to p4 commands

2016-12-29 Thread Luke Diamand
On 29 December 2016 at 09:05, Igor Kushnir wrote: > git-p4 crashes when used with a very old p4 client version > that does not support the '-r ' option in its commands. > > Allow making git-p4 work with old p4 clients by setting git-p4.retries to 0. > > Alternatively

[PATCH] git-p4: do not pass '-r 0' to p4 commands

2016-12-29 Thread Igor Kushnir
git-p4 crashes when used with a very old p4 client version that does not support the '-r ' option in its commands. Allow making git-p4 work with old p4 clients by setting git-p4.retries to 0. Alternatively git-p4.retries could be made opt-in. But since only very old, barely maintained p4

Re: [PATCH] am: add am.signoff add config variable

2016-12-29 Thread Eric Wong
Eduardo Habkost wrote: > git-am has options to enable --message-id and --3way by default, > but no option to enable --signoff by default. Add a "am.signoff" > config option. I'm not sure this is a good idea. IANAL, but a sign-off has some sort of legal meaning for this

Re: [PATCH v2] am: add am.signoff add config variable

2016-12-29 Thread Pranit Bauva
Hey Eduardo, On Thu, Dec 29, 2016 at 12:49 AM, Eduardo Habkost wrote: >> test_expect_success '--no-signoff overrides am.signoff' ' >> rm -fr .git/rebase-apply && >> git reset --hard first && >> test_config am.signoff true && >> git am --no-signoff >