Re: [PATCH] Makefile: add missing phony target

2015-12-10 Thread Matthieu Moy
Elia Pinto writes: > Also put the .PHONY > declaration immediately before the target declaration, where necessary, > for a better readability and a uniform style. [...] > --- a/Makefile > +++ b/Makefile > @@ -522,11 +522,11 @@ SCRIPT_PYTHON_INS = $(filter-out >

Re: git-clone fails when current user is not in /etc/passwd

2015-12-10 Thread Jeff King
On Wed, Dec 09, 2015 at 05:35:52PM -0500, Taylor Braun-Jones wrote: > > Well.. reflog needs it. So either you disable reflog at clone time or > > define name/email via config file. I don't see anything wrong with > > this behavior. > > Can't git just use "unknown" and "unknown@localhost" if the

Re: git-clone fails when current user is not in /etc/passwd

2015-12-10 Thread Taylor Braun-Jones
On Thu, Dec 10, 2015 at 1:43 PM, Junio C Hamano wrote: > Duy Nguyen writes: > >> Well.. reflog needs it. So either you disable reflog at clone time or >> define name/email via config file. I don't see anything wrong with >> this behavior. > > Hmm, I am not

Re: [PATCH v4] Documentation/git-update-index: add missing opts to synopsis

2015-12-10 Thread Junio C Hamano
Christian Couder writes: > On Wed, Nov 25, 2015 at 10:30 AM, Christian Couder > wrote: >> Split index related options should appear in the 'SYNOPSIS' >> section. >> >> These options are already documented in the 'OPTIONS' section. >> >>

Re: [PATCH 13/16] init: allow alternate backends to be set for new repos

2015-12-10 Thread David Turner
On Thu, 2015-12-10 at 13:02 -0500, Jeff King wrote: > On Wed, Dec 02, 2015 at 07:35:18PM -0500, David Turner wrote: > > > @@ -510,9 +511,36 @@ int validate_headref(const char *path) > > unsigned char sha1[20]; > > int fd; > > ssize_t len; > > + struct refdb_config_data refdb_data =

Re: git-clone fails when current user is not in /etc/passwd

2015-12-10 Thread Junio C Hamano
Jeff King writes: > But before we even hit the strict-check, we call xgetpwuid_self(), which > unconditionally dies on failure. I think that function needs to be > taught a "gently" form which we use for non-strict ident lookups. > Unfortunately it's a little non-trivial because

Re: [PATCH] rebase: add --verify-signatures

2015-12-10 Thread Junio C Hamano
Alexander 'z33ky' Hirsch <1ze...@gmail.com> writes: > + if test -n "$rebase_root" > + then > + foreign_revisions="$orig_head..$onto" > + else > + foreign_revisions="$orig_head..${restrict_revision-$upstream}" > + fi > + > + for cmt in $(git rev-list

Re: [PATCH] rebase: add --verify-signatures

2015-12-10 Thread Junio C Hamano
Junio C Hamano writes: > Alexander 'z33ky' Hirsch <1ze...@gmail.com> writes: > >> +if test -n "$rebase_root" >> +then >> +foreign_revisions="$orig_head..$onto" >> +else >> +foreign_revisions="$orig_head..${restrict_revision-$upstream}" >> +

[ANNOUNCE] Git Rev News edition 10

2015-12-10 Thread Christian Couder
Hi everyone, I'm happy announce that the 10th edition of Git Rev News is now published: https://git.github.io/rev_news/2015/12/09/edition-10/ It was supposed to be published yesterday but I got busy with other things. Sorry about that. Thanks a lot to all the contributors, especially Stefan!

[PATCH 2/3] ident: keep a flag for bogus default_email

2015-12-10 Thread Jeff King
If we have to deduce the user's email address and can't come up with something plausible for the hostname, we simply write "(none)" or ".(none)" in the hostname. Later, our strict-check is forced to use strstr to look for this magic string. This is probably not a problem in practice, but it's

[PATCH 3/3] ident: loosen getpwuid error in non-strict mode

2015-12-10 Thread Jeff King
If the user has not specified an identity and we have to turn to getpwuid() to find the username or gecos field, we die immediately when getpwuid fails (e.g., because the user does not exist). This is OK for making a commit, where we have set IDENT_STRICT and would want to bail on bogus input.

Re: git-clone fails when current user is not in /etc/passwd

2015-12-10 Thread Jeff King
On Thu, Dec 10, 2015 at 11:57:41AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > But before we even hit the strict-check, we call xgetpwuid_self(), which > > unconditionally dies on failure. I think that function needs to be > > taught a "gently" form which we use for

[PATCH 0/3] git-clone fails when current user is not in /etc/passwd

2015-12-10 Thread Jeff King
On Thu, Dec 10, 2015 at 03:40:35PM -0500, Jeff King wrote: > > All true. The adding of "(none)" in add_domainname() I used as an > > excuse to make the function stop barfing is a symptom coming from > > the above. That one should die when asked to do a strict thing > > (there is a corresponding

[PATCH 1/3] ident: make xgetpwuid_self() a static local helper

2015-12-10 Thread Jeff King
This function is defined in wrapper.c, but nobody besides ident.c uses it. And nobody is likely to in the future, either, as anything that cares about the user's name should be going through the ident code. Moving it here is a cleanup of the global namespace, but it will also enable further

Re: [PATCH 1/3] ident: make xgetpwuid_self() a static local helper

2015-12-10 Thread Junio C Hamano
Makes tons of sense (even without patches 2 and 3). Thanks. -- 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

[ANNOUNCE] Git v2.7.0-rc0

2015-12-10 Thread Junio C Hamano
An early preview release Git v2.7.0-rc0 is now available for testing at the usual places. It is comprised of 463 non-merge commits since v2.6.0, contributed by 69 people, 23 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The

Re: [PATCH 2/3] ident: keep a flag for bogus default_email

2015-12-10 Thread Jeff King
On Thu, Dec 10, 2015 at 04:35:35PM -0500, Jeff King wrote: > @@ -82,7 +83,7 @@ static int add_mailname_host(struct strbuf *buf) > return 0; > } > > -static void add_domainname(struct strbuf *out) > +static void add_domainname(struct strbuf *out, int *is_bogus) > { > char

Re: [PATCH 2/2] push: Use "last one wins" convention for --recurse-submodules

2015-12-10 Thread Junio C Hamano
Stefan Beller writes: >> + git push --recurse-submodules=on-demand >> --no-recurse-submodules ../pub.git master && >> + # Check that the submodule commit did not get there > > Do we want to check here that the supermodule commit did get there, >

Re: What's cooking in git.git (Dec 2015, #03; Thu, 10)

2015-12-10 Thread Junio C Hamano
Stefan Beller writes: >> * sb/submodule-parallel-fetch (2015-11-24) 17 commits >> ... > > I assume you plan on merging this after 2.7 settled and then we can > also get the above sb/submodule-parallel-update going again. Yeah, thanks for reminding me. I think that would be

What's cooking in git.git (Dec 2015, #03; Thu, 10)

2015-12-10 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. An early preview v2.7.0-rc0 has

Re: What's cooking in git.git (Dec 2015, #03; Thu, 10)

2015-12-10 Thread Stefan Beller
On Thu, Dec 10, 2015 at 2:46 PM, Junio C Hamano wrote: > > * sb/submodule-parallel-update (2015-11-20) 27 commits ... > > Waiting for sb/submodule-parallel-fetch to stabilize. > > It would be the cleanest to rebuild sb/submodule-parallel-fetch on > top of 2.7.0 once it ships

Re: What's cooking in git.git (Dec 2015, #03; Thu, 10)

2015-12-10 Thread John Keeping
On Thu, Dec 10, 2015 at 02:46:40PM -0800, Junio C Hamano wrote: > * jk/send-email-ssl-errors (2015-11-24) 1 commit > - send-email: enable SSL level 1 debug output > > Improve error reporting when SMTP TLS fails. > > Waiting for a reroll. > ($gmane/281693) It looks like this got lost in the

Re: What's cooking in git.git (Dec 2015, #03; Thu, 10)

2015-12-10 Thread Junio C Hamano
Stefan Beller writes: >> * sb/submodule-parallel-fetch (2015-11-24) 17 commits >> (merged to 'next' on 2015-12-04 at 2c5ea47) >> + run-command: detect finished children by closed pipe rather than waitpid >>... >> Waiting for review. > > What kind of review do you wait

Re: [PATCH 0/3] git-clone fails when current user is not in /etc/passwd

2015-12-10 Thread Junio C Hamano
Jeff King writes: > I don't think we want to pass down a "be strict" flag to the low-level > code filling in default_{name,email}. We might be strict in one call, > and non-strict in another within the same program. Worse, we actually > call ident_default_name() even when we don't

Re: [PATCH 2/2] rebase: fix preserving commits with --keep-empty

2015-12-10 Thread Michael Blume
This test does not seem to pass on my mac. I've placed the verbose output here: https://gist.github.com/MichaelBlume/db7ba222be001d502e57 On Fri, Nov 20, 2015 at 4:04 AM, Patrick Steinhardt wrote: > When rebasing commits where one or several commits are redundant > to commits on

Re: [PATCH 2/2] push: Use "last one wins" convention for --recurse-submodules

2015-12-10 Thread Stefan Beller
On Thu, Dec 3, 2015 at 5:10 AM, Mike Crowe wrote: > Use the "last one wins" convention for --recurse-submodules rather than > treating conflicting options as an error. > > Also, fix the declaration of the file-scope recurse_submodules global > variable to put it on a separate

Re: [PATCH 2/2] push: Use "last one wins" convention for --recurse-submodules

2015-12-10 Thread Stefan Beller
On Thu, Dec 10, 2015 at 3:38 PM, Junio C Hamano wrote: > Stefan Beller writes: > >>> + git push --recurse-submodules=on-demand >>> --no-recurse-submodules ../pub.git master && >>> + # Check that the submodule commit did not get

Re: What's cooking in git.git (Dec 2015, #03; Thu, 10)

2015-12-10 Thread Stefan Beller
On Thu, Dec 10, 2015 at 3:51 PM, Junio C Hamano wrote: > Stefan Beller writes: > >>> * sb/submodule-parallel-fetch (2015-11-24) 17 commits >>> ... >> >> I assume you plan on merging this after 2.7 settled and then we can >> also get the above

Re: [PATCH 2/8] update-index: use enum for untracked cache options

2015-12-10 Thread Christian Couder
On Tue, Dec 8, 2015 at 8:11 PM, Junio C Hamano wrote: > Christian Couder writes: > >> Signed-off-by: Christian Couder >> --- >> builtin/update-index.c | 18 +- >> 1 file changed, 13 insertions(+), 5

Re: [PATCH 2/8] update-index: use enum for untracked cache options

2015-12-10 Thread Junio C Hamano
Christian Couder writes: >>> +/* Untracked cache mode */ >>> +enum uc_mode { >>> + UNDEF_UC = -1, >>> + NO_UC = 0, >>> + UC, >>> + FORCE_UC >>> +}; >>> + >> >> With these, the code is much easier to read than with the mystery >> constants, but did you

Re: [PATCH 13/16] init: allow alternate backends to be set for new repos

2015-12-10 Thread Jeff King
On Wed, Dec 02, 2015 at 07:35:18PM -0500, David Turner wrote: > @@ -510,9 +511,36 @@ int validate_headref(const char *path) > unsigned char sha1[20]; > int fd; > ssize_t len; > + struct refdb_config_data refdb_data = {NULL, NULL}; > + > + if (lstat(path, ) < 0) { > +

Re: git-clone fails when current user is not in /etc/passwd

2015-12-10 Thread Junio C Hamano
Duy Nguyen writes: > Well.. reflog needs it. So either you disable reflog at clone time or > define name/email via config file. I don't see anything wrong with > this behavior. Hmm, I am not quite sure about that. In the codepath that computes ident_default_email(), which is

Re: [PATCH 0/3] git-clone fails when current user is not in /etc/passwd

2015-12-10 Thread Taylor Braun-Jones
On Thu, Dec 10, 2015 at 4:32 PM, Jeff King wrote: > So here's my solution, which instead carries the "is it bogus" flag > along with the default strings. > > [1/3]: ident: make xgetpwuid_self() a static local helper > [2/3]: ident: keep a flag for bogus default_email >

[PATCH] rebase: add --verify-signatures

2015-12-10 Thread Alexander 'z33ky' Hirsch
This option works analogous to --verify-signatures for git-merge by checking that the commits, that are rebased onto, have good GPG signatures. Additionally, git-pull now forwards --verify-signatures to rebase as well. Signed-off-by: Alexander 'z33ky' Hirsch <1ze...@gmail.com> --- I'm unsure if

Re: git-clone fails when current user is not in /etc/passwd

2015-12-10 Thread Taylor Braun-Jones
On Wed, Dec 9, 2015 at 5:35 PM, Taylor Braun-Jones wrote: > > On Wed, Dec 9, 2015 at 1:24 PM, Duy Nguyen wrote: > > On Wed, Dec 9, 2015 at 5:08 PM, Duy Nguyen wrote: > >> On Wed, Dec 2, 2015 at 9:10 PM, Taylor Braun-Jones > >>

[PATCH] Makefile: add missing phony target

2015-12-10 Thread Elia Pinto
Add some missing phony target to Makefile. Also put the .PHONY declaration immediately before the target declaration, where necessary, for a better readability and a uniform style. Signed-off-by: Elia Pinto --- Makefile | 31 +++ 1 file