Re: [PATCH 08/15] ref-filter: make "%(symref)" atom work with the ':short' modifier

On Tue, Mar 8, 2016 at 7:26 AM, Jacob Keller wrote: > On Mon, Mar 7, 2016 at 3:08 PM, Junio C Hamano wrote: >> Karthik Nayak writes: >> >>> The "%(symref)" atom doesn't work when used with the ':short' modifier >>> because we

Re: [PATCH 06/15] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams

On Tue, Mar 8, 2016 at 7:25 AM, Jacob Keller wrote: > On Sun, Mar 6, 2016 at 4:04 AM, Karthik Nayak wrote: >> Borrowing from branch.c's implementation print "[gone]" whenever an >> unknown upstream ref is encountered instead of just ignoring it. >>

Re: Change in .gitignore handling: intended or bug?

Junio C Hamano writes: > We need documentation update to settle this one before 2.8 final > ships, as we seem to be seeing more and more end-user confusion on > the list. I tried to come up with a trimmed-down example, which is > shown below, but I suspect that the code is

Re: [PATCH 02/15] ref-filter: implement %(if:equals=) and %(if:notequals=)

On Tue, Mar 8, 2016 at 11:34 AM, Junio C Hamano wrote: > On Mon, Mar 7, 2016 at 9:41 PM, Karthik Nayak wrote: >> >> You're correct, the "handler" functions run once for each "ref". But WRT >> to the %(if)...%(then)...%(else)...%(end) atoms, it needs to

Re: [PATCH 02/15] ref-filter: implement %(if:equals=) and %(if:notequals=)

On Mon, Mar 7, 2016 at 9:41 PM, Karthik Nayak wrote: > > You're correct, the "handler" functions run once for each "ref". But WRT > to the %(if)...%(then)...%(else)...%(end) atoms, it needs to be. Because > each outcome of these atoms depend on the current outcome of the

Re: [PATCH 02/15] ref-filter: implement %(if:equals=) and %(if:notequals=)

On Tue, Mar 8, 2016 at 4:19 AM, Junio C Hamano wrote: > Karthik Nayak writes: > >> diff --git a/ref-filter.c b/ref-filter.c >> index 41e73f0..440e270 100644 >> --- a/ref-filter.c >> +++ b/ref-filter.c >> @@ -22,6 +22,8 @@ struct align { >> }; >> >>

Re: [PATCH] fetch: show reference pointed by new tags

Junio C Hamano writes: > Junio C Hamano writes: > > But I am merely guessing from the your patch text what the reasoning > behind the change was and you are the one who had the original > reason why you needed this change, so your "why" may be a lot more >

[PATCH] Also read SQUASH_MSG if a conflict on a merge squash occurred

After a merge --squash with a conflict the commit message did not contain the information about the squashed commits, but only the "# Conflicts:" information. Signed-off-by: Sven Strickroth --- builtin/commit.c | 6 ++ 1 file changed, 6 insertions(+) diff --git

Re: Resumable clone

Hey Junio and Duy, Thank you for your thorough responses! I'm new to git dev, so it's extremely helpful. > - The server side endpoint does not have to be, and I think it > should not be, implemented as an extension to the current > upload-pack protocol. It is perfectly fine to add a new "git >

Re: [PATCH 15/15] branch: implement '--format' option

On Sun, Mar 6, 2016 at 4:05 AM, Karthik Nayak wrote: > Implement the '--format' option provided by 'ref-filter'. > This lets the user list tags as per desired format similar > to the implementation in 'git for-each-ref'. > s/tags/branches/ maybe? Thanks, Jake -- To

Re: [PATCH 08/15] ref-filter: make "%(symref)" atom work with the ':short' modifier

On Mon, Mar 7, 2016 at 3:08 PM, Junio C Hamano wrote: > Karthik Nayak writes: > >> The "%(symref)" atom doesn't work when used with the ':short' modifier >> because we strictly match only 'symref' for setting the 'need_symref' >> indicator. Fix this by

Re: [PATCH 06/15] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams

On Sun, Mar 6, 2016 at 4:04 AM, Karthik Nayak wrote: > Borrowing from branch.c's implementation print "[gone]" whenever an > unknown upstream ref is encountered instead of just ignoring it. > > This makes sure that when branch.c is ported over to using ref-filter > APIs for

Re: [BUG?] fetch into shallow sends a large number of objects

On Tue, Mar 8, 2016 at 6:47 AM, Junio C Hamano wrote: > Jeff King writes: > >> I don't know how the client invoked git, but we can guess what happened >> and simulate with: >> >> git tag shallow ecd7ea6033fe8a05d5c21f3a54355fded6942659 >> git tag old

Re: [BUG?] fetch into shallow sends a large number of objects

Jeff King writes: > I don't know how the client invoked git, but we can guess what happened > and simulate with: > > git tag shallow ecd7ea6033fe8a05d5c21f3a54355fded6942659 > git tag old 067f265bb512c95b22b83ccd121b9facbddcf6b1 > git tag new

Re: [PATCH 14/15] branch: use ref-filter printing APIs

Karthik Nayak writes: > Port branch.c to use ref-filter APIs for printing. This clears out > most of the code used in branch.c for printing and replaces them with > calls made to the ref-filter library. > > Introduce build_format() which gets the format required for

Re: [PATCH 08/15] ref-filter: make "%(symref)" atom work with the ':short' modifier

Karthik Nayak writes: > The "%(symref)" atom doesn't work when used with the ':short' modifier > because we strictly match only 'symref' for setting the 'need_symref' > indicator. Fix this by using 'starts_with()' rather than 'strcmp()'. Does that mean you also accept

Re: [PATCH v5] pull --rebase: add --[no-]autostash flag

Mehul Jain writes: > If rebase.autoStash configuration variable is set, there is no way to > override it for "git pull --rebase" from the command line. > > Teach "git pull --rebase" the --[no-]autostash command line flag which > overrides the current value of

Re: [PATCH 02/15] ref-filter: implement %(if:equals=) and %(if:notequals=)

Karthik Nayak writes: > diff --git a/ref-filter.c b/ref-filter.c > index 41e73f0..440e270 100644 > --- a/ref-filter.c > +++ b/ref-filter.c > @@ -22,6 +22,8 @@ struct align { > }; > > struct if_then_else { > + const char *if_equals, > + *not_equals; >

Re: [PATCH 1/3] git reset --hard gives clean working tree

Torsten Bögershausen writes: > The major question, at least on my side, is where to hook in > "can_clobber()" ? There are different ways the existing commands ensure that they do not lose local modifications. * Some (like unpack-trees code that is used by "merge") do

[BUG?] fetch into shallow sends a large number of objects

I came across an interesting shallow-fetch case, and I suspect git is doing something very sub-optimal. You can reproduce with: git clone --bare git://github.com/CocoaPods/Specs cd Specs.git time git pack-objects --revs --thin --stdout \ --delta-base-offset

Re: How to include just some subdirectory excluding all envelop tree

Thank you very much! The exclamation mark solves my problem. I can not create repository inside /a, because I need control /b also ) On 03/08/2016 12:06 AM, Kevin Daudt wrote: On Mon, Mar 07, 2016 at 10:01:52PM +0300, Olga Pshenichnikova wrote: I have some tree structure: /a /a/a /a/b .. /a/z

Re: Change in .gitignore handling: intended or bug?

Duy Nguyen writes: > On Sat, Mar 5, 2016 at 12:28 AM, Junio C Hamano wrote: > >> Are we good at 2.8.0-rc0, too? Somehow I had an impression that we >> queued "another attempt to do it differently" or something. >> >> ... goes and looks ... >> >> $

Re: How to include just some subdirectory excluding all envelop tree

On Mon, Mar 07, 2016 at 10:01:52PM +0300, Olga Pshenichnikova wrote: > I have some tree structure: > > /a > /a/a > /a/b > .. > /a/z > /b > .. (thousands of folders) > /z > > How can I control just /a/a folder? > What exclude file should be? > > The way we use now is: > > /a/* > /b/ > ..

Re: [PATCH] http: honor no_http env variable to bypass proxy

Junio C Hamano writes: Second call for help. I hate having to revert 30f302f7 (Merge branch 'kf/http-proxy-auth-methods', 2016-02-03) this late in the cycle. > Jiang Xin writes: > >> From: Jiang Xin >> >> Curl and its

Re: [PATCH v2] Documentation: talk about pager in api-trace.txt

Christian Couder writes: > Signed-off-by: Christian Couder > --- > Documentation/technical/api-trace.txt | 44 > +++ > 1 file changed, 44 insertions(+) I think this is fine. I'm not sure how many people

Re: Adding RFC 3161 timestamps to git tags

"Anton Wuerfel" writes: > as part of an university project we plan to implement time stamp > signatures according to RFC 3161. This enables users to create and verify > cryptographic time stamp signatures to prove that a commit existed at a > certain point in time. > > As a

Re: [RFC/PATCH] clone: make 'git clone -c remote.origin.fetch=' work

Jeff King writes: > IMHO, we should stick to the conceptual model that "git clone" is: > > git init > git config ... ;# set up remote, etc > git fetch > git checkout ;# obviously not for --bare > > The implementation has to diverge from that to do certain optimizations, >

How to include just some subdirectory excluding all envelop tree

I have some tree structure: /a /a/a /a/b .. /a/z /b .. (thousands of folders) /z How can I control just /a/a folder? What exclude file should be? The way we use now is: /a/* /b/ .. (thousands of folders) /z/ !/a/a But it is very not nice looking and hard for maintenance... -- To unsubscribe

[no subject]

subscribe git -- 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

[PATCH v2 5/6] grep: turn off gitlink detection for --no-index

On Sun, Mar 06, 2016 at 05:29:01PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > If we are running "git grep --no-index" outside of a git > > repository, we behave roughly like "grep -r", examining all > > files in the current directory and its subdirectories. > >

Re: [RFC/PATCH] clone: make 'git clone -c remote.origin.fetch=' work

On Mon, Mar 07, 2016 at 04:19:31PM +0100, SZEDER Gábor wrote: > >Even though I think the original description did not mean to include > >the fetch refspecs when it talked about configuration taking effect, > >I think what this change wants to do probably makes sense. > > Well, currently one

Re: [RFC/PATCH] clone: make 'git clone -c remote.origin.fetch=' work

Quoting Junio C Hamano : SZEDER Gábor writes: Check whether there are any relevant configured fetch refspecs and take those into account during the initial fetch, unless running 'git clone --single-branch'. Signed-off-by: SZEDER Gábor

Adding RFC 3161 timestamps to git tags

Hello, as part of an university project we plan to implement time stamp signatures according to RFC 3161. This enables users to create and verify cryptographic time stamp signatures to prove that a commit existed at a certain point in time. As a long-term goal, we would like to get this new

[PATCH v5] pull --rebase: add --[no-]autostash flag

If rebase.autoStash configuration variable is set, there is no way to override it for "git pull --rebase" from the command line. Teach "git pull --rebase" the --[no-]autostash command line flag which overrides the current value of rebase.autoStash, if set. As "git rebase" understands the

More configuration options for some commonly used command-line options

Hi, Regarding the GSoC Microproject 'Add configuration options for some commonly used command-line options', currently the list [1] mentions only `git commit -v`. Can the following also be candidates for configurations? * git log -p * git remote -v * git branch -v Regards, Sidhant Sharma [:tk]

[PATCH v2] Documentation: talk about pager in api-trace.txt

Signed-off-by: Christian Couder --- Documentation/technical/api-trace.txt | 44 +++ 1 file changed, 44 insertions(+) diff --git a/Documentation/technical/api-trace.txt b/Documentation/technical/api-trace.txt index 097a651..0e1af02 100644

Re: [PATCH 1/3] git reset --hard gives clean working tree

On 03/07/2016 09:51 AM, Junio C Hamano wrote: Junio C Hamano writes: Perhaps we can introduce a new function can_clobber() that has the same function signature as ce_uptodate() and update the callers in apply and unpack-trees (there may be others) to call it instead when

Re: git diff does not precompose unicode file paths (OS X)

On 03/07/2016 08:47 AM, Alexander Rinass wrote: On 04 Mar 2016, at 19:49, Ramsay Jones wrote: On 04/03/16 14:37, Alexander Rinass wrote: On 04 Mar 2016, at 13:16, Torsten Bögershausen wrote: On 03/04/2016 10:07 AM, Alexander Rinass wrote:

Re: [PATCH 1/3] git reset --hard gives clean working tree

Junio C Hamano writes: > Perhaps we can introduce a new function can_clobber() that has the > same function signature as ce_uptodate() and update the callers in > apply and unpack-trees (there may be others) to call it instead when > they want to see if they can clobber the

Re: [PATCH v4] pull --rebase: add --[no-]autostash flag

Hi Junio, Thanks for the thorough review. On Sat, Mar 5, 2016 at 10:34 PM, Junio C Hamano wrote: > Is it worth checking the case where autostash kicks in, rebase > itself is completed successfully, but the final "stash pop" fails in > conflict? I am thinking aloud and just

Re: [PATCH 1/3] git reset --hard gives clean working tree

Junio C Hamano writes: > Besides, it is OK if your status and diff says your worktree is > dirty immediately after cloning in such a broken situation, I would > think. In fact, it may even be preferable to do so, in order to > indicate that there is something unusual going