Re: [PATCH v7 2/8] cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs

2015-07-13 Thread David Turner
[j6t to bcc as it looks like his concerns have been addressed] On Fri, 2015-07-10 at 06:30 +0200, Michael Haggerty wrote: > On 07/10/2015 12:06 AM, Junio C Hamano wrote: > > David Turner writes: > > > >> OK, here's my current best idea: > >> > >> 1. A "pseudoref" is an all-caps file in $GIT_DIR/

[L10N] Kickoff of translation for Git 2.5.0 round 2

2015-07-13 Thread Jiang Xin
Hi, Thanks to all the l10n teams, and the 1st round of translations for Git 2.5.0 has been merged. While there are some new messages need to be translated for the new released Git v2.5.0-rc2, let's start new round of l10n. The l10n window has less than 2 weeks for us, see: http://tinyurl.com/gitc

Git has a healthy truck factor..

2015-07-13 Thread Philip Oakley
It looks like Git has a healthy truck factor of 8, as reported in https://mtov.github.io/Truck-Factor/, which has Git eighth in the list of projects it analyzed, with Linux at second place. The analysis method paper is behind a pay wall, so I couldn't see how sensible the methodology, but it's

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

2015-07-13 Thread Junio C Hamano
While using this series for real work today, I found another bug that is unfortunately a show-stopper for my workflow. Store 7 patches from David Turner to a file, ./+dt-7, starting at http://thread.gmane.org/gmane.comp.version-control.git/273786 and then: $ git checkout master...dt/refs-backen

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

2015-07-13 Thread Junio C Hamano
ilya.bo...@gmail.com writes: > Junio, thank you very much for all the comments. I hope I have included > all of the suggestions you made. Please, let me know if I have missed > anything or if there is something else you think should be improved. There were a few that still remained, which I loc

[ANNOUNCE] Git v2.5.0-rc2

2015-07-13 Thread Junio C Hamano
A release candidate Git v2.5.0-rc2 is now available for testing at the usual places. It is comprised of 552 non-merge commits since v2.4.0, contributed by 63 people, 21 of which are new faces. To avoid user-facing interface to a new experimental feature that replaces contrib/workdir after the rel

What's cooking in git.git (Jul 2015, #04; Mon, 13)

2015-07-13 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 plan is to tag 2.5.0-rc2 today, 2.5.0-rc3 next week today. We'll judge when to end the cycle, reviewing what we have at that point, after th

Re: [PATCH] notes: Allow treeish expressions as notes ref

2015-07-13 Thread Junio C Hamano
Mike Hommey writes: > init_notes() is the main point of entry to the notes API. It is an arbitrary > restriction that all it allows as input is a strict ref name, when callers > may want to give an arbitrary treeish. > > However, some operations that require updating the notes tree require a > st

Re: [PATCH] notes: Allow treeish expressions as notes ref

2015-07-13 Thread Junio C Hamano
Mike Hommey writes: >> - Make sure that we show "there is no such tree-ish, no way to look >>up any note to any commit from there" and "I understood the tree >>you gave me, but there is no note for that commit" differently. > > How would you reconcile that with the usual "there are only

Re: [PATCH] notes: Allow treeish expressions as notes ref

2015-07-13 Thread Mike Hommey
On Mon, Jul 13, 2015 at 09:35:40AM -0700, Junio C Hamano wrote: > Mike Hommey writes: > > > init_notes() is the main point of entry to the notes API. It is an arbitrary > > restriction that all it allows as input is a strict ref name, when callers > > may want to give an arbitrary treeish. > > >

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

2015-07-13 Thread Karthik Nayak
On Mon, Jul 13, 2015 at 4:21 PM, Duy Nguyen wrote: > On Mon, Jul 13, 2015 at 2:56 AM, Karthik Nayak wrote: >> 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 yo

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

2015-07-13 Thread Karthik Nayak
On Mon, Jul 13, 2015 at 4:16 PM, Duy Nguyen wrote: > On Mon, Jul 13, 2015 at 2:36 AM, Karthik Nayak wrote: >> What I was thinking of was getting rid of the whole "align" feature where >> you provide a value to which it would align. >> >> Something like: --format="%(item:modifieralign)" which wou

Reproducable fatal error while attempting to merge

2015-07-13 Thread Greg Logan
Hi folks, I'm encountering an error which kicks out an error that looks like this, every time: git merge upstream/r/1.6.x BUG: There are unmerged index entries: BUG: 2 modules/matterhorn-series-service-remote/pom.xml BUG: 3 modules/matterhorn-series-service-remote/pom.xml fatal: Bug in merge-recu

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

2015-07-13 Thread X H
Le 13/07/2015 5:52, Jeff King a écrit : 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 mounte

Re: [PATCH v5 12/44] builtin-am: implement --skip

2015-07-13 Thread Stefan Beller
On Tue, Jul 7, 2015 at 7:20 AM, Paul Tan wrote: > Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), git-am > supported resuming from a failed patch application by skipping the > current patch. Re-implement this feature by introducing am_skip(). > > Signed-off-by: Paul Tan > --- > b

Re: [PATCH 00/16] worktree: use "git reset --hard" to populate worktree

2015-07-13 Thread Junio C Hamano
Eric Sunshine writes: > This is a follow-on series to [1], which migrated "git checkout --to" > functionality to "git worktree add". That series continued using "git > checkout" for the initial population of the new worktree, which required > git-checkout to have too intimate knowledge that it wa

Re: [PATCH] notes: Allow treeish expressions as notes ref

2015-07-13 Thread Junio C Hamano
Mike Hommey writes: > init_notes() is the main point of entry to the notes API. It is an arbitrary > restriction that all it allows as input is a strict ref name, when callers > may want to give an arbitrary treeish. > > However, some operations that require updating the notes tree require a > st

Re: [PATCH v5 1/4] implement submodule config API for lookup of .gitmodules values

2015-07-13 Thread Junio C Hamano
Heiko Voigt writes: > On Thu, Jul 09, 2015 at 01:00:10PM -0700, Junio C Hamano wrote: >> Jens Lehmann writes: >> >> > The git-submodule script doesn't need this and is fine using plain old >> > "git config", as by the time it is run the .gitmodules file is already >> > updated in the work tree.

Re: [PATCH] completion: Add '--edit-todo' to rebase

2015-07-13 Thread John Keeping
On Mon, Jul 13, 2015 at 01:27:56PM +0200, Thomas Braun wrote: > Signed-off-by: Thomas Braun > --- > contrib/completion/git-completion.bash | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/contrib/completion/git-completion.bash > b/contrib/completion/git-completion.bash >

AW: "unable to remap" error with git svn after upgrade to Win10

2015-07-13 Thread Christoph Murczek
Just wanted to let you know: a re-install of git also fixed the problem. Cheers, Christoph -Ursprüngliche Nachricht- Von: Christoph Murczek Gesendet: Monday, July 13, 2015 14:10 An: 'git@vger.kernel.org' Betreff: "unable to remap" error with git svn after upgrade to Win10 Hi, I'm using

"unable to remap" error with git svn after upgrade to Win10

2015-07-13 Thread Christoph Murczek
Hi, I'm using git for windows 1.9.5-preview20150319 and was successfully using git svn, but after upgrading (from Win8.1) to Win10 git svn doesn't work anymore. I get C:\Program Files (x86)\Git\bin\perl.exe: *** unable to remap C:\Program Files (x86)\Git\bin\libsvn_repos-1-0.dll to same

[PATCH] completion: Add '--edit-todo' to rebase

2015-07-13 Thread Thomas Braun
Signed-off-by: Thomas Braun --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index c97c648..2567a61 100644 --- a/contrib/completion/git-completion.bash ++

Re: [PATCH v5 1/4] implement submodule config API for lookup of .gitmodules values

2015-07-13 Thread Heiko Voigt
On Thu, Jul 09, 2015 at 01:00:10PM -0700, Junio C Hamano wrote: > Jens Lehmann writes: > > >> How does git-submodule access this information? It looks like it just > >> hits "git config -f .gitmodules" directly. Perhaps whatever interface is > >> designed should be suitable for its use here (and

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

2015-07-13 Thread Philip Oakley
From: From: Ilya Bobyr A line in the input to "rev-parse --parseopt" describes an option by listing a short and/or long name, optional flags [*=?!], argument hint, and then whitespace and help string. We did not allow any of the [*=?!] characters in the argument hints. The following

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

2015-07-13 Thread Duy Nguyen
On Mon, Jul 13, 2015 at 2:56 AM, Karthik Nayak wrote: > 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

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

2015-07-13 Thread Duy Nguyen
On Mon, Jul 13, 2015 at 2:36 AM, Karthik Nayak wrote: > What I was thinking of was getting rid of the whole "align" feature where > you provide a value to which it would align. > > Something like: --format="%(item:modifieralign)" which would use something > on the lines of what the max-width calc

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

2015-07-13 Thread ilya . bobyr
From: Ilya Bobyr A line in the input to "rev-parse --parseopt" describes an option by listing a short and/or long name, optional flags [*=?!], argument hint, and then whitespace and help string. We did not allow any of the [*=?!] characters in the argument hints. The following pair=key=va

Re: Building git 2.4.5 on AIX 6.1 problems

2015-07-13 Thread norricorp
Hi Jeff, So running with the ar in binutils gave the usual result. I think this boils down to knowing which library those undefined symbols are defined in. The git code uses those variables so the library should be around somewhere. It is just knowing which library it is in. Regards, John -- Vie