$0.99/pc monopod selfie stick,on promotion

2015-07-12 Thread Raymond
Dear Good day $0.99/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: Git at OSCON

2015-07-12 Thread Stefan Beller
On Sun, Jul 12, 2015 at 9:01 PM, Jeff King wrote: > OSCON is coming up soon (the week of the 20th) in Portland, and I want > to let people know that there's going to be a small Git table in the > exhibit hall, connected to the GitHub booth. I'll be manning the table > both days (Wednesday and Thur

Git at OSCON

2015-07-12 Thread Jeff King
OSCON is coming up soon (the week of the 20th) in Portland, and I want to let people know that there's going to be a small Git table in the exhibit hall, connected to the GitHub booth. I'll be manning the table both days (Wednesday and Thursday the 22nd and 23rd), telling people about how great git

Re: [PATCH] check_and_freshen_file: fix reversed success-check

2015-07-12 Thread Jeff King
On Sun, Jul 12, 2015 at 12:21:33AM +0200, X H wrote: > How are the permission handled, is it git that is asking to create a file > read only or rw on the remote or is it the environment with umask ans so on > that decides it, or Windows when the drive is mounted with noacl? Generally, git follows

[GSOC] Update 5: Unification of tag -l, branch -l and for-each-ref

2015-07-12 Thread Karthik Nayak
Hello All, As part of GSoC I'm working on the Unification of 'for-each-ref', 'tag -l' and 'branch -l'. Sorry for the lack of update since Jun 14, was a little busy with an exam I had. Now thats over, I will be working more on the project. Current Progress: 1. Building ref-filter.{c,h} from for-e

Re: [PATCH v2 01/10] ref-filter: add %(refname:shortalign=X) option

2015-07-12 Thread Karthik Nayak
On Sun, Jul 12, 2015 at 7:17 AM, Duy Nguyen wrote: > > I guess if you can have multiple arguments after ':' in an atom, then > you have wiggle room for future. But it looks like you only accept one > argument after ':'.. (I only checked the version on 'pu'). Having an > "alignment atom" to augment

Re: [PATCH v2 08/10] tag.c: use 'ref-filter' APIs

2015-07-12 Thread Karthik Nayak
On Sun, Jul 12, 2015 at 3:15 PM, Duy Nguyen wrote: > On Thu, Jul 9, 2015 at 5:58 PM, Karthik Nayak wrote: >> -static int show_reference(const char *refname, const struct object_id *oid, >> - int flag, void *cb_data) >> -{ > ... >> - >> - if (match_pattern(filter->nam

Re: [PATCH 10/16] worktree: make branch creation distinct from worktree population

2015-07-12 Thread Eric Sunshine
On Sun, Jul 12, 2015 at 04:54:02PM +0700, Duy Nguyen wrote: > On Sun, Jul 12, 2015 at 10:27 AM, Eric Sunshine > wrot> > In this case, it's easy enough to side-step the issue since there's no > > need to call ref_exists() if the new branch was created successfully > > (since we know it exists). Th

Re: [PATCH] rev-parse --parseopt: allow [*=?!] in argument hints

2015-07-12 Thread Philip Oakley
From: Sent: Sunday, July 12, 2015 10:39 AM From: Ilya Bobyr It is not very likely that any of the "*=?!" Characters would be useful in the argument short or long names. On the other hand, there are already argument hints that contain the "=" sign. It used to be impossible to include any of

Re: [PATCH v5 00/44] Make git-am a builtin

2015-07-12 Thread Junio C Hamano
Paul Tan writes: >> However, I am reluctant to blindly replace assert(!state->field) >> with free(state->field). Are there cases where we _must_ call a >> function that sets these fields at most once? > > I wouldn't say we are "blindly" replacing them. I said "I was", not "you and me". If ther

Re: [PATCH] rev-parse --parseopt: allow [*=?!] in argument hints

2015-07-12 Thread Junio C Hamano
ilya.bo...@gmail.com writes: > From: Ilya Bobyr > > It is not very likely that any of the "*=?!" Characters would be useful > in the argument short or long names. On the other hand, there are > already argument hints that contain the "=" sign. It used to be > impossible to include any of the "*

Re: [PATCH] diff: parse ws-error-highlight option more strictly

2015-07-12 Thread Junio C Hamano
René Scharfe writes: > Check if a matched token is followed by a delimiter before advancing the > pointer arg. This avoids accepting composite words like "allnew" or > "defaultcontext". > > Signed-off-by: Rene Scharfe > --- > diff.c | 7 ++- > 1 file changed, 6 insertions(+), 1 deletion(-)

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

2015-07-12 Thread Junio C Hamano
Eric Sunshine writes: > Did you want to drop the final patch[*1*] which retires > --ignore-other-worktrees in favor of --force before letting this > graduate to 'master'? Yeah, thanks for catching it. > By the way, v1 of the follow-on series which replaces "git checkout" > with "git reset --har

Re: [PATCH] Documentation clarification on git-checkout regarding ours/theirs

2015-07-12 Thread Junio C Hamano
"Simon A. Eugster" writes: >> +... As the keeper of >> +the canonical history, you need to view the history from the remote >> +as `ours` (i.e. "our shared canonical history"), while what you did >> +on your side branch as `theirs` (i.e. "one contributor's work on top >> +of it"). >> >> -b ::

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

2015-07-12 Thread Karthik Nayak
On Sun, Jul 12, 2015 at 2:39 PM, Duy Nguyen wrote: > On Thu, Jun 25, 2015 at 6:43 PM, Karthik Nayak wrote: >> Add support to sort by version using the "v:refname" and >> "version:refname" option. This is achieved by using the >> 'version_cmp()' function as the comparing function for qsort. > > If

Re: [PATCH v2 06/10] Documentation/tag: remove double occurance of ""

2015-07-12 Thread Karthik Nayak
On Fri, Jul 10, 2015 at 10:14 PM, Junio C Hamano wrote: > Christian Couder writes: > >> On Thu, Jul 9, 2015 at 12:27 PM, Karthik Nayak wrote: >>> Mentored-by: Christian Couder >>> Mentored-by: Matthieu Moy >>> Signed-off-by: Karthik Nayak >>> --- >>> Documentation/git-tag.txt | 1 - >>> 1 fi

Re: [PATCH v5 00/44] Make git-am a builtin

2015-07-12 Thread Paul Tan
Hi, (Sorry for the late reply. Caught a nasty stomach bug that kept me in bed for a while ><) On Thu, Jul 9, 2015 at 2:00 PM, Junio C Hamano wrote: > What I pushed out tonight should have SQUASH??? (or fixup!) that > splits this into appropriate steps in your series. Please check. Yeah they lo

Re: [PATCH 10/16] worktree: make branch creation distinct from worktree population

2015-07-12 Thread Duy Nguyen
(resend, +everybody) On Sun, Jul 12, 2015 at 10:27 AM, Eric Sunshine wrote: >>> So, if I understand your concern correctly, then you are worried that, >>> following the git-branch invocation, ref_exists() could return the >>> wrong answer with a pluggable ref-backend since it might be answering >

Re: [PATCH v2 08/10] tag.c: use 'ref-filter' APIs

2015-07-12 Thread Duy Nguyen
On Thu, Jul 9, 2015 at 5:58 PM, Karthik Nayak wrote: > -static int show_reference(const char *refname, const struct object_id *oid, > - int flag, void *cb_data) > -{ ... > - > - if (match_pattern(filter->name_patterns, refname)) { > - printf("%-15s

[PATCH] rev-parse --parseopt: allow [*=?!] in argument hints

2015-07-12 Thread ilya . bobyr
From: Ilya Bobyr It is not very likely that any of the "*=?!" Characters would be useful in the argument short or long names. On the other hand, there are already argument hints that contain the "=" sign. It used to be impossible to include any of the "*=?!" signs in the arguments hints before.

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

2015-07-12 Thread Duy Nguyen
On Thu, Jun 25, 2015 at 6:43 PM, Karthik Nayak wrote: > Add support to sort by version using the "v:refname" and > "version:refname" option. This is achieved by using the > 'version_cmp()' function as the comparing function for qsort. If these v:refname and version:refname are from git-tag, you m

Re: [PATCH v2 01/10] ref-filter: add %(refname:shortalign=X) option

2015-07-12 Thread Duy Nguyen
On Sun, Jul 12, 2015 at 8:47 AM, Duy Nguyen wrote: > Another thing, the atom value is also used for sorting. When used for > sorting, I think these padding spaces should not be generated or it > may confuse the sort algorithm. Left alignment may be ok, right or > center alignment (in future?), not