[PATCH 1/1] skip RFC1991 tests with gnupg 2.1.x

2014-12-11 Thread Christian Hesse
--- t/lib-gpg.sh | 6 ++ t/t7004-tag.sh | 14 +++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index cd2baef..05b07c6 100755 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -22,6 +22,12 @@ else GNUPGHOME=$(pwd)/gpghome

Re: [PATCH] list-objects: mark fewer commits as edges for non-shallow clones

2014-12-11 Thread Duy Nguyen
On Thu, Dec 11, 2014 at 10:46 AM, brian m. carlson sand...@crustytoothpaste.net wrote: In commit fbd4a70 (list-objects: mark more commits as edges in mark_edges_uninteresting - 2013-08-16), we made --thin much more aggressive by reading lots more trees. This produces much smaller packs for

[PATCH v2 1/1] create gpg homedir on the fly and skip RFC1991 tests for gnupg 2.1

2014-12-11 Thread Christian Hesse
GnuPG 2.1 homedir looks different, so just creat it on the fly by importing needed private and public keys and ownertrust. This solves an issue with gnupg 2.1 running interactive pinentry when old secret key is present. Additionally GnuPG 2.1 does not longer support RFC1991, so skip these tests.

Re: [PATCH] added git-config support for diff.relative setting

2014-12-11 Thread Duy Nguyen
On Thu, Dec 11, 2014 at 2:28 PM, Kelson kel...@shysecurity.com wrote: @@ -270,6 +270,14 @@ int git_diff_basic_config(const char *var, const char *value, void *cb) return 0; } + if (!strcmp(var, diff.relative)) { + if (git_config_bool(var, value))

git objects mode 755 vs 700

2014-12-11 Thread Evan Li
Greetings, I have setup a git server for my company, but one problem I found is like the following problem: [root@localhost objects]# pwd /home/git/repositories/testing.git/objects [root@localhost objects]# ls -l total 0 drwx-- 2 git git 59 Dec 11 03:04 0e drwx-- 2 git git 59 Dec 11

[PATCH 1/1] replace binary keyrings with armored keys

2014-12-11 Thread Christian Hesse
--- t/lib-gpg.sh | 3 +- t/lib-gpg/keyring.gpg | 88 ++ t/lib-gpg/pubring.gpg | Bin 2359 - 0 bytes t/lib-gpg/secring.gpg | Bin 3734 - 0 bytes 4 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 t/lib-gpg/keyring.gpg

Re: [PATCH] gitignore.txt: do not suggest assume-unchanged

2014-12-11 Thread Michael J Gruber
Jonathan Nieder schrieb am 10.12.2014 um 02:06: Michael J Gruber wrote: git-update-index --assume-unchanged was never meant to ignore changes to tracked files (only to spare some stats). So do not suggest it as a means to achieve that. [...] +++ b/Documentation/gitignore.txt @@ -138,9

Re: [RFC/PATCH 2/5] glossary: introduce glossary lookup command

2014-12-11 Thread Michael J Gruber
Junio C Hamano schrieb am 10.12.2014 um 23:50: Michael J Gruber g...@drmicha.warpmail.net writes: When using a localised git, there are many reasons why a correspondence between English and localised git terms is needed: - connect localised messages with English ones (porcelain vs. plumbing)

Re: [PATCH 1/1] skip RFC1991 tests with gnupg 2.1.x

2014-12-11 Thread Torsten Bögershausen
On 11.12.14 10:30, Christian Hesse wrote: --- t/lib-gpg.sh | 6 ++ t/t7004-tag.sh | 14 +++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index cd2baef..05b07c6 100755 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -22,6 +22,12

Re: [PATCH 1/2] t1400: add some more tests of update-ref --stdin's verify command

2014-12-11 Thread Brad King
On 12/10/2014 6:47 PM, Michael Haggerty wrote: Two of the tests fail because verify refs/heads/foo with no argument (not even zeros) actually *deletes* refs/heads/foo. This problem will be fixed in the next commit. Reviewed-by: Brad King brad.k...@kitware.com -Brad -- To unsubscribe

Re: [PATCH 2/2] update-ref: fix verify command with missing oldvalue

2014-12-11 Thread Brad King
On 12/10/2014 6:47 PM, Michael Haggerty wrote: set have_old unconditionally and set old_sha1 to null_sha1. Reviewed-by: Brad King brad.k...@kitware.com -Brad -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

Re: [PATCH 1/1] skip RFC1991 tests with gnupg 2.1.x

2014-12-11 Thread Michael J Gruber
Torsten Bögershausen schrieb am 11.12.2014 um 16:32: On 11.12.14 10:30, Christian Hesse wrote: --- t/lib-gpg.sh | 6 ++ t/t7004-tag.sh | 14 +++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index cd2baef..05b07c6 100755 ---

[PATCH] git-check-ignore.txt: Clarify exit codes

2014-12-11 Thread Florian Hassanen
check-ignore disregards whether a path is matched by a positive or negative pattern. Thus for a file that is _not_ ignored, but is captured by negative pattern in .gitignore, the exit code is 0. The docs suggested otherwise. Clarify docs to explain that only the match matters, not whether the

Re: [PATCH] list-objects: mark fewer commits as edges for non-shallow clones

2014-12-11 Thread Junio C Hamano
brian m. carlson sand...@crustytoothpaste.net writes: In commit fbd4a70 (list-objects: mark more commits as edges in mark_edges_uninteresting - 2013-08-16), we made --thin much more aggressive by reading lots more trees. This produces much smaller packs for shallow clones; however, it causes

Re: [PATCH] list-objects: mark fewer commits as edges for non-shallow clones

2014-12-11 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: This change affects non-clone/fetch uses of object listing depending on the shallowness of the repository, and does not even care if it is driven as part of the pack-object codepath, if I am reading it correctly. It smells wrong. The problematic

Re: [RFC/PATCH 2/5] glossary: introduce glossary lookup command

2014-12-11 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: I wondered if we want to also have the associated documentation in response to a query, but I am not sure how well that would go without having a translated glossary at least. I.e. pulling the Yes, I think we would need something different

Re: [PATCH 1/2] commit: loosen ident checks when generating template

2014-12-11 Thread Eric Sunshine
On Wed, Dec 10, 2014 at 10:42 AM, Jeff King p...@peff.net wrote: Signed-off-by: Jeff King p...@peff.net --- diff --git a/builtin/commit.c b/builtin/commit.c index d1c90db..2be5506 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -822,8 +821,14 @@ static int prepare_to_commit(const

Re: [PATCH v3 23/23] untracked cache: guard and disable on system changes

2014-12-11 Thread Torsten Bögershausen
On 10.12.14 13:22, Duy Nguyen wrote: On Wed, Dec 10, 2014 at 12:08 PM, Torsten Bögershausen tbo...@web.de wrote: That opens another question: How flexible/extensible/self-describing is the format of the UNTR extension ? If we drop the OS name root dir check because it disallows network use,

Re: [PATCH] added git-config support for diff.relative setting

2014-12-11 Thread Kelson
That is quite manageable. I was concerned that --relative changes the UI (relative paths) and behavior (excluding files outside the current directory), which might not be clear if placed in just the UI component. You make a great point that git_diff_basic_config drives other commands though,

Re: [PATCH 2/8] refs.c: rename the transaction functions

2014-12-11 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: Rename the transaction functions. Remove the leading ref_ from the names and append _ref to the names for functions that create/delete/ update sha1 refs. The goal in the long term is to have different things running through the transaction api, such

Re: [PATCH 2/8] refs.c: rename the transaction functions

2014-12-11 Thread Stefan Beller
On Thu, Dec 11, 2014 at 1:42 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: Rename the transaction functions. Remove the leading ref_ from the names and append _ref to the names for functions that create/delete/ update sha1 refs. The goal in the long

Re: [PATCH 4/8] refs.c: add transaction function to append to the reflog

2014-12-11 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: Unlike transaction_update_ref, this writes out the proposed contents of the reflog to a temporary file at transaction_reflog_update time instead of waiting for the transaction waiting to be committed. This avoids an explosion of memory usage when

Re: no-xmailer tests fail under Mac OS

2014-12-11 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Fri, Dec 05, 2014 at 11:07:37PM -0800, Michael Blume wrote: Ah, right, we might be looking for 0 sometimes. The right way to do it without destroying the -chaining is: { grep ^X-Mailer: out || true } test_line_count = $expected mailer Hmm, it

Re: no-xmailer tests fail under Mac OS

2014-12-11 Thread Jeff King
On Thu, Dec 11, 2014 at 02:11:04PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: On Fri, Dec 05, 2014 at 11:07:37PM -0800, Michael Blume wrote: Ah, right, we might be looking for 0 sometimes. The right way to do it without destroying the -chaining is: { grep

Re: no-xmailer tests fail under Mac OS

2014-12-11 Thread Luis Henriques
Jeff King p...@peff.net writes: On Thu, Dec 11, 2014 at 02:11:04PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: On Fri, Dec 05, 2014 at 11:07:37PM -0800, Michael Blume wrote: Ah, right, we might be looking for 0 sometimes. The right way to do it without destroying

Re: [PATCH v2 1/1] create gpg homedir on the fly and skip RFC1991 tests for gnupg 2.1

2014-12-11 Thread Junio C Hamano
Christian Hesse m...@eworm.de writes: GnuPG 2.1 homedir looks different, so just creat it on the fly by importing needed private and public keys and ownertrust. This solves an issue with gnupg 2.1 running interactive pinentry when old secret key is present. Additionally GnuPG 2.1 does not

Re: git objects mode 755 vs 700

2014-12-11 Thread Junio C Hamano
Evan Li li.evan.c...@gmail.com writes: Why some of them are of 755 but some 700? How can I set all sub-directories under ‘objects’ to be of 755 mode? Some people who are pushing into the repository have 077 and some others have 022 as their umask, perhaps? If that is the case, perhaps

Re: [PATCH 1/1] skip RFC1991 tests with gnupg 2.1.x

2014-12-11 Thread Christian Hesse
Michael J Gruber g...@drmicha.warpmail.net on Thu, 2014/12/11 17:54: Torsten Bögershausen schrieb am 11.12.2014 um 16:32: On 11.12.14 10:30, Christian Hesse wrote: --- t/lib-gpg.sh | 6 ++ t/t7004-tag.sh | 14 +++--- 2 files changed, 13 insertions(+), 7 deletions(-)

Re: [PATCH] git-check-ignore.txt: Clarify exit codes

2014-12-11 Thread Junio C Hamano
Florian Hassanen florian.hassa...@gmail.com writes: check-ignore disregards whether a path is matched by a positive or negative pattern. Thus for a file that is _not_ ignored, but is captured by negative pattern in .gitignore, the exit code is 0. The docs suggested otherwise. I am not sure

Re: [PATCH 1/1] skip RFC1991 tests with gnupg 2.1.x

2014-12-11 Thread Junio C Hamano
Christian Hesse m...@eworm.de writes: However... Even if GnuPG 2.2.x (or whatever future release) will become next stable: It will not reintroduce support for rfc1991. How certain are we about the deprecation? It also would make us feel safer if we did not have to depend on the version or

Re: [PATCH] git-check-ignore.txt: Clarify exit codes

2014-12-11 Thread Florian Hassanen
check-ignore disregards whether a path is matched by a positive or negative pattern. Thus for a file that is _not_ ignored, but is captured by negative pattern in .gitignore, the exit code is 0. The docs suggested otherwise. I am not sure that is the actual behaviour of the command. Given

Re: [PATCH] git-check-ignore.txt: Clarify exit codes

2014-12-11 Thread Junio C Hamano
Florian Hassanen florian.hassa...@gmail.com writes: Maybe your global ignore file gets in the way? No, as I do not have one. is one of a.o and vendor.o already in your index? Bingo. I did git add . to see if the .gitignore file is doing the right thing before running that demonstration. It

Re: [PATCH] commit: ignore assume-unchanged files in commmit file mode

2014-12-11 Thread Philip Oakley
From: Sérgio Basto ser...@serjux.com Sent: Tuesday, December 09, 2014 2:44 AM On Sex, 2014-12-05 at 17:56 +0700, Nguyễn Thái Ngọc Duy wrote: In the same spirit of 7fce6e3 (commit: correctly respect skip-worktree bit - 2009-12-14), if a file is marked unchanged, skip it. Noticed-by: Sérgio

Re: [PATCH] git-check-ignore.txt: Clarify exit codes

2014-12-11 Thread Florian Hassanen
It smells like you spotted a bug in the behaviour, not a bug in the documentation, at least to me. At first I thought so as well :-) I even prepared a patch, just to find out, that existing tests specifically test for this unintuitive behavior. Then I read the docs in more detail and found

[PATCH] doc: core.ignoreStat clarify the --assume-unchanged effect

2014-12-11 Thread Philip Oakley
The assume-unchanged bit can be misunderstood. Be assertive about the expectation that file changes should update that flag. Signed-off-by: Philip Oakley philipoak...@iee.org --- Documentation/config.txt | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git

[PATCH] core.ignoreStat is affected by --assume-unchanged misunderstandings

2014-12-11 Thread Philip Oakley
A recent thread on the Msysgit mailing list https://groups.google.com/forum/#!topic/msysgit/d9CltDxx11g noted the config core.ignoreStat flag as a solution to slow performance on Windows 8.1 for their system. This config flag uses the --assume-unchanged flag to speed up systems with slow