[PATCH 2/2] l10n: de.po: correct singular form

2015-01-26 Thread Michael J Gruber
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 65a8ac0..6af1599 100644 --- a/po/de.po +++ b/po/de.po @@ -3559,21 +3559,21 @@ msgid Warning: you are leaving %d commit behind, not

[PATCH 1/2] l10n: de.po: translate leave behind correctly

2015-01-26 Thread Michael J Gruber
This message is about leaving orphaned commits behind, not about behing behind an upstream branch. Try to make this clear. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-26 Thread Josh Boyer
[Adding Junio's correct email address. Sigh.] On Mon, Jan 26, 2015 at 11:29 AM, Josh Boyer jwbo...@fedoraproject.org wrote: Hi, I went to do the Fedora 3.19-rc6 build this morning and it failed in our buildsystem with: + '[' '!' -f /builddir/build/SOURCES/patch-3.19-rc6.xz ']' + case

Re: git push --repo option not working as described in git manual.

2015-01-26 Thread Junio C Hamano
The conclusions from the last time we discussed this [*1*], the last word was that git push $some_opt... --repo=$Repo $more_opt... $args... is designed to work exactly like git push $some_opt... $more_opt... $Repo $args... and the documentation that says otherwise is incorrect.

Re: [PATCH 0/2] Tweaking the gitk window title.

2015-01-26 Thread Marc Branchaud
On 15-01-06 12:51 PM, Marc Branchaud wrote: The first patch simply changes the title from gitk: dir to dir - gitk, which is the title layout used by most of the applications on my Kubuntu box. The second patch is the one that I'm more keen to see accepted. It relies on the first only in

[PATCHv2] commit: reword --author error message

2015-01-26 Thread Michael J Gruber
If an --author argument is specified but does not contain a '' then git tries to find the argument within the existing authors; and gives the error message No existing author found with '%s' if there is no match. This is confusing for users who try to specify a valid complete author name. Rename

patch-2.7.3 no longer applies relative symbolic link patches

2015-01-26 Thread Josh Boyer
Hi, I went to do the Fedora 3.19-rc6 build this morning and it failed in our buildsystem with: + '[' '!' -f /builddir/build/SOURCES/patch-3.19-rc6.xz ']' + case $patch in + unxz + patch -p1 -F1 -s symbolic link target '../../../../../include/dt-bindings' is invalid error: Bad exit status from

Re: [PATCHv3 6/6] refs.c: enable large transactions

2015-01-26 Thread Stefan Beller
On Fri, Jan 23, 2015 at 4:38 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: On Fri, Jan 23, 2015 at 4:14 PM, Junio C Hamano gits...@pobox.com wrote: yeah that's the goal. Though as we're in one transaction, as soon as we have an early exit, the

Re: [PATCHv2] commit: reword --author error message

2015-01-26 Thread Jeff King
On Mon, Jan 26, 2015 at 04:48:33PM +0100, Michael J Gruber wrote: - die(_(No existing author found with '%s'), name); + die(_(--author '%s': neither 'Name email' nor a match for an existing author), name); I had to add to the bikeshed, but I had to read this several times to make

[PATCH] Documentation/git-add.txt: add `add.ginore-errors` configuration variable

2015-01-26 Thread Alexander Kuleshov
'git add' supports not only `add.ignoreErrors`, but also `add.ignore-errors` configuration variable. Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- Documentation/git-add.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-add.txt

Re: [PATCH 1/2] l10n: de.po: translate leave behind correctly

2015-01-26 Thread Ralf Thielow
2015-01-26 16:34 GMT+01:00 Michael J Gruber g...@drmicha.warpmail.net: This message is about leaving orphaned commits behind, not about behing behind an upstream branch. Try to make this clear. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net Thanks for both patches! -- To

implement a stable 'Last updated' in Documentation

2015-01-26 Thread Olaf Hering
Several files in Documentation have an unstable 'Last updated' timestamp. The reason is that their mtime changes every time, which prevents reproducible builds. 341 technical/api-index.txt: technical/api-index-skel.txt \ 342 technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS)) 343

[PATCH] git-gui: sort entries in tclIndex

2015-01-26 Thread Olaf Hering
ALL_LIBFILES uses wildcard, which provides the result in directory order. This order depends on the underlying filesystem on the buildhost. To get reproducible builds it is required to sort such list before using them. Signed-off-by: Olaf Hering o...@aepfle.de --- git-gui/Makefile | 2 +- 1 file

[PATCH] l10n: de.po: fix typo

2015-01-26 Thread Ralf Thielow
From: Benedikt Heine b...@bebehei.de Signed-off-by: Benedikt Heine b...@bebehei.de Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index b2d4639..596f486 100644 --- a/po/de.po +++

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-26 Thread Josh Boyer
On Mon, Jan 26, 2015 at 4:30 PM, Linus Torvalds torva...@linux-foundation.org wrote: On Mon, Jan 26, 2015 at 1:07 PM, Josh Boyer jwbo...@fedoraproject.org wrote: Or did I miss a way that git-apply can take a git patch and apply it to a tree that isn't a git repo? Exactly. git apply works as

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-26 Thread David Kastrup
Linus Torvalds torva...@linux-foundation.org writes: On Mon, Jan 26, 2015 at 8:32 AM, Josh Boyer jwbo...@fedoraproject.org wrote: I went to do the Fedora 3.19-rc6 build this morning and it failed in our buildsystem with: + '[' '!' -f /builddir/build/SOURCES/patch-3.19-rc6.xz ']' + case

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-26 Thread Linus Torvalds
On Mon, Jan 26, 2015 at 1:35 PM, Junio C Hamano gits...@pobox.com wrote: What is your take on CVE-2015-1196, which brought this /regression/ to GNU patch? If git apply get /fixed/ for that same CVE, would that /break/ your fix? I _think_ we allow arbitrary symlinks to be created, but then we

Re: [PATCH] Documentation/git-add.txt: add `add.ginore-errors` configuration variable

2015-01-26 Thread Eric Sunshine
On Mon, Jan 26, 2015 at 11:55 AM, Alexander Kuleshov kuleshovm...@gmail.com wrote: 'git add' supports not only `add.ignoreErrors`, but also `add.ignore-errors` configuration variable. See 6b3020a2 (add: introduce add.ignoreerrors synonym for add.ignore-errors, 2010-12-01) for why this patch is

[PATCH] refs.c: clean up write_ref_sha1 returns

2015-01-26 Thread Stefan Beller
write_ref_sha1 now either returns 0 for a successful write or !=0 if an error occurred. This cleanup results in cleaning the code at other places as well where we had to set force_write to make the write_ref_sha1(...) || commit_ref(...) combination work. Also the checks for the optimisation of old

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-26 Thread Linus Torvalds
On Mon, Jan 26, 2015 at 1:07 PM, Josh Boyer jwbo...@fedoraproject.org wrote: Or did I miss a way that git-apply can take a git patch and apply it to a tree that isn't a git repo? Exactly. git apply works as a straight patch replacement outside of a git repository. It doesn't actually need a

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-26 Thread Josh Boyer
On Mon, Jan 26, 2015 at 3:44 PM, Linus Torvalds torva...@linux-foundation.org wrote: On Mon, Jan 26, 2015 at 8:32 AM, Josh Boyer jwbo...@fedoraproject.org wrote: I went to do the Fedora 3.19-rc6 build this morning and it failed in our buildsystem with: + '[' '!' -f

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-26 Thread Junio C Hamano
On Mon, Jan 26, 2015 at 1:30 PM, Linus Torvalds torva...@linux-foundation.org wrote: On Mon, Jan 26, 2015 at 1:07 PM, Josh Boyer jwbo...@fedoraproject.org wrote: Or did I miss a way that git-apply can take a git patch and apply it to a tree that isn't a git repo? Exactly. git apply works as

Re: [PATCHv3 6/6] refs.c: enable large transactions

2015-01-26 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: I do not see the problem in the code itself, but rather in understanding the code. I will send a follow up patch which makes it easier to follow by removing the early exit with no problem away. Taken as a whole the code may function correctly but the

[PATCH] l10n: gitk/ca.po: add Catalan translation

2015-01-26 Thread Alex Henrie
Signed-off-by: Alex Henrie alexhenri...@gmail.com --- gitk-git/po/ca.po | 1349 + 1 file changed, 1349 insertions(+) create mode 100644 gitk-git/po/ca.po diff --git a/gitk-git/po/ca.po b/gitk-git/po/ca.po new file mode 100644 index

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-26 Thread Junio C Hamano
Linus Torvalds torva...@linux-foundation.org writes: Ugh. I don't see anything we can do about this on the git side, and I do kind of understand why 'patch' would be worried about '..' files. In a perfect world, patch would parse the filename and see that it stays within the directory

Re: t5539 broken under Mac OS X

2015-01-26 Thread Junio C Hamano
Erik Faye-Lund kusmab...@gmail.com writes: On Fri, Jan 16, 2015 at 1:04 AM, Junio C Hamano gits...@pobox.com wrote: Jeff King p...@peff.net writes: Exactly. I am happy to submit a patch, but I cannot think of any mechanisms besides: 1. Calling `id`, which I suspect is very not portable.

Re: [PATCHv2] commit: reword --author error message

2015-01-26 Thread Junio C Hamano
Jeff King p...@peff.net writes: ... I somehow had trouble making sense of Z (a match...) as a noun. I wonder if adding back in the missing verb, rather than a colon, would also make more sense: --author '%s' is neither 'Name email' nor a match for an existing author Then --author

Re: [PATCH] refs.c: clean up write_ref_sha1 returns

2015-01-26 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: I can redo the atomic-push-fix series with this cleanup merged into the appropriate patches or you could just queue it on top of said series. Yeah, I do not think we are expecting to fast track these two series through 'next' to 'master'

Re: t5539 broken under Mac OS X

2015-01-26 Thread Erik Faye-Lund
On Fri, Jan 16, 2015 at 1:04 AM, Junio C Hamano gits...@pobox.com wrote: Jeff King p...@peff.net writes: Exactly. I am happy to submit a patch, but I cannot think of any mechanisms besides: 1. Calling `id`, which I suspect is very not portable. 2. Writing a C program to check getuid().

Re: [PATCHv2] commit: reword --author error message

2015-01-26 Thread Jeff King
On Mon, Jan 26, 2015 at 06:43:46PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: ... I somehow had trouble making sense of Z (a match...) as a noun. I wonder if adding back in the missing verb, rather than a colon, would also make more sense: --author '%s' is

git push --repo option not working as described in git manual.

2015-01-26 Thread Prem
I am using git 2.2.2 and want to report an issue with git push --repo option. git 2.2.2 manual says that git push --repo=public will push to public only if the current branch does not track a remote branch. See http://git-scm.com/docs/git-push However, I see that git pushes even when the

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-26 Thread Linus Torvalds
On Mon, Jan 26, 2015 at 8:32 AM, Josh Boyer jwbo...@fedoraproject.org wrote: I went to do the Fedora 3.19-rc6 build this morning and it failed in our buildsystem with: + '[' '!' -f /builddir/build/SOURCES/patch-3.19-rc6.xz ']' + case $patch in + unxz + patch -p1 -F1 -s symbolic link