Re: [PATCH] Add support for commit attributes

2014-04-09 Thread Diego Lago González
2014-04-10 6:25 GMT+02:00 Duy Nguyen : > On Thu, Apr 10, 2014 at 2:38 AM, Diego Lago > wrote: >> Commit attributes are custom commit extra headers the user can >> add to the commit object. >> >> The motivation for this patch is that in my company we have a custom >> continuous integration software

[PATCH v5] Verify index file before we opportunistically update it

2014-04-09 Thread Yiannis Marangos
Before we proceed to "opportunistic update" we must verify that the current index file is the same as the one that we read before. There is a possible race if we don't do this. In the example below git-status does "opportunistic update" and git-rebase updates the index, but the race can happen in g

[PATCH v4] Verify index file before we opportunistically update it

2014-04-09 Thread Yiannis Marangos
Before we proceed to "opportunistic update" we must verify that the current index file is the same as the one that we read before. There is a possible race if we don't do this. In the example below git-show does "opportunistic update" and git-rebase updates the index, but the race can happen in gen

Re: [PATCH] Add support for commit attributes

2014-04-09 Thread Duy Nguyen
On Thu, Apr 10, 2014 at 2:38 AM, Diego Lago wrote: > Commit attributes are custom commit extra headers the user can > add to the commit object. > > The motivation for this patch is that in my company we have a custom > continuous integration software that uses a custom formatted commit > message (

Re: [PATCH] Unicode: update of combining code points

2014-04-09 Thread Torsten Bögershausen
Excellent, thanks. -- 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

Re: Our official home page and logo for the Git project

2014-04-09 Thread Andrew Ardill
On 10 April 2014 02:43, Felipe Contreras wrote: > Junio C Hamano wrote: > > - To officially adopt the logo that appears on the "project > >home page" as our "project logo". > > I have made my objections to that logo before, but here it goes again: bright > red is a horrible color for a logo,

Re: [PATCH v2] Verify index file before we opportunistically update it

2014-04-09 Thread Junio C Hamano
Yiannis Marangos writes: > Before we proceed to "opportunistic update" we must verify that the > current index file is the same as the one that we read before. There > is a possible race if we don't do this: Please somehow make it clear that the race is in general, and use of "git rebase" in thi

[PATCH v3] Verify index file before we opportunistically update it

2014-04-09 Thread Yiannis Marangos
Before we proceed to "opportunistic update" we must verify that the current index file is the same as the one that we read before. There is a possible race if we don't do this: 1. process A calls git-rebase 2. process A applies 1st commit 3. process B calls git-status 4. process B reads

[PATCH v2] Verify index file before we opportunistically update it

2014-04-09 Thread Yiannis Marangos
Before we proceed to "opportunistic update" we must verify that the current index file is the same as the one that we read before. There is a possible race if we don't do this: 1. process A calls git-rebase 2. process A applies 1st commit 3. process B calls git-status 4. process B reads

[PATCH] Verify index file before we opportunistically update it

2014-04-09 Thread Yiannis Marangos
Before we proceed to "opportunistic update" we must verify that the current index file is the same as the one that we read before. There is a possible race if we don't do this: 1. process A calls git-rebase 2. process A applies 1st commit 3. process B calls git-status 4. process B reads

[PATCH] Verify index file before we opportunistically update it

2014-04-09 Thread Yiannis Marangos
This is a fix for the following bug: http://thread.gmane.org/gmane.comp.version-control.git/245946/focus=245965 I added 2 functions: verify_index_from and verify_index. They return 1 if the sha1 is correct, otherwise 0. I choose to not die if any errors are occurred because we just want to not pro

[ANNOUNCE] Git v1.9.2

2014-04-09 Thread Junio C Hamano
The latest maintenance release Git v1.9.2 is now available at the usual places. The release tarballs are found at: http://www.kernel.org/pub/software/scm/git/ The following public repositories all have a copy of the v1.9.2 tag and the maint branch that the tag points at: url = https://ker

Silly time stamps

2014-04-09 Thread Mahmoud Asshole
Hi, This is an example of timestamps are in git: tree c67dc912a777ef6198a5c76890ebf11cd8ccc625 parent 6e527d8e07a80058bf8ac46180e25a9d4cb745eb author my name 1397073956 +0400 committer my name 1397073956 +0400 testing again As you can see, it presents the timestamp in UNIX

Re: [PATCH 5/5] completion: fix completion of certain aliases

2014-04-09 Thread Felipe Contreras
Junio C Hamano wrote: > Felipe Contreras writes: > > > Some commands need the first word to determine the actual action that is > > being executed, however, the command is wrong when we use an alias, for > > example 'alias.p=push', if we try to complete 'git p origin ', the > > result would be wr

On "interpret-trailers" standalone tool

2014-04-09 Thread Junio C Hamano
So far I've mostly been ignoring how the command line would look like, because the intermediate goal to my mind was to have it as a hook that are added by people better versed with Git than an average end-user, and if the command line interface had to change then they are capable of updating it, so

[PATCH] Add support for commit attributes

2014-04-09 Thread Diego Lago
Commit attributes are custom commit extra headers the user can add to the commit object. The motivation for this patch is that in my company we have a custom continuous integration software that uses a custom formatted commit message (currently in YALM format) to show several information into our

Re: [PATCH 5/5] completion: fix completion of certain aliases

2014-04-09 Thread Junio C Hamano
Felipe Contreras writes: > Some commands need the first word to determine the actual action that is > being executed, however, the command is wrong when we use an alias, for > example 'alias.p=push', if we try to complete 'git p origin ', the > result would be wrong because __git_complete_remote_

[PATCH 4/5] remote-bzr: include authors field in pushed commits

2014-04-09 Thread Felipe Contreras
From: dequis Tests-by: Felipe Contreras Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 2 ++ contrib/remote-helpers/test-bzr.sh| 24 2 files changed, 26 insertions(+) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remot

[PATCH 3/5] remote-bzr: add support for older versions

2014-04-09 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index 332aba7..7f354c8 100755 --- a/contrib/remote-helpers/git-remote-bz

[PATCH 5/5] completion: fix completion of certain aliases

2014-04-09 Thread Felipe Contreras
Some commands need the first word to determine the actual action that is being executed, however, the command is wrong when we use an alias, for example 'alias.p=push', if we try to complete 'git p origin ', the result would be wrong because __git_complete_remote_or_refspec() doesn't know where it

[PATCH 1/5] remote-helpers: allow all tests running from any dir

2014-04-09 Thread Felipe Contreras
Commit d3243d7 (test-bzr.sh, test-hg.sh: allow running from any dir) allowed the tests to run from any directory, however, it didn't update all the tests. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg-bidi.sh | 3 ++- contrib/remote-helpers/test-hg-hg-git.sh | 3 ++- 2 fil

[PATCH 2/5] remote-hg: always normalize paths

2014-04-09 Thread Felipe Contreras
Apparently Mercurial can have paths such as 'foo//bar', so normalize all paths. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index eb89ef6.

[PATCH 0/5] Fixes

2014-04-09 Thread Felipe Contreras
Felipe Contreras (4): remote-helpers: allow all tests running from any dir remote-hg: always normalize paths remote-bzr: add support for older versions completion: fix completion of certain aliases dequis (1): remote-bzr: include authors field in pushed commits contrib/completion/git-c

Re: [PATCH] add missing accent grave in git-http-backend.txt

2014-04-09 Thread Junio C Hamano
Thomas Ackermann writes: > Signed-off-by: Thomas Ackermann > > --- > Documentation/git-http-backend.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/git-http-backend.txt > b/Documentation/git-http-backend.txt > index e8c13f6..d422ba4 100644 > --- a/Doc

Re: The fetch command should "always" honor remote..fetch

2014-04-09 Thread Junio C Hamano
Lewis Diamond writes: > ... Yes, I agree that the abbreviation expansion works as designed > (using the rev_parse_rules), I am not fundamentally opposed if you want to add a new command line option to "git fetch" so that the shortened "what to fetch" are dwimmed differently, but changing how "g

[PATCH] add missing accent grave in git-http-backend.txt

2014-04-09 Thread Thomas Ackermann
Signed-off-by: Thomas Ackermann --- Documentation/git-http-backend.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-http-backend.txt b/Documentation/git-http-backend.txt index e8c13f6..d422ba4 100644 --- a/Documentation/git-http-backend.txt +++ b/Docume

Re: [PATCH 3/3] Change update_refs to run a single commit loop once all work is finished.

2014-04-09 Thread Junio C Hamano
Hopefully Michael would respond with more in-depth reviews as he has been touching this area heavily recently, but a few comments. > Subject: Re: [PATCH 3/3] Change update_refs to run a single commit loop once > all work is fi The project convention is to prefix with the "", colon, SP, a sentenc

Re: fast-import deltas

2014-04-09 Thread Felipe Contreras
Mike Hommey wrote: > On Wed, Apr 02, 2014 at 01:29:13AM +0200, Max Horn wrote: > > I wonder if it is really worth the effort to start yet another project on > > this... Moreover, I don't see a fundamental reason why one could not modify > > git-remote-hg to work this way. > > The way git-remote-hg

RE: [ANNOUNCE] WinGit - native x86/x64 Git for Windows

2014-04-09 Thread Felipe Contreras
marat@ wrote: > I'm proud to announce WinGit: an attempt to bring Git powers to 64-bit > Windows. > > WinGit is currently used only by my coworkers and isn't considered > production-ready-rock-solid. Use at your own risk. Thank you for doing this, it's very much needed. It would be great if there

Re: [PATCH] Unicode: update of combining code points

2014-04-09 Thread Junio C Hamano
Torsten Bögershausen writes: > How about this as a commit message: > > Unicode: partially update to version 6.3 > > Unicode 6.3 defines the following code points as combining or accents, > git_wcwidth() should return 0. > > Earlier unicode standards had defined these code point as "reserved": > 3

RE: Our official home page and logo for the Git project

2014-04-09 Thread Felipe Contreras
Junio C Hamano wrote: > - To officially adopt the logo that appears on the "project >home page" as our "project logo". I have made my objections to that logo before, but here it goes again: bright red is a horrible color for a logo, as it only looks good in limited situations. I propose you u

Re: [PATCH] Unicode: update of combining code points

2014-04-09 Thread Torsten Bögershausen
On 04/09/2014 12:37 AM, Junio C Hamano wrote: > Jonathan Nieder writes: > >> Torsten Bögershausen wrote: >> >>> Unicode 6.3 defines the following code as combining or accents, >>> git_wcwidth() should return 0. >>> >>> Earlier unicode standards had defined these code point as "reserved": >> Thanks

Re: [PATCH] git-multimail: update to version 1.0.0

2014-04-09 Thread Junio C Hamano
Michael Haggerty writes: >> In the longer term, I have a feeling that we may be better off to >> make the "git core" tree not be the "batteris included" convenience >> tree, though > ... > Tell me if/when you want to transition to omitting git-multimail (and > presumably post-receive-email an

Re: [PATCH] git-multimail: update to version 1.0.0

2014-04-09 Thread Michael Haggerty
On 04/07/2014 08:56 PM, Junio C Hamano wrote: > Michael Haggerty writes: > >> ... >> Contributions-by: Raphaël Hertzog >> Contributions-by: Eric Berberich >> Contributions-by: Michiel Holtkamp >> Contributions-by: Malte Swart >> Signed-off-by: Michael Haggerty >> --- >> Junio, how would you

Re: The fetch command should "always" honor remote..fetch

2014-04-09 Thread Lewis Diamond
Hi Junio, What I mean by "behave like push" is the following: [remote "foo"] url = ... fetch = refs/users/bob/heads/*:refs/heads/* #Note that the fetch and push configuration match. push = refs/heads/*:refs/users/bob/heads/* git ls-remote foo refs/heads/master git push foo master r

Re: Our official home page and logo for the Git project

2014-04-09 Thread Matthieu Moy
Junio C Hamano writes: > - To officially adopt "git-scm.com " (and >"git-scm.org ") as our "project home >page"; and > > - To officially adopt the logo that appears on the "project >home page" as our "project logo". For those like me who wond

Re: [PATCH 17/19] Portable alloca for Git

2014-04-09 Thread Erik Faye-Lund
On Wed, Apr 9, 2014 at 2:48 PM, Kirill Smelkov wrote: > On Thu, Mar 27, 2014 at 06:22:50PM +0400, Kirill Smelkov wrote: >> On Mon, Mar 24, 2014 at 02:47:24PM -0700, Junio C Hamano wrote: >> > Kirill Smelkov writes: >> > >> > > On Fri, Feb 28, 2014 at 06:19:58PM +0100, Erik Faye-Lund wrote: >> > >

Re: [PATCH 17/19] Portable alloca for Git

2014-04-09 Thread Kirill Smelkov
On Thu, Mar 27, 2014 at 06:22:50PM +0400, Kirill Smelkov wrote: > On Mon, Mar 24, 2014 at 02:47:24PM -0700, Junio C Hamano wrote: > > Kirill Smelkov writes: > > > > > On Fri, Feb 28, 2014 at 06:19:58PM +0100, Erik Faye-Lund wrote: > > >> On Fri, Feb 28, 2014 at 6:00 PM, Kirill Smelkov wrote: > >