[PATCH v2] receive-pack: support push-to-checkout hook

2015-01-08 Thread Junio C Hamano
When receive.denyCurrentBranch is set to updateInstead, a push that tries to update the branch that is currently checked out is accepted only when the index and the working tree exactly matches the currently checked out commit, in which case the index and the working tree are updated to match the

Re: [PATCHv12 06/10] receive-pack.c: negotiate atomic push support

2015-01-08 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: From: Ronnie Sahlberg sahlb...@google.com This adds the atomic protocol option to allow receive-pack to inform the client that it has atomic push capability. This commit makes the functionality introduced in the previous commits go live for the

Re: [PATCH v2] gettext.h: add parentheses around N_ expansion if supported

2015-01-08 Thread Kyle J. McKay
On Jan 8, 2015, at 11:10, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com writes: For now only __GNUC__ is tested which covers both gcc and clang which should result in early detection of any adjacent N_ macros. I didn't check the list of -W options, but if there were a way to tell

Re: [PATCH 2/3] configure.ac: check for clock_gettime and CLOCK_MONOTONIC

2015-01-08 Thread Eric Sunshine
On Thu, Jan 8, 2015 at 3:00 PM, Reuben Hawkins reuben...@gmail.com wrote: The checks will override and unset YesPlease settings for HAVE_CLOCK_GETTIME and HAVE_CLOCK_MONOTONIC in config.mak.uname. I find this hard to grok and would rewrite it as: Set or clear Makefile variables

Re: [PATCH 1/3] configure.ac: check 'tv_nsec' field in 'struct stat'

2015-01-08 Thread Eric Sunshine
On Thu, Jan 8, 2015 at 3:00 PM, Reuben Hawkins reuben...@gmail.com wrote: Detect 'tv_nsec' field in 'struct stat' and set Makefile variable NO_NSEC appropriately. A side-effect of the above detection is that we also determine whether 'stat.st_mtimespec' is available, so, as a bonus, set the

Re: [PATCH 3/3] configure.ac: check for HMAC_CTX_cleanup

2015-01-08 Thread Eric Sunshine
On Thu, Jan 8, 2015 at 3:00 PM, Reuben Hawkins reuben...@gmail.com wrote: OpenSSL version 0.9.6b and before defined the function HMAC_cleanup. Newer versions define HMAC_CTX_cleanup. Check for HMAC_CTX_cleanup and fall back to HMAC_cleanup when the newer function is missing. Signed-off-by:

[PATCH] Documentation: added long options for -v and -n

2015-01-08 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- Documentation/git-add.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 9631526..1c74907 100644 --- a/Documentation/git-add.txt +++

Re: PATCH/RFC: format-patch: Add format.subjectprefixsep to change separators

2015-01-08 Thread Marc Finet
On Sun, Jan 04, 2015 at 11:55:24AM -0800, Junio C Hamano wrote: Marc Finet m.dreadl...@gmail.com writes: Some mailing list use PATCH: rather than [PATCH] to prefix patches, so introduce a new option to configure: - 2 chars that would enclose PATCH (and counters) - 1 char that would

Re: A better git log --graph?

2015-01-08 Thread Yuri D'Elia
On 01/08/2015 08:52 AM, Kyle J. McKay wrote: Since --graph is text-based, this response may not be on-topic hence no cc: to the list. I see --graph as an important tool to get an overview on how the development is being done. I don't mind having a graphical tool for the job, and I was even

Re: A better git log --graph?

2015-01-08 Thread John Szakmeister
On Thu, Jan 8, 2015 at 6:39 AM, Yuri D'Elia wav...@thregr.org wrote: [snip] I usually never use frontends. The notable exception is tig when I want to get a feeling of the status of several branches and/or blame some files. It haves a lot of typing. That being said, I tried gitk, but assumed

git svn import failure : write .git/Git_svn_hash_BmjclS: Bad file descriptor

2015-01-08 Thread Minty
I appear to have hit a bug (or have data that the code fails on) while importing an SVN repo to git. I'm wondering if there is anything I can do to help find / fix the cause, given I appear to have a fail-case. Sadly I can't supply the SVN repo as the code is private. What I did: git svn clone

Re: [msysGit] Re: Probably a bug with ~ symbol in filenames on Windows 7 x64 in git 1.9.5

2015-01-08 Thread Torsten Bögershausen
On 01/08/2015 11:28 AM, Jeff King wrote: On Thu, Jan 08, 2015 at 11:06:18AM +0100, Johannes Schindelin wrote: ICON~714.PNG is a valid short name for a long name (such as 'icon.background.png') because it fits the shortening scheme (8.3 format, the base name ends in ~n). As this can clash with

[PATCH] show-branch --upstream: add upstream branches to the list of branches to display

2015-01-08 Thread Mike Hommey
`git show-branch --upstream` is equivalent to `git show-branch $(git for-each-ref refs/heads --format '%(refname:short)') $(git for-each-ref refs/heads --format '%(upstream:short)')` `git show-branch --upstream foo bar` is equivalent to `git show-branch foo bar $(git for-each-ref refs/heads/foo

[PATCH v2] gettext.h: add parentheses around N_ expansion if supported

2015-01-08 Thread Kyle J. McKay
The N_ macro is used to mark strings for translation without actually translating them. At runtime the string is expected to be passed to the gettext API for translation. If two N_ macro invocations appear next to each other with only whitespace (or nothing at all) between them, the two separate

Re: [PATCH] standardize usage info string format

2015-01-08 Thread Johannes Schindelin
Hi Alex, [somehow my mailer did not like the Cc: list, so I had to cull it] On Wed, 7 Jan 2015, Alex Henrie wrote: This patch puts the usage info strings that were not already in docopt- like format into docopt-like format, which will be a litle easier for end users and a lot easier for

Re: Probably a bug with ~ symbol in filenames on Windows 7 x64 in git 1.9.5

2015-01-08 Thread Johannes Schindelin
Hi Junio, On Wed, 7 Jan 2015, Junio C Hamano wrote: Dscho, this sounds to me like the additional 8.3 ambiguity protection (which is only in Git for Windows) in action. Any thoughts? First thought: the Git for Windows mailing list should be Cc:ed (I was traveling yesterday and somebody else

Re: Probably a bug with ~ symbol in filenames on Windows 7 x64 in git 1.9.5

2015-01-08 Thread Jeff King
On Thu, Jan 08, 2015 at 11:06:18AM +0100, Johannes Schindelin wrote: ICON~714.PNG is a valid short name for a long name (such as 'icon.background.png') because it fits the shortening scheme (8.3 format, the base name ends in ~n). As this can clash with a validly shortened long name, Git for

Re: Probably a bug with ~ symbol in filenames on Windows 7 x64 in git 1.9.5

2015-01-08 Thread Johannes Schindelin
Hi Peff, On Thu, 8 Jan 2015, Jeff King wrote: On Thu, Jan 08, 2015 at 11:06:18AM +0100, Johannes Schindelin wrote: ICON~714.PNG is a valid short name for a long name (such as 'icon.background.png') because it fits the shortening scheme (8.3 format, the base name ends in ~n). As this can

Re: [PATCH v2 2/2] t/t3308-notes-merge.sh: succeed with relaxed notes refs

2015-01-08 Thread Jeff King
On Wed, Jan 07, 2015 at 08:03:58AM -0800, Junio C Hamano wrote: But we are talking about somebody who is already fully-qualifying a ref (and anything unqualified continues to get looked up under refs/notes). That (specifically 'merge') is not my real worry. It's the other way around,

Re: [PATCH] standardize usage info string format

2015-01-08 Thread Matthieu Moy
Alex Henrie alexhenri...@gmail.com writes: - Placing angle brackets around fill-in-the-blank parameters - Putting dashes in multiword parameter names - Adding spaces to [-f|--foobar] to make [-f | --foobar] - Replacing foobar* with [foobar...] The review would be easier with a patch series

[PATCH 1/2] remote: Remove -v/--verbose option from git remote show synopsis

2015-01-08 Thread Alexander Kuleshov
git remote show doesn't use -v/--verbose option Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- builtin/remote.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/remote.c b/builtin/remote.c index 46ecfd9..978c645 100644 --- a/builtin/remote.c +++

[PATCH 2/2] Documentation: Remove -v/--verbose option from git remote show synopsis

2015-01-08 Thread Alexander Kuleshov
git remote show doesn't use -v/--verbose option Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- Documentation/git-remote.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index cb103c8..07eb668 100644

Re: git svn import failure : write .git/Git_svn_hash_BmjclS: Bad file descriptor

2015-01-08 Thread Minty
On Thu, Jan 8, 2015 at 12:43 PM, Minty mintywal...@gmail.com wrote: git svn clone https://www.example.com/dshfkjhfsjhsdkjfhsdf/nameofrepo r869 = 9823c89bbdfa9d51aeb0a16c539049ae96nd5d62 (refs/remotes/git-svn) Dpath/to/stuff/Example1.java Dpath/to/stuff/Example2.java W:

[PATCH] show-branch: Indentation for show-branch usage

2015-01-08 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- builtin/show-branch.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 270e39c..2e60107 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -6,7

[PATCH] cat-file: Move assignment to the buffer declaration

2015-01-08 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- builtin/cat-file.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index f8d8129..840ace2 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -17,14 +17,13 @@ static

[ANN] SVNGit - Checkout Git repository by SVN Client

2015-01-08 Thread Yi, EungJun
Hello, all. I just have started to develop SVNGit, the servlet library in pure Java for SVN Client to checkout Git repository. The project is hosted at https://github.com/naver/svngit. Since the project is at very early stage, SVNGit unstably supports only a few SVN commands: checkout, update

Re: [msysGit] Re: Probably a bug with ~ symbol in filenames on Windows 7 x64 in git 1.9.5

2015-01-08 Thread Torsten Bögershausen
On 01/08/2015 04:58 PM, Johannes Schindelin wrote: Hi Torsten, On Thu, 8 Jan 2015, Torsten Bögershausen wrote: There is something more then just the tilde protection going on, [...] Indeed. What is going on is that you build Git yourself, from git.git, while Dmitry obviously used Git

Re: [msysGit] Re: Probably a bug with ~ symbol in filenames on Windows 7 x64 in git 1.9.5

2015-01-08 Thread Johannes Schindelin
Hi Torsten, On Thu, 8 Jan 2015, Torsten Bögershausen wrote: There is something more then just the tilde protection going on, [...] Indeed. What is going on is that you build Git yourself, from git.git, while Dmitry obviously used Git for Windows -- which carries a couple of patches on top of

low memory system to clone larger repo

2015-01-08 Thread matthew sporleder
I am attempting to clone this repo: https://github.com/jsonn/src/ and have been successful on some lower memory systems, but i'm interested in continuing to push down the limit. I am getting more success running clone via https:// than git:// or ssh (which is confusing to me) and the smallest

[PATCH] cat-file: Remove unused includes

2015-01-08 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- builtin/cat-file.c | 4 1 file changed, 4 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index f8d8129..750b5a2 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -4,12 +4,8 @@ * Copyright (C) Linus

Re: Probably a bug with ~ symbol in filenames on Windows 7 x64 in git 1.9.5

2015-01-08 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Thu, Jan 08, 2015 at 11:06:18AM +0100, Johannes Schindelin wrote: ICON~714.PNG is a valid short name for a long name (such as 'icon.background.png') because it fits the shortening scheme (8.3 format, the base name ends in ~n). As this can clash with a

Re: [PATCH v2] gettext.h: add parentheses around N_ expansion if supported

2015-01-08 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: For now only __GNUC__ is tested which covers both gcc and clang which should result in early detection of any adjacent N_ macros. I didn't check the list of -W options, but if there were a way to tell gcc to stick to the C standard in a more strict way

Re: [PATCH 1/2] remote: Remove -v/--verbose option from git remote show synopsis

2015-01-08 Thread René Scharfe
Am 08.01.2015 um 18:57 schrieb Alexander Kuleshov: git remote show doesn't use -v/--verbose option Hmm, but it does? $ git version git version 2.2.1 $ git remote show origin $ git remote -v show origin git://git.kernel.org/pub/scm/git/git.git

Re: [PATCH 1/2] remote: Remove -v/--verbose option from git remote show synopsis

2015-01-08 Thread Alexander Kuleshov
Ah, yes, right. Please dismiss 1,2 patches. Sorry for noise 2015-01-09 1:17 GMT+06:00 René Scharfe l@web.de: Am 08.01.2015 um 18:57 schrieb Alexander Kuleshov: git remote show doesn't use -v/--verbose option Hmm, but it does? $ git version git version 2.2.1

Re: [PATCH] cat-file: Move assignment to the buffer declaration

2015-01-08 Thread Junio C Hamano
Alexander Kuleshov kuleshovm...@gmail.com writes: Subject: Re: [PATCH] cat-file: Move assignment to the buffer declaration git shortlog on recent history shows that it is conventional not to upcase the sentence after the area: on titles. This line not just declares but defines buf, so I'd

Re: Probably a bug with ~ symbol in filenames on Windows 7 x64 in git 1.9.5

2015-01-08 Thread Jeff King
On Thu, Jan 08, 2015 at 11:08:47AM -0800, Junio C Hamano wrote: I wonder if it is worth having a git-only mode for core.protectNTFS. Turning it off entirely would make him susceptible to GIT~1 attacks. Yes, I think having distinctions would make sense, but I am not sure if git-only vs

[PATCH 3/3] configure.ac: check for HMAC_CTX_cleanup

2015-01-08 Thread Reuben Hawkins
OpenSSL version 0.9.6b and before defined the function HMAC_cleanup. Newer versions define HMAC_CTX_cleanup. Check for HMAC_CTX_cleanup and fall back to HMAC_cleanup when the newer function is missing. Signed-off-by: Reuben Hawkins reuben...@gmail.com --- Makefile | 6 ++

[PATCH 1/3] configure.ac: check 'tv_nsec' field in 'struct stat'

2015-01-08 Thread Reuben Hawkins
Detect 'tv_nsec' field in 'struct stat' and set Makefile variable NO_NSEC appropriately. A side-effect of the above detection is that we also determine whether 'stat.st_mtimespec' is available, so, as a bonus, set the Makefile variable USE_ST_TIMESPEC, as well. Signed-off-by: Reuben Hawkins

[PATCH 2/3] configure.ac: check for clock_gettime and CLOCK_MONOTONIC

2015-01-08 Thread Reuben Hawkins
The checks will override and unset YesPlease settings for HAVE_CLOCK_GETTIME and HAVE_CLOCK_MONOTONIC in config.mak.uname. CLOCK_MONOTONIC isn't available on RHEL3, but there are still RHEL3 systems being used in production. Signed-off-by: Reuben Hawkins reuben...@gmail.com --- Makefile

Re: [PATCH] show-branch: Indentation for show-branch usage

2015-01-08 Thread Junio C Hamano
Alexander Kuleshov kuleshovm...@gmail.com writes: Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- s/Indentation for/line-wrap/, perhaps? What the patch wants to do makes sense to me, but I haven't seen a long multi-line string, each lines in which is terminated with \n\ in the

Re: [PATCH 1/2] remote: Remove -v/--verbose option from git remote show synopsis

2015-01-08 Thread Junio C Hamano
Alexander Kuleshov kuleshovm...@gmail.com writes: git remote show doesn't use -v/--verbose option Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com Thanks. I think these two patches should be squashed into one (which I can do locally without asking you to resend) but they are good

Re: [PATCH] cat-file: Remove unused includes

2015-01-08 Thread Alexander Kuleshov
Will research this question and resend the patch. Thank you. 2015-01-09 1:45 GMT+06:00 Junio C Hamano gits...@pobox.com: Alexander Kuleshov kuleshovm...@gmail.com writes: Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- builtin/cat-file.c | 4 1 file changed, 4

Re: [PATCH] show-branch: Indentation for show-branch usage

2015-01-08 Thread Alexander Kuleshov
No it doesn't breaks N_ macro. Will resend the patch. 2015-01-09 2:05 GMT+06:00 Junio C Hamano gits...@pobox.com: Alexander Kuleshov kuleshovm...@gmail.com writes: Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- s/Indentation for/line-wrap/, perhaps? What the patch wants to

[PATCH v2] show-branch: line-wrap for show-branch usage

2015-01-08 Thread Alexander Kuleshov
Signed-off-by: 0xAX kuleshovm...@gmail.com --- builtin/show-branch.c | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 270e39c..18245ad 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -6,9 +6,11 @@

Re: [PATCH] cat-file: Remove unused includes

2015-01-08 Thread Junio C Hamano
Alexander Kuleshov kuleshovm...@gmail.com writes: Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- builtin/cat-file.c | 4 1 file changed, 4 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index f8d8129..750b5a2 100644 --- a/builtin/cat-file.c +++

Re: [PATCH 1/2] remote: Remove -v/--verbose option from git remote show synopsis

2015-01-08 Thread Junio C Hamano
René Scharfe l@web.de writes: Am 08.01.2015 um 18:57 schrieb Alexander Kuleshov: git remote show doesn't use -v/--verbose option Hmm, but it does? $ git version git version 2.2.1 $ git remote show origin $ git remote -v show origin

Re: [PATCH 1/2] remote: Remove -v/--verbose option from git remote show synopsis

2015-01-08 Thread Alexander Kuleshov
What if move -v/--verbose after commands? Like: git remote show [-v | --verbose] [-n] name and etc...? 2015-01-09 2:14 GMT+06:00 Junio C Hamano gits...@pobox.com: René Scharfe l@web.de writes: Am 08.01.2015 um 18:57 schrieb Alexander Kuleshov: git remote show doesn't use -v/--verbose