[PATCH] Drop some dashes from built-in invocations in scripts

2017-08-04 Thread Michael Forney
This way, they still work even if the built-in symlinks aren't installed. Signed-off-by: Michael Forney --- It looks like there was an effort to do this a number of years ago (through `make remove-dashes`). These are just a few I noticed were still left in the .sh scripts. git-merge-octopus.sh

Re: Partial clone design (with connectivity check for locally-created objects)

2017-08-04 Thread Jonathan Tan
On Fri, 04 Aug 2017 15:51:08 -0700 Junio C Hamano wrote: > Jonathan Tan writes: > > > "Imported" objects must be in a packfile that has a ".remote" > > file with arbitrary text (similar to the ".keep" file). They come from > > clones, fetches, and the object loader (see below). > > ... > > A "h

[PATCH] git svn fetch: Create correct commit timestamp when using --localtime

2017-08-04 Thread Urs Thuermann
In parse_svn_date() prepend the correct UTC offset to the timestamp returned. This is the offset in effect at the commit time instead of the offset in effect at calling time. Signed-off-by: Urs Thuermann --- perl/Git/SVN.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/per

Re: Partial clone design (with connectivity check for locally-created objects)

2017-08-04 Thread Junio C Hamano
Jonathan Tan writes: > "Imported" objects must be in a packfile that has a ".remote" > file with arbitrary text (similar to the ".keep" file). They come from > clones, fetches, and the object loader (see below). > ... > A "homegrown" object is valid if each object it references: > 1. is a "homeg

Re: Fwd: bug: contrib/subtree: Commit message title should be in imperative mood

2017-08-04 Thread Bjørn Erik Pedersen
I would argue that: 1. If used on the "Git project itself" (as in my case), the commit message now cannot be used unedited because it is a conflict with the project's guidelines, and also conflicts with the format of "all" (or most) the other Git (and GitHub) commit titles. 2. If not "used on the

Re: [PATCH v2 10/15] diff: stop allowing diff to have submodules configured in .git/config

2017-08-04 Thread Brandon Williams
On 08/03, Junio C Hamano wrote: > Brandon Williams writes: > > > Traditionally a submodule is comprised of a gitlink as well as a > > corresponding entry in the .gitmodules file. Diff doesn't follow this > > paradigm as its config callback routine falls back to populating the > > submodule-confi

Re: [PATCH v2 02/15] submodule: don't use submodule_from_name

2017-08-04 Thread Brandon Williams
On 08/03, Stefan Beller wrote: > On Thu, Aug 3, 2017 at 11:19 AM, Brandon Williams wrote: > > The function 'submodule_from_name()' is being used incorrectly here as a > > submodule path is being used instead of a submodule name. Since the > > correct function to use with a path to a submodule is

Partial clone design (with connectivity check for locally-created objects)

2017-08-04 Thread Jonathan Tan
After some discussion in [1] (in particular, about preserving the functionality of the connectivity check as much as possible) and some in-office discussion, here's an updated design. Overview This is an update of the design in [1]. The main difference between this and other related wor

Re: [RFC] imap-send: escape backslash in password

2017-08-04 Thread Jeff King
On Fri, Aug 04, 2017 at 02:18:13PM -0700, Junio C Hamano wrote: > > I also think it might be reasonable to scrap all of this ad-hoc imap > > code in favor of curl, which already gets these cases right. We already > > have a curl-backed implementation. I think we just left the old code out > > of c

Re: Fwd: bug: contrib/subtree: Commit message title should be in imperative mood

2017-08-04 Thread Junio C Hamano
Bjørn Erik Pedersen writes: > I.e. "Squash 'somedir' changes" and not "Squashed ..." > > See > > https://github.com/git/git/blob/master/contrib/subtree/git-subtree.sh#L463 I do not think this is necessarily a good change. "git subtree" (in contrib/) is not a tool limited to be used on projects

Re: [RFC] imap-send: escape backslash in password

2017-08-04 Thread Junio C Hamano
Jeff King writes: > It's been a long time since I've done anything with IMAP, but I think > another alternative would be to send it as a "literal", like: > > {6} > foobar > > That's relatively easy to format correctly using the current printf > specifiers that imap_exec() takes. Though as I s

Fwd: bug: contrib/subtree: Commit message title should be in imperative mood

2017-08-04 Thread Bjørn Erik Pedersen
I.e. "Squash 'somedir' changes" and not "Squashed ..." See https://github.com/git/git/blob/master/contrib/subtree/git-subtree.sh#L463

Re: [PATCH v5 08/40] Git/Packet.pm: add capability functions

2017-08-04 Thread Christian Couder
On Thu, Aug 3, 2017 at 9:14 PM, Junio C Hamano wrote: > Christian Couder writes: > >> Add functions to help read and write capabilities. >> Use these functions in 't/t0021/rot13-filter.pl'. >> >> Signed-off-by: Christian Couder >> --- > > Steps 06-08/40 all look sensible to me, but they probably

Re: [RFC] imap-send: escape backslash in password

2017-08-04 Thread Jeff King
On Fri, Aug 04, 2017 at 09:46:49PM +0200, Andreas Schwab wrote: > > For example, FRC3501 "9. Formal Syntax" says that both "password" > > and "userid" are "astring"; it looks strange that the code with this > > patch only touches cred.password while sending cred.username as-is. > > astring

Re: [RFC] imap-send: escape backslash in password

2017-08-04 Thread Jeff King
On Fri, Aug 04, 2017 at 08:06:43PM +, brian m. carlson wrote: > On Fri, Aug 04, 2017 at 06:16:53PM +0200, Nicolas Morey-Chaisemartin wrote: > > static struct imap_store *imap_open_store(struct imap_server_conf *srvc, > > char *folder) > > { > > struct credential cred = CREDENTIAL_INIT;

Re: [RFC] imap-send: escape backslash in password

2017-08-04 Thread brian m. carlson
On Fri, Aug 04, 2017 at 06:16:53PM +0200, Nicolas Morey-Chaisemartin wrote: > static struct imap_store *imap_open_store(struct imap_server_conf *srvc, > char *folder) > { > struct credential cred = CREDENTIAL_INIT; > @@ -1090,7 +1116,7 @@ static struct imap_store *imap_open_store(struct >

Re: [RFC] imap-send: escape backslash in password

2017-08-04 Thread Andreas Schwab
On Aug 04 2017, Junio C Hamano wrote: > Is the quoting rules documented somewhere? If so, please also give > a reference to it here. RFC3501 "6.2.3 LOGIN Command" does not say > much (other parts of the RFC may specify the rules that apply to > arguments in general, but I didn't look for them).

Re: [RFC] imap-send: escape backslash in password

2017-08-04 Thread Nicolas Morey-Chaisemartin
Le 04/08/2017 à 21:09, Junio C Hamano a écrit : > Nicolas Morey-Chaisemartin writes: > >> Password containing backslashes need to have them doubled to have them >> properly interpreted by the imap server. > Please wrap this into lines with reasonable lengths like 72 cols. I haven't checked the

Re: [PATCH v1 1/1] correct apply for files commited with CRLF

2017-08-04 Thread Junio C Hamano
Junio C Hamano writes: > The "previous" in the context of running "git apply" (which does not > look at the index) is _not_ what is in the index, on the other hand. > Instead of "struct index_state *", convert_to_git() needs to be > fixed to take something else that can be queried for the "previo

Re: [RFC] imap-send: escape backslash in password

2017-08-04 Thread Junio C Hamano
Nicolas Morey-Chaisemartin writes: > Password containing backslashes need to have them doubled to have them > properly interpreted by the imap server. Please wrap this into lines with reasonable lengths like 72 cols. Is the quoting rules documented somewhere? If so, please also give a referen

[RFC] imap-send: escape backslash in password

2017-08-04 Thread Nicolas Morey-Chaisemartin
Password containing backslashes need to have them doubled to have them properly interpreted by the imap server. A password terminating with a blackslash used to trigger this error: IMAP command 'LOGIN ' returned response (BAD) - Missing '"' Signed-off-by: Nicolas Morey-Chaisemartin --- imap-s

Re: [PATCH v1 1/1] correct apply for files commited with CRLF

2017-08-04 Thread Junio C Hamano
Torsten Bögershausen writes: > Back to the fix, the read_old_data() from below works on the working tree, > yes, but after convert_to_git(). > And that is why we need the index, to fix this very case. But "git apply" (without "--cached" or "--index") is to work on the working tree file only. Th

Re: [PATCH v1 1/1] correct apply for files commited with CRLF

2017-08-04 Thread Torsten Bögershausen
On 08/02/2017 11:13 PM, Junio C Hamano wrote: tbo...@web.de writes: From: Torsten Bögershausen git apply does not find the source lines when files have CRLF in the index and core.autocrlf is true: These files should not get the CRLF converted to LF. Because cmd_apply() does not load the ind

Re: [PATCH] clone: teach recursive clones to respect -q

2017-08-04 Thread Brandon Williams
On 08/04, Junio C Hamano wrote: > Brandon Williams writes: > > > Teach 'git clone --recurse-submodules' to respect the '-q' option by > > passing down the quiet flag to the process which handles cloning of > > submodules. > > > > Signed-off-by: Brandon Williams > > --- > > builtin/clone.c

What's cooking in git.git (Aug 2017, #01; Fri, 4)

2017-08-04 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 2.14-rc2 was a bit delayed for

A note from the maintainer

2017-08-04 Thread Junio C Hamano
Welcome to the Git development community. This message is written by the maintainer and talks about how Git project is managed, and how you can work with it. * Mailing list and the community The development is primarily done on the Git mailing list. Help requests, feature proposals, bug reports

[ANNOUNCE] Git v2.14.0

2017-08-04 Thread Junio C Hamano
The latest feature release Git v2.14.0 is now available at the usual places. It is comprised of 727 non-merge commits since v2.13.0, contributed by 66 people, 18 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ when kernel.org mirrors catch up.

Re: [PATCH v3 1/7] builtin.h: take over documentation from api-builtin.txt

2017-08-04 Thread Martin Ågren
On 4 August 2017 at 18:00, Junio C Hamano wrote: > Martin Ågren writes: > >> Since this is my first code contribution to Git, I'll ask about this part of >> SubmittingPatches: >> >> "After the list reached a consensus that it is a good idea to apply the >> patch, re-send it with "To:" set to the

Re: [PATCH] clone: teach recursive clones to respect -q

2017-08-04 Thread Junio C Hamano
Brandon Williams writes: > Teach 'git clone --recurse-submodules' to respect the '-q' option by > passing down the quiet flag to the process which handles cloning of > submodules. > > Signed-off-by: Brandon Williams > --- > builtin/clone.c| 3 +++ > t/t7400-submodule-basic.sh | 6 ++

Re: [PATCH v3 1/7] builtin.h: take over documentation from api-builtin.txt

2017-08-04 Thread Junio C Hamano
Martin Ågren writes: > Since this is my first code contribution to Git, I'll ask about this part of > SubmittingPatches: > > "After the list reached a consensus that it is a good idea to apply the > patch, re-send it with "To:" set to the maintainer [*1*] and "cc:" the > list [*2*] for inclusion.

Hello:

2017-08-04 Thread Chris Rholand
Greetings, I'm Chris Rholand Esq, from DLA (Defence League of Attorneys) & Associates, London, United Kingdom, We are attorneys to your deceased relative, Who leaved in London. You have the right to his inheritance as next of kin. Reply ASAP for more details on how to proceed, Sincerely, Chris

08/04/2017 akutt svar

2017-08-04 Thread Aspire Money Loan®
Hilsener, Jeg er fru Annie Ethan fra et privat lånefirma kjent som Aspire Money Loan®. Vi tilbyr alle typer lån til 3% rente. Hvis du har behov for lån, vennligst kontakt oss med nedenstående informasjon. Fullt navn: Kjønn: Land: Adresse: Lånebeløp: Varighet: Tel: Vi venter på ditt sv