Re: [PATCH v5 5/7] add tests for rebasing merged history

2013-06-05 Thread Johannes Sixt
Am 6/4/2013 19:18, schrieb Junio C Hamano: Martin von Zweigbergk martinv...@gmail.com writes: --- +#TODO: make all flavors of rebase use --topo-order +test_run_rebase success 'e n o' '' +test_run_rebase success 'e n o' -m +test_run_rebase success 'n o e' -i I do not quite follow this

Re: SNI (SSL virtual hosts)

2013-06-05 Thread Daniel Stenberg
On Tue, 4 Jun 2013, Janusz Harkot wrote: valid point, but from what you can find on the web, the only solution provided everywhere was to disable certificate checking… so maybe that's not me, but this is first time someone spent some time to check whats going on :) I don't disagree with

Re: What's cooking in git.git (Jun 2013, #02; Tue, 4)

2013-06-05 Thread Johannes Sixt
Am 6/5/2013 1:45, schrieb Junio C Hamano: * jk/test-exit-code-by-signal (2013-06-02) 1 commit (merged to 'next' on 2013-06-03 at 25af892) + t0005: test git exit code from signal death Will merge to 'master'. I haven't gotten around to run this new test on Windows. I've reason to believe

Re: git archive --worktree-attributes doesn't exclude .gitattributes anymore

2013-06-05 Thread Jeff King
On Wed, Jun 05, 2013 at 07:10:01AM +0100, Gianfranco Costamagna wrote: Just a question, is it possible to add a new test for handling this kind of regressions? Yes, I added one in commit efa5f825. And second, is it possible to have a patch for this problem? I'll be glad to backport in

Re: What's cooking in git.git (Jun 2013, #02; Tue, 4)

2013-06-05 Thread Jeff King
On Wed, Jun 05, 2013 at 08:59:15AM +0200, Johannes Sixt wrote: Am 6/5/2013 1:45, schrieb Junio C Hamano: * jk/test-exit-code-by-signal (2013-06-02) 1 commit (merged to 'next' on 2013-06-03 at 25af892) + t0005: test git exit code from signal death Will merge to 'master'. I

Re: [PATCH 00/15] Towards a more awesome git-branch

2013-06-05 Thread Ramkumar Ramachandra
Duy Nguyen wrote: I'm still hung up one the detached HEAD thing. It's a bit quirky to put in for-each-ref, but for-each-ref can't truly replace branch --list until it can display detached HEAD. But I think we can finish this part and get it in first. Should be useful for some people already.

Re: [PATCH 10/15] for-each-ref: introduce format specifier %(*) and %(*)

2013-06-05 Thread Ramkumar Ramachandra
Duy Nguyen wrote: I mentioned it before and I do it again. This is not optimal. Yeah, I'll attempt to fix this, but it's not urgent. But I guess it's ok in this shape unless you run this over hundreds of refs. Oh, you can run over a hundred refs just fine, for scripting purposes; but why

Re: Re: Re: What's cooking in git.git (May 2013, #09; Wed, 29)

2013-06-05 Thread John Keeping
On Tue, Jun 04, 2013 at 06:57:34PM -0400, Phil Hord wrote: On Tue, Jun 4, 2013 at 8:48 AM, John Keeping j...@keeping.me.uk wrote: The problem is that sometimes you do want to adjust the path and sometimes you don't. Reading git-submodule(1), it says: This may be either an absolute

Re: [PATCH 10/15] for-each-ref: introduce format specifier %(*) and %(*)

2013-06-05 Thread Duy Nguyen
On Wed, Jun 5, 2013 at 3:14 PM, Ramkumar Ramachandra artag...@gmail.com wrote: Duy Nguyen wrote: I mentioned it before and I do it again. This is not optimal. Yeah, I'll attempt to fix this, but it's not urgent. Agreed it's not urgent. But I guess it's ok in this shape unless you run this

[PATCH] git-remote-mediawiki: use Git.pm functions for credentials

2013-06-05 Thread benoit . person
From: Benoit Person benoit.per...@ensimag.fr In 52dce6d, a new credential function was added to Git.pm, based on git-remote-mediawiki's functions. The logical follow-up is to use those functions in git-remote-mediawiki. Signed-off-by: Benoit Person benoit.per...@ensimag.fr Signed-off-by:

Re: git-daemon: needs /root/.config/git/config?

2013-06-05 Thread Andreas Krey
On Wed, 05 Jun 2013 13:19:18 +, Ian Kumlien wrote: ... Well, I have no idea of how to control HOME in xinetd - access to the machine is limited and x doesn't give that much access (nothing really important is actually stored in /root) Make xinetd execute '/usr/bin/env HOME=/home/yourstruly

Re: [PATCH 08/15] for-each-ref: get --pretty using format_commit_message

2013-06-05 Thread Duy Nguyen
On Wed, Jun 5, 2013 at 4:12 AM, Eric Sunshine sunsh...@sunshineco.com wrote: +Caveats: + +1. Many of the placeholders in PRETTY FORMATS are designed to work + specifically on commit objects: when non-commit objects are + supplied, those placeholders won't work. Should won't work be

Re: [Administrivia] On ruby and contrib/

2013-06-05 Thread Felipe Contreras
On Tue, Jun 4, 2013 at 10:02 PM, David Lang da...@lang.hm wrote: On Tue, 4 Jun 2013, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: On Ruby: Assuming related is a good idea, to make it as the proper part of the system out of contrib/ when its design review phase is

Re: [Administrivia] On ruby and contrib/

2013-06-05 Thread Felipe Contreras
On Tue, Jun 4, 2013 at 7:04 PM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: I however do not know how much extra burden it would place to add dependencies to platform folks, so obviously the safer approach is 1 at least in the immediate future. My

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-05 Thread Felipe Contreras
On Tue, Jun 4, 2013 at 1:30 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: You didn't answer, what happens when you run --skip-empty and --allow-empty? I'll answer to a slightly different question: What should happen? I think it should error

deletion of branch seems to modify tag as well?

2013-06-05 Thread Lyons, Roy
$ git push origin :ABRANCHNAME remote: Firing Pre - receive hook remote: remote: remote: Firing Post receive hook remote: remote: Branch is ABRANCHNAME -- not creating Trigger file since this is not _int branch remote: error: Trying to write ref refs/tags/ABRANCHNAME!SN-BL-20130605_100513_04363

Re: git-daemon: needs /root/.config/git/config?

2013-06-05 Thread Jeff King
On Wed, Jun 05, 2013 at 01:19:18PM +0200, Ian Kumlien wrote: Older versions of git silently ignored errors reading config files, but it was tightened in v1.8.1.1, as there can be quite serious implications to failing to read expected config (e.g., imagine transfer.fsckobjects, or

Re: deletion of branch seems to modify tag as well?

2013-06-05 Thread Jeff King
On Wed, Jun 05, 2013 at 03:26:18PM +, Lyons, Roy wrote: $ git push origin :ABRANCHNAME remote: Firing Pre - receive hook remote: remote: remote: Firing Post receive hook remote: remote: Branch is ABRANCHNAME -- not creating Trigger file since this is not _int branch remote: error:

Re: [PATCH] git-remote-mediawiki: use Git.pm functions for credentials

2013-06-05 Thread Jeff King
On Wed, Jun 05, 2013 at 12:58:00PM +0200, benoit.per...@ensimag.fr wrote: From: Benoit Person benoit.per...@ensimag.fr In 52dce6d, a new credential function was added to Git.pm, based on git-remote-mediawiki's functions. The logical follow-up is to use those functions in

Re: deletion of branch seems to modify tag as well?

2013-06-05 Thread Lyons, Roy
Excellent response. I had not even considered that the hook for creating these tags would be in the mix. I withdraw my bug report happily :) Thanks, Roy Lyons On 6/5/13 10:51 AM, Jeff King p...@peff.net wrote: On Wed, Jun 05, 2013 at 03:26:18PM +, Lyons, Roy wrote: $ git push

Re: git rev-parse --show-toplevel doesn't work inside git-dir

2013-06-05 Thread Jeff King
On Wed, Jun 05, 2013 at 10:34:11AM +0300, Orgad Shaneh wrote: Running git rev-parse --show-toplevel doesn't print anything when it is run inside .git dir (on all levels) This is by design. --show-toplevel does not print anything when you do not have a working tree, and you do not have one if

Git server, chroot, git gc --auto and uname: not found

2013-06-05 Thread Matthieu Moy
Hi, I'm having issues with a Git hosting in a chroot (based on fusion forge). The problem is that receive-pack triggers a git gc --auto, which itself triggers a git repack, which is a shell-script. The shell script needs basic commands [1], which are not available within the chroot. Is there a

[PATCH v4 0/7] git send-email suppress-cc=self fixes

2013-06-05 Thread Michael S. Tsirkin
This includes bugfixes related to handling of --suppress-cc=self flag. Tests are also included. Changes from v3: - v3 submission was missing one patch (1/7). Re-add it. Changes from v2: - add a new test, split patches differently add code comments to address

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-05 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: On Tue, Jun 4, 2013 at 1:30 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: You didn't answer, what happens when you run --skip-empty and --allow-empty? I'll answer to a slightly different

Re: [PATCH] gitweb: fix problem causing erroneous project list

2013-06-05 Thread Junio C Hamano
Charles McGarvey chazmcgar...@brokenzipper.com writes: The bug is manifest when running gitweb in a persistent process (e.g. FastCGI, PSGI), and it's easy to reproduce. If a gitweb request includes the searchtext parameter (i.e. s), subsequent requests using the project_list action--which is

Re: [PATCH 05/11] tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)

2013-06-05 Thread Johannes Sixt
Am 04.06.2013 23:06, schrieb Junio C Hamano: Johannes Sixt j...@kdbg.org writes: There are many instances where the treatment of symbolic links in the object model and the algorithms are tested, but where it is not necessary to actually have a symbolic link in the worktree. Make adjustments

Re: [PATCH 05/11] tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)

2013-06-05 Thread Johannes Sixt
Am 04.06.2013 23:55, schrieb Junio C Hamano: Johannes Sixt j...@kdbg.org writes: diff --git a/t/t3000-ls-files-others.sh b/t/t3000-ls-files-others.sh index 88be904..563ac7f 100755 --- a/t/t3000-ls-files-others.sh +++ b/t/t3000-ls-files-others.sh @@ -19,12 +19,7 @@ filesystem.

[PATCH 1/4] clear parsed flag when we free tree buffers

2013-06-05 Thread Jeff King
Many code paths will free a tree object's buffer and set it to NULL after finishing with it in order to keep memory usage down during a traversal. However, out of 8 sites that do this, only one actually unsets the parsed flag back. Those sites that don't are setting a trap for later users of the

[PATCH 4/4] archive: ignore blob objects when checking reachability

2013-06-05 Thread Jeff King
We cannot create an archive from a blob object, so we would not expect anyone to provide one to us. And if they do, we will fail anyway just after the reachability check. We can therefore optimize our reachability check to ignore blobs completely, and not even create a struct blob for them.

[PATCH 3/4] list-objects: optimize revs-blob_objects = 0 case

2013-06-05 Thread Jeff King
If we are traversing trees during a --objects traversal, we may skip blobs if the blob_objects field of rev_info is not set. But we do so as the first thing in process_blob(), only after we have actually created the struct blob object, incurring a hash lookup. We can optimize out this no-op call

[PATCH 2/4] upload-archive: restrict remote objects with reachability check

2013-06-05 Thread Jeff King
When serving a remote request, git-upload-archive tries to restrict access to unreachable objects, which matches the behavior of upload-pack. However, we did so by restricting the requested tree to ref[:path], because it is fast. That covers the common cases, but does not allow requesting items by

Re: [PATCH 08/15] for-each-ref: get --pretty using format_commit_message

2013-06-05 Thread Duy Nguyen
On Thu, Jun 6, 2013 at 12:09 AM, Junio C Hamano gits...@pobox.com wrote: Duy Nguyen pclo...@gmail.com writes: On Wed, Jun 5, 2013 at 4:12 AM, Eric Sunshine sunsh...@sunshineco.com wrote: +Caveats: + +1. Many of the placeholders in PRETTY FORMATS are designed to work + specifically on

[PATCH] l10n: de.po: Fix a typo

2013-06-05 Thread Ralf Thielow
From: Wieland Hoffmann themi...@gmail.com Signed-off-by: Wieland Hoffmann themi...@gmail.com --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 4901488..cd6919f 100644 --- a/po/de.po +++ b/po/de.po @@ -885,7 +885,7 @@ msgstr[1] Ihr Zweig

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-05 Thread Felipe Contreras
On Wed, Jun 5, 2013 at 1:13 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Tue, Jun 4, 2013 at 1:30 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: You didn't answer, what happens when you run