Re: [PATCH v3 4/6] for-each-ref: introduce %(upstream:track[short])

2013-11-16 Thread Ramkumar Ramachandra
Eric Sunshine wrote: > The "prompt" is not mentioned elsewhere in for-each-ref documentation, > and a person not familiar with contrib/completion/ may be confused by > this reference. It might make sense instead to explain the meanings of > ">", "<", "<>", and "=" directly since they are not necess

Possibly a bug

2013-11-16 Thread Jiergir Ogoerg
Hi, As suggested by the git book/tutorial I cloned "simplegit-progit" to learn using git. The issue: git log --since=5.years yields 2 commits, while git log --since=6.years yields 3 commits, despite the "Date" in both cases being March 2008. Is it a bug? Using Fedora 20 amd64 with git version 1.8.

[ANNOUNCE] git-flow AVH Edition 1.7.0

2013-11-16 Thread Peter van der Does
We are pleased to announce the release of git-flow AVH Edition 1.7.0 git-flow AVH Edition is a collection of git extensions to provide high-level repository operations for Vincent Driessen's branching model. The AVH Edition adds more functionality to the original git-flow[1] and several of the int

Re: [RFC PATCH] commit -v: strip diffs and submodule shortlogs from the commit message

2013-11-16 Thread Eric Sunshine
On Sat, Nov 16, 2013 at 5:52 PM, Jens Lehmann wrote: > When using the '-v' option of "git commit" the diff added to the commit > message temporarily for editing is stripped off after the user exited the > editor by searching for "\ndiff --git " and truncating the commmit message > there if it is f

Re: [PATCH v3 5/6] for-each-ref: introduce %(color:...) for color

2013-11-16 Thread Eric Sunshine
On Fri, Nov 15, 2013 at 5:59 AM, Ramkumar Ramachandra wrote: > Enhance 'git for-each-ref' with color formatting options. You can now > use the following format in for-each-ref: > > %(color:green)%(refname:short)%(color:reset) > > Signed-off-by: Ramkumar Ramachandra > --- > Documentation/git-f

Re: [PATCH v3 4/6] for-each-ref: introduce %(upstream:track[short])

2013-11-16 Thread Eric Sunshine
On Fri, Nov 15, 2013 at 5:59 AM, Ramkumar Ramachandra wrote: > Introduce %(upstream:track) to display "[ahead M, behind N]" and > %(upstream:trackshort) to display "=", ">", "<", or "<>" > appropriately (inspired by contrib/completion/git-prompt.sh). > > Now you can use the following format in for

Re: [PATCH v3 3/6] for-each-ref: introduce %(HEAD) asterisk marker

2013-11-16 Thread Eric Sunshine
On Fri, Nov 15, 2013 at 5:59 AM, Ramkumar Ramachandra wrote: > 'git branch' shows which branch you are currently on with an '*', but > 'git for-each-ref' misses this feature. So, extend its format with > %(HEAD) for the same effect. > > Now you can use the following format in for-each-ref: > >

Re: [PATCH v3 1/6] t6300 (for-each-ref): clearly demarcate setup

2013-11-16 Thread Eric Sunshine
On Fri, Nov 15, 2013 at 5:59 AM, Ramkumar Ramachandra wrote: > Condense the two-step setup into one step, and give it an appropriate > name. > > Signed-off-by: Ramkumar Ramachandra > --- > t/t6300-for-each-ref.sh | 5 + > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/t/t630

[RFC PATCH] commit -v: strip diffs and submodule shortlogs from the commit message

2013-11-16 Thread Jens Lehmann
When using the '-v' option of "git commit" the diff added to the commit message temporarily for editing is stripped off after the user exited the editor by searching for "\ndiff --git " and truncating the commmit message there if it is found. But this approach has two problems: when the commit mess

Re: submodule update and core.askpass

2013-11-16 Thread Jens Lehmann
Am 16.11.2013 22:42, schrieb Thomas Rast: > Dmitry Neverov writes: > >> git -c core.askpass=pass.sh clone main-repo >> cd main-repo >> git submodule init >> git submodule sync >> git -c core.askpass=pass.sh submodule update >> >> The last command asks for a password interactively. >> >> I've run

Re: submodule update and core.askpass

2013-11-16 Thread Thomas Rast
+cc Daniel and Jens Dmitry Neverov writes: > git -c core.askpass=pass.sh clone main-repo > cd main-repo > git submodule init > git submodule sync > git -c core.askpass=pass.sh submodule update > > The last command asks for a password interactively. > > I've run bisect, it seems like it started

submodule update and core.askpass

2013-11-16 Thread Dmitry Neverov
Hi, it seems like "git submodule update" command doesn't respect the core.askpass option specified in a command line. I have a repository with a submodule, I serve it over http which requires an authorization and both main repository and submodule require the same credentials. I run the following

[PATCH v3 gitk 0/5] gitk -L

2013-11-16 Thread Thomas Rast
These patches implement 'gitk -L'. They are exactly the same as the gitk patches from v2 at http://thread.gmane.org/gmane.comp.version-control.git/227151/focus=236903 except that they apply to the gitk-git tree at git://ozlabs.org/~paulus/gitk The documentation change is in the parallel se

[PATCH v3 gitk 4/5] gitk: support showing the gathered inline diffs

2013-11-16 Thread Thomas Rast
From: Thomas Rast The previous commit split the diffs into a separate field. Now we actually want to show them. To that end we use the stored diff, and - process it once to build a fake "tree diff", i.e., a list of all changed files; - feed it through parseblobdiffline to actually format it

[PATCH v3 1/3] commit-tree: use prefixcmp instead of memcmp(..., N)

2013-11-16 Thread Thomas Rast
Handrolling the prefix comparison is harder to read and overruns if the argument is an empty string. Use our prefixcmp() instead. Signed-off-by: Thomas Rast --- builtin/commit-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/commit-tree.c b/builtin/commit-tree.

[PATCH v3 gitk 2/5] gitk: refactor per-line part of getblobdiffline and its support

2013-11-16 Thread Thomas Rast
From: Thomas Rast For later use with data sources other than a pipe, refactor the big worker part of getblobdiffline to a separate function parseblobdiffline. Also refactor its initialization and wrap-up to separate routines. Signed-off-by: Thomas Rast --- gitk | 408 +

[PATCH v3 0/3] Documentation: stuck arguments and gitk log -L

2013-11-16 Thread Thomas Rast
This gathers three rather separate patches. 1/3 is an unrelated fix for a string comparison issue that I noticed while surveying the state of stickiness. 2/3 is the "document" plan hinted at here: > So my short-term plan just became: document instead of fix; clean up > manpages towards the stuc

[PATCH v3 3/3] Documentation/gitk: document -L option

2013-11-16 Thread Thomas Rast
The -L option is the same as for git-log, so the entire block is just copied from git-log.txt. However, until the parser is fixed we add a caveat that gitk only understands the stuck form. Signed-off-by: Thomas Rast --- Documentation/gitk.txt | 16 1 file changed, 16 insertions

[PATCH v3 2/3] Documentation: convert to --option=arg form where possible

2013-11-16 Thread Thomas Rast
We generally encourage the stuck form (that is, -oarg or --option=arg), for example gitcli(7) says when a command line option takes an argument, use the stuck form [...] An option that takes optional option-argument must be written in the stuck form. However the manpages do not express the

[PATCH v3 gitk 5/5] gitk: recognize -L option

2013-11-16 Thread Thomas Rast
From: Thomas Rast This gives line-log support to gitk, by exploiting the new support for processing and showing "inline" diffs straight from the git-log output. Note that we 'set allknown 0', which is a bit counterintuitive since this is a "known" option. But that flag prevents gitk from thinki

[PATCH v3 gitk 1/5] gitk: support -G option from the command line

2013-11-16 Thread Thomas Rast
From: Thomas Rast The -G option's usage is exactly analogous to that of -S, so supporting it is easy. Signed-off-by: Thomas Rast --- gitk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitk b/gitk index 5cd00d8..0e95814 100755 --- a/gitk +++ b/gitk @@ -227,7 +227,7 @@ proc

[PATCH v3 gitk 3/5] gitk: split out diff part in $commitinfo

2013-11-16 Thread Thomas Rast
From: Thomas Rast So far we just parsed everything after the headers into the "comment" bit of $commitinfo, including notes and -- if you gave weird options -- the diff. Split out the diff, if any, into a separate field. It's easy to recognize, since it always starts with /^diff/ and is precede

Symbolic refs break ref advertisement on 1.8.4.3+

2013-11-16 Thread Bryan Turner
According to a git bisect between the v1.8.4 and v1.8.4.3 tags, it appears the changes in 5e7dcad, "upload-pack: send non-HEAD symbolic refs", cause the ref advertisement to fail of the repository has more than a handful of symbolic refs. Here's a simple reproduce case (tested on Bash): Aphrael:ex

Re: [PATCH v3 0/21] pack bitmaps

2013-11-16 Thread Thomas Rast
Jeff King writes: >> > - the ewah code used gcc's __builtin_ctzll, but did not provide a >> > suitable fallback. We now provide a fallback in C. >> >> I was messing around with several implementations (including the use of >> msvc compiler intrinsics) with the intention of doing some timin

Attn Your Payment Fund,

2013-11-16 Thread Donna Timoth
Attn: Dearest One, Re:Irrevocable Release of your payment fund, We are authorized by the governor boards to immediate Release of your Re-Compensation Price funds value of us$850,000.00 Recommend and approve your claims for payment is certified as genuine. Your total fund CASHIER'S CHECK worth of

Re: Access different NAMESPACE of remote repo from client side

2013-11-16 Thread Sitaram Chamarty
On 11/16/2013 01:30 PM, Jiang Xin wrote: > 2013/11/15 Sitaram Chamarty : >> On 11/15/2013 07:55 PM, Sitaram Chamarty wrote: [snip] >> I should add that the Gitolite model is: the user doesn't need to know >> about namespaces, because namespaces are just things that the server >> admin is setting

Re: Access different NAMESPACE of remote repo from client side

2013-11-16 Thread Jiang Xin
2013/11/15 Sitaram Chamarty : > On 11/15/2013 07:55 PM, Sitaram Chamarty wrote: >> On 11/15/2013 01:49 PM, Jiang Xin wrote: >>> Just like solution 2, these settings won't work without a patched >>> git-shell or gitolite. >> >> Gitolite has a namespaces branch that handles namespaces as described in