Re: What's cooking in git.git (Jul 2015, #05; Mon, 20)

2015-07-20 Thread Junio C Hamano
David Turner writes: >> * dt/refs-backend-preamble (2015-07-13) 7 commits >> - git-stash: use update-ref --create-reflog instead of creating files >> - update-ref and tag: add --create-reflog arg >> - refs: add REF_FORCE_CREATE_REFLOG flag >> - git-reflog: add exists command >> - refs: new p

$0.92/pc monopod selfie stick,on promotion

2015-07-20 Thread Raymond
Dear Good day $0.92/pc monopod selfie stick with cable take pole,only from us,the arcpeaks factory Please feel free to contact me for more details Thanks Best Regards Ray arcpeaks.en.alibaba.com Skype:sixiwenzhi MOBIL:+86 18924649532 We will attend Hong kong Electronics Fair(Autumn Edition) On

Re: [PATCH 3/3] introduce "format" date-mode

2015-07-20 Thread Jeff King
On Mon, Jul 20, 2015 at 08:41:08PM -0400, Eric Sunshine wrote: > > Here's a patch, on top of jk/date-mode-format (I think it would also be > > fine to just squash into the tip commit; the explanation in the commit > > message is sufficiently mirrored in the code comment). > > While cleaning up ol

Re: What's cooking in git.git (Jul 2015, #05; Mon, 20)

2015-07-20 Thread David Turner
> * dt/refs-backend-preamble (2015-07-13) 7 commits > - git-stash: use update-ref --create-reflog instead of creating files > - update-ref and tag: add --create-reflog arg > - refs: add REF_FORCE_CREATE_REFLOG flag > - git-reflog: add exists command > - refs: new public ref function: safe_cre

Re: [PATCH 3/3] introduce "format" date-mode

2015-07-20 Thread Eric Sunshine
On Tue, Jun 30, 2015 at 9:26 AM, Jeff King wrote: > On Mon, Jun 29, 2015 at 06:22:47PM -0400, Eric Sunshine wrote: >> Clients of strbuf rightly expect the buffer to grow as needed in >> order to complete the requested operation. It is, therefore, both >> weird and expectation-breaking for strbuf_a

[GIT PULL] l10n updates for 2.5.0 round 2

2015-07-20 Thread Jiang Xin
Hi Junio, The following changes since commit 961abca02c532626df631c851688ec433095d93d: Merge tag 'l10n-2.5.0-rnd1' of git://github.com/git-l10n/git-po (2015-07-13 15:37:24 -0700) are available in the git repository at: git://github.com/git-l10n/git-po tags/l10n-2.5.0-rnd2 for you to fetch

What's cooking in git.git (Jul 2015, #05; Mon, 20)

2015-07-20 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'. You can find the changes described here in the integration branches of the repositories listed at http://git-blame.blogspot.com/p/git-publi

Re: [PATCH v2b 00/16, 2 updates] Make the msvc-build scripts work again

2015-07-20 Thread Junio C Hamano
Philip Oakley writes: > This updates two patches in the series based on Eric Sunshine's comments. > > Patch 8b updates the commit message to make clear what was going wrong. > > Patch 10b improves the perl code. Is v2b like saying v3 or something else? Does 8b replaces 8 or updates it (i.e. com

Re: [PATCH 3/3] doc: give examples for send-email cc-cmd operation

2015-07-20 Thread Junio C Hamano
Junio C Hamano writes: >> I was trying to use, essentially, 'cat list.txt' as the command,... One thing that needs to be made clear is that I do not think we want to encourage `cat list.txt #` abuse in the first place. It is an unacceptable hack for us to encourage in the longer term. It may h

[PATCH v2 10b/16] engine.pl: delete the captured stderr file if empty

2015-07-20 Thread Philip Oakley
Keep the build clean of extraneous files if it is indeed clean. Otherwise leave the msvc-build-makedryerrors.txt file both as a flag for any CI system or for manual debugging. Alternatively, with improved syntactic sugar[1]: unlink $ErrsFile if -f -z $ErrsFile; could be used but requires P

[PATCH v2 8b/16] engine.pl: ignore invalidcontinue.obj which is known to MSVC

2015-07-20 Thread Philip Oakley
Commit 4b623d8 (MSVC: link in invalidcontinue.obj for better POSIX compatibility, 2014-03-29) introduced invalidcontinue.obj into the Makefile output, which was not parsed correctly by the buildsystem. Ignore it, as it is known to Visual Studio and, there is no matching source file. Only substitut

[PATCH v2b 00/16, 2 updates] Make the msvc-build scripts work again

2015-07-20 Thread Philip Oakley
This updates two patches in the series based on Eric Sunshine's comments. Patch 8b updates the commit message to make clear what was going wrong. Patch 10b improves the perl code. Junio: would a full re-roll be appropriate at a suitable point? Philip Oakley (2): engine.pl: ignore invalidcont

Re: [PATCH 3/3] doc: give examples for send-email cc-cmd operation

2015-07-20 Thread Junio C Hamano
"Philip Oakley" writes: > We seem to be going round in circles. I do not think so. > Currently the --cc-cmd isn't well documented. Yes, I agree. > I was trying to use, essentially, 'cat list.txt' as the command, which > should work according to the current doc, which says nothing about > how/

Re: [PATCH 3/3] doc: give examples for send-email cc-cmd operation

2015-07-20 Thread Philip Oakley
From: "Junio C Hamano" Philip Oakley writes: +git-send-email invokes the cc-cmd like this: + + $cc-cmd $patchfilename + +Thus the patch itself can be processed to locate appropriate email address +information if required. That's not even a valid command line (cc-cmd cannot be a shell vari

Re: [PATCH] userdiff: add support for Fountain documents

2015-07-20 Thread Junio C Hamano
Zoë Blade writes: > diff --git a/userdiff.c b/userdiff.c > index 2ccbee5..5a600d6 100644 > --- a/userdiff.c > +++ b/userdiff.c > @@ -35,6 +35,8 @@ IPATTERN("fortran", > * they would have been matched above as a variable anyway. */ > > "|[-+]?[0-9.]+([AaIiDdEeFfLlTtXx][Ss]?[-+]?[0

Re: [PATCH 3/3] doc: give examples for send-email cc-cmd operation

2015-07-20 Thread Eric Sunshine
On Mon, Jul 20, 2015 at 3:36 PM, Philip Oakley wrote: > From: "Eric Sunshine" >>> + echo <<\EOF >>> + pers...@example.com >>> + pers...@example.com >>> + EOF >> >> I don't know if it deserves mention that the script must be executable >> (chmod +x) or should we assume that

Re: [PATCH 3/3] doc: give examples for send-email cc-cmd operation

2015-07-20 Thread Eric Sunshine
On Mon, Jul 20, 2015 at 3:14 PM, Eric Sunshine wrote: > If you really want to give an example of how to use --cc-cmd > (--to-cmd) with a plain text file holding email addresses, maybe > something like this instead: > > Create an EXAMPLES section. > > Make the bare-bones, static address list script

Re: [PATCH 3/3] doc: give examples for send-email cc-cmd operation

2015-07-20 Thread Junio C Hamano
Philip Oakley writes: > +git-send-email invokes the cc-cmd like this: > + > + $cc-cmd $patchfilename > + > +Thus the patch itself can be processed to locate appropriate email address > +information if required. That's not even a valid command line (cc-cmd cannot be a shell variable name), so

Re: [PATCH 3/3] doc: give examples for send-email cc-cmd operation

2015-07-20 Thread Philip Oakley
From: "Eric Sunshine" On Mon, Jul 20, 2015 at 2:26 PM, Philip Oakley wrote: Explain how the cc-cmd (and to-cmd) is invoked, along with two simple examples (and a how-not-to example) to help in getting started. Helped-by: Eric Sunshine Signed-off-by: Philip Oakley --- diff --git a/Document

Re: [PATCH 3/3] doc: give examples for send-email cc-cmd operation

2015-07-20 Thread Eric Sunshine
On Mon, Jul 20, 2015 at 2:50 PM, Eric Sunshine wrote: > On Mon, Jul 20, 2015 at 2:26 PM, Philip Oakley wrote: >> Explain how the cc-cmd (and to-cmd) is invoked, along with two >> simple examples (and a how-not-to example) to help in getting started. >> >> Helped-by: Eric Sunshine >> Signed-off-b

Re: [PATCH 2/3] doc: send-email; expand oon the meaning of 'auto-cc'

2015-07-20 Thread Philip Oakley
This one, with "oon" in the subject, is incorrect. I made the same mistake yesterday, thinking that a fresh format-patch had/would over-write the previous patches, but I'd forgot, again, that the filename uses the subject line, so send-email picked up both versions .. doh. Sorry for the nois

Re: [PATCH 3/3] doc: give examples for send-email cc-cmd operation

2015-07-20 Thread Eric Sunshine
On Mon, Jul 20, 2015 at 2:26 PM, Philip Oakley wrote: > Explain how the cc-cmd (and to-cmd) is invoked, along with two > simple examples (and a how-not-to example) to help in getting started. > > Helped-by: Eric Sunshine > Signed-off-by: Philip Oakley > --- > diff --git a/Documentation/git-send-

Re: [PATCH 2/3] doc: send-email; expand on the meaning of 'auto-cc'

2015-07-20 Thread Eric Sunshine
On Mon, Jul 20, 2015 at 2:26 PM, Philip Oakley wrote: > doc: send-email; expand on the meaning of 'auto-cc' s/;/:/ > Signed-off-by: Philip Oakley > --- > diff --git a/Documentation/git-send-email.txt > b/Documentation/git-send-email.txt > index bc357b8..ddc8a11 100644 > --- a/Documentation/git

[PATCH 3/3] doc: give examples for send-email cc-cmd operation

2015-07-20 Thread Philip Oakley
Explain how the cc-cmd (and to-cmd) is invoked, along with two simple examples (and a how-not-to example) to help in getting started. Helped-by: Eric Sunshine Signed-off-by: Philip Oakley --- http://article.gmane.org/gmane.comp.version-control.git/274302 --- Documentation/git-send-email.txt | 3

[PATCH 0/3] Update send-email cc-cmd documentation

2015-07-20 Thread Philip Oakley
This mini series updates captures the details of how to use the cc-cmd option of send-email, following my abortive attempts to use a simple 'cat cc-cmd' invocation. The alternative text for 'auto-cc' has been somewhat guesses at. I haven't tested how well it lays out when docbook'ed. The series

[PATCH 2/3] doc: send-email; expand oon the meaning of 'auto-cc'

2015-07-20 Thread Philip Oakley
Signed-off-by: Philip Oakley --- Documentation/git-send-email.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index bc357b8..ddc8a11 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-se

[PATCH 2/3] doc: send-email; expand on the meaning of 'auto-cc'

2015-07-20 Thread Philip Oakley
Signed-off-by: Philip Oakley --- Documentation/git-send-email.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index bc357b8..ddc8a11 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-se

[PATCH 1/3] doc: convert send-email option headings to nouns

2015-07-20 Thread Philip Oakley
... for ease of reference within the text. Except the 'Sending options' for which there wasn't an obvious noun phrase. Signed-off-by: Philip Oakley --- Documentation/git-send-email.txt | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/git-send-em

Re: [PATCH v3 1/9] ref-filter: add option to align atoms to the left

2015-07-20 Thread Karthik Nayak
On Mon, Jul 20, 2015 at 11:31 PM, Eric Sunshine wrote: > On Mon, Jul 20, 2015 at 1:22 PM, Karthik Nayak wrote: >> Add a new atom "align" and support %(align:X) where X is a number. >> This will align the preceeding atom value to the left followed by >> spaces for a total length of X characters. I

Re: [PATCH v3 5/9] ref-filter: add option to match literal pattern

2015-07-20 Thread Eric Sunshine
On Mon, Jul 20, 2015 at 4:01 AM, Christian Couder wrote: > On Mon, Jul 20, 2015 at 8:24 AM, Eric Sunshine > wrote: >> On Sat, Jul 18, 2015 at 3:12 PM, Karthik Nayak wrote: >>> +static int filter_pattern_match(struct ref_filter *filter, const char >>> *refname) >>> +{ >>> + if (!*filter->

Re: [msysGit] [PATCH v2 10/16] engine.pl: delete the captured stderr file if empty

2015-07-20 Thread Eric Sunshine
On Mon, Jul 20, 2015 at 7:55 AM, Philip Oakley wrote: > From: "Eric Sunshine" >> Although that works, I'm not sure that it's really all that desirable >> due to the unnecessary and potentially confusing 'for' loop. I'd >> probably just write it as: >> >>unlink $ErrsFile if -f $ErrsFile && !-s

Re: How to use --cc-cmd in git-send-email?

2015-07-20 Thread Eric Sunshine
On Mon, Jul 20, 2015 at 10:20 AM, Philip Oakley wrote: > From: "Eric Sunshine" >> On Mon, Jul 20, 2015 at 2:01 AM, Philip Oakley >> wrote: >>> I may try and do a small doc patch for the git-send-email.txt man page (I >>> have a few doc fixes backing up waiting to be done ;-) >> >> That would be

Re: [PATCH v3 1/9] ref-filter: add option to align atoms to the left

2015-07-20 Thread Eric Sunshine
On Mon, Jul 20, 2015 at 1:22 PM, Karthik Nayak wrote: > Add a new atom "align" and support %(align:X) where X is a number. > This will align the preceeding atom value to the left followed by > spaces for a total length of X characters. If X is less than the item > size, the entire atom value is pr

Re: [PATCH v2] unpack-trees: don't update files with CE_WT_REMOVE set

2015-07-20 Thread David Turner
Anatole tells me that this works for us. Thanks. On Sat, 2015-07-18 at 15:37 +0700, Duy Nguyen wrote: > On Fri, Jul 17, 2015 at 05:19:27PM -0400, David Turner wrote: > > Don't update files in the worktree from cache entries which are > > flagged with CE_WT_REMOVE. > > > > When a user does a spar

Re: [PATCH v3 1/9] ref-filter: add option to align atoms to the left

2015-07-20 Thread Eric Sunshine
On Mon, Jul 20, 2015 at 12:12 PM, Junio C Hamano wrote: > Eric Sunshine writes: > >> On Sat, Jul 18, 2015 at 3:12 PM, Karthik Nayak wrote: >>> Add a new atom "align" and support %(align:X) where X is a number. >>> This will align the preceeding atom value to the left followed by >>> spaces for a

Re: [PATCH v3 1/9] ref-filter: add option to align atoms to the left

2015-07-20 Thread Junio C Hamano
Junio C Hamano writes: > Your caller is iterating over the elements in a format string, > e.g. 'A %(align:20)%(foo) B %(bar) C', and its caller is iterating > over a list of refs, e.g. 'maint', 'master' branches. With that > format string, as long as %(foo) does not expand to something that > ex

[PATCH v3 1/9] ref-filter: add option to align atoms to the left

2015-07-20 Thread Karthik Nayak
From: Karthik Nayak Add a new atom "align" and support %(align:X) where X is a number. This will align the preceeding atom value to the left followed by spaces for a total length of X characters. If X is less than the item size, the entire atom value is printed. Helped-by: Duy Nguyen Mentored-b

Re: [PATCH v3 1/9] ref-filter: add option to align atoms to the left

2015-07-20 Thread Karthik Nayak
> > What is your plan for this function? Is it envisioned that this > will gain more variations of formatting options over time? > Otherwise it seems misnamed (it is not "assign formatting" but > merely "pad to the right"). > I wanna include an 'ifexists' atom in the future where an user can spec

Re: [PATCH v3 1/9] ref-filter: add option to align atoms to the left

2015-07-20 Thread Junio C Hamano
Karthik Nayak writes: > @@ -687,6 +690,17 @@ static void populate_value(struct ref_array_item *ref) > else > v->s = " "; > continue; > + } else if (starts_with(name, "align:")) { > + const ch

Re: [PATCH v3 4/9] ref-filter: add support to sort by version

2015-07-20 Thread Karthik Nayak
On Mon, Jul 20, 2015 at 7:09 AM, Eric Sunshine wrote: > > To agree with the actual code: s/version_cmp/versioncmp/ > Yeah! will change. > > Assuming I'm a reader without prior knowledge, the first question > which pops into my mind is "what's the difference between > 'version:refname' and 'v:ref

Re: [PATCH v3 1/9] ref-filter: add option to align atoms to the left

2015-07-20 Thread Junio C Hamano
Eric Sunshine writes: > On Sat, Jul 18, 2015 at 3:12 PM, Karthik Nayak wrote: >> Add a new atom "align" and support %(align:X) where X is a number. >> This will align the preceeding atom value to the left followed by >> spaces for a total length of X characters. If X is less than the item >> siz

Re: [PATCH 2/2] Fix sed usage in tests to work around broken xpg4/sed on Solaris

2015-07-20 Thread Junio C Hamano
Johannes Sixt writes: >> I really wonder why the previous ">file+ && mv -f file+ file" dance >> needs to be replaced? > > The sed must be replaced because some versions on Solaris choke on the > incomplete last line in the file. Switching from sed to perl is not being questioned. I think Dscho

Re: Git tag: pre-receive hook issue

2015-07-20 Thread Keller, Jacob E
On Mon, 2015-07-20 at 13:13 +0530, Gaurav Chhabra wrote: > Hi Jake, > > Thanks about the refs/tags check. I’m aware about this. Junio also > explained it in one of his replies. I was actually confused why my > current code was working in past for few of the annotated tags. > Anyways, now that I ha

Re: [PATCH v2 0/5] mh: worktree-related doc fixes

2015-07-20 Thread Michael Haggerty
On 07/19/2015 10:29 PM, Eric Sunshine wrote: > This re-roll of Michael Haggerty's worktree-related documentation > tweaks[1] takes my review comments into account and adds one new patch. Eric, Thanks for separating the wheat from the chaff. I'm still traveling, which I'll claim as an excuse for m

Re: [PATCH v3 3/9] ref-filter: support printing N lines from tag annotation

2015-07-20 Thread Karthik Nayak
On Mon, Jul 20, 2015 at 5:32 AM, Eric Sunshine wrote: > On Sat, Jul 18, 2015 at 3:12 PM, Karthik Nayak wrote: >> In 'tag.c' we can print N lines from the annotation of the tag using >> the '-n' option. Copy code from 'tag.c' to 'ref-filter' and >> modify 'ref-filter' to support printing of N line

Re: [PATCH v3 1/9] ref-filter: add option to align atoms to the left

2015-07-20 Thread Karthik Nayak
On Mon, Jul 20, 2015 at 5:19 AM, Eric Sunshine wrote: > On Sat, Jul 18, 2015 at 3:12 PM, Karthik Nayak wrote: >> Add a new atom "align" and support %(align:X) where X is a number. >> This will align the preceeding atom value to the left followed by >> spaces for a total length of X characters. If

Re: How to use --cc-cmd in git-send-email?

2015-07-20 Thread Philip Oakley
From: "Eric Sunshine" On Mon, Jul 20, 2015 at 2:01 AM, Philip Oakley wrote: From: "Eric Sunshine" git-send-email invokes the cc-cmd like this: $cc-cmd $patchfilename so, when you used 'cat cc-cmd' as the value of --cc-cmd, your invocation became: cat cc-cmd $patchfilename and sin

Re: [msysGit] [PATCH v2 10/16] engine.pl: delete the captured stderr file if empty

2015-07-20 Thread Philip Oakley
From: "Eric Sunshine" On Mon, Jul 20, 2015 at 2:16 AM, Philip Oakley wrote: From: "Eric Sunshine" On Sun, Jul 19, 2015 at 4:08 PM, Philip Oakley wrote: Keep the build clean of extraneous files if it is indeed clean. Otherwise leave the msvc-build-makedryerrors.txt file both as a flag for a

Re: [PATCH v3 5/9] ref-filter: add option to match literal pattern

2015-07-20 Thread Christian Couder
On Mon, Jul 20, 2015 at 8:24 AM, Eric Sunshine wrote: > On Sat, Jul 18, 2015 at 3:12 PM, Karthik Nayak wrote: >> Since 'ref-filter' only has an option to match path names add an >> option for plain fnmatch pattern-matching. >> >> This is to support the pattern matching options which are used in `

Re: Git tag: pre-receive hook issue

2015-07-20 Thread Gaurav Chhabra
Hi Jake, Thanks about the refs/tags check. I’m aware about this. Junio also explained it in one of his replies. I was actually confused why my current code was working in past for few of the annotated tags. Anyways, now that I have clarity about the mistake in the code, I guess, I’ll figure it out

Re: git on vagrant shared folder

2015-07-20 Thread Peter Hüfner
Junio is absolutely right. I wasn’t trying to commit that file directly. The error comes up when I want to change the config via git config or when I clone the repo. I also know that a shared folder is not a very friendly environment, but it is the best solution for our situation here. We recogn