Re: [PATCH] transport-helper: check when helpers fail

2012-10-22 Thread Johannes Sixt
Am 10/21/2012 21:19, schrieb Felipe Contreras: diff --git a/run-command.c b/run-command.c index 1101ef7..2852e9d 100644 --- a/run-command.c +++ b/run-command.c @@ -559,6 +559,23 @@ int run_command(struct child_process *cmd) return finish_command(cmd); } +int check_command(struct

Re: [PATCH v3 0/8] Fix GIT_CEILING_DIRECTORIES that contain symlinks

2012-10-22 Thread Michael Haggerty
On 10/21/2012 08:51 AM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: This patch series has the side effect that all of the directories listed in GIT_CEILING_DIRECTORIES are accessed *unconditionally* to resolve any symlinks that are present in their paths. It is

Re: [PATCH] transport-helper: check when helpers fail

2012-10-22 Thread Felipe Contreras
On Mon, Oct 22, 2012 at 8:35 AM, Johannes Sixt j.s...@viscovery.net wrote: Am 10/21/2012 21:19, schrieb Felipe Contreras: I would expect the function to be usable in this way: start_command(proc); loop { if (check_command(proc))

diff support for the Eiffel language?

2012-10-22 Thread Ulrich Windl
Hi! After a longer pause, I did some programming in Eiffel again, and while doing so, why not use Git? It works! However there's one little thing I noticed with git diff: The conte4xt lines (staring with @@) show the current function (in Perl and C), but they show the current feature clause in

[PATCH] git-send-email: use compose-encoding for Subject

2012-10-22 Thread Krzysztof Mazur
The commit git-send-email: introduce compose-encoding introduced the compose-encoding option to specify the introduction email encoding (--compose option), but the email Subject encoding was still hardcoded to UTF-8. Signed-off-by: Krzysztof Mazur krzys...@podlesie.net --- Patch against

Re: diff support for the Eiffel language?

2012-10-22 Thread Ævar Arnfjörð Bjarmason
On Mon, Oct 22, 2012 at 1:58 PM, Ulrich Windl ulrich.wi...@rz.uni-regensburg.de wrote: However there's one little thing I noticed with git diff: The conte4xt lines (staring with @@) show the current function (in Perl and C), but they show the current feature clause in Eiffel (as opposed to the

Re: [PATCH] grep: remove tautological check

2012-10-22 Thread Peter Krefting
David Soria Parra: - if (p-field 0 || GREP_HEADER_FIELD_MAX = p-field) + if (GREP_HEADER_FIELD_MAX = p-field) A friend taught me this trick, which will check that it isn't negative for compilers that have the enumeration be signed (notably MSVC), while not

Re: diff support for the Eiffel language?

2012-10-22 Thread Johannes Sixt
Am 10/22/2012 15:06, schrieb Ævar Arnfjörð Bjarmason: On Mon, Oct 22, 2012 at 1:58 PM, Ulrich Windl ulrich.wi...@rz.uni-regensburg.de wrote: However there's one little thing I noticed with git diff: The conte4xt lines (staring with @@) show the current function (in Perl and C), but they show

Git submodule for a local branch?

2012-10-22 Thread W. Trevor King
I have a bunch of branches in my repo (a, b, c, …), and I'd like to check them out into subdirectories of another branch (index). My initial inclination was to use something like $ git checkout index $ git branch a b c * index $ git submodule add -b a --reference ./ ./

signing commits with openssl/PKCS#11

2012-10-22 Thread Mat Arge
Hy! I would like to sign each commit with a X.509 certificate and a private key stored on a PKCS#11 token. I assume that that should be possible somehow using a hook which calls openssl. Does somebody know a working implementation of this? cheers Mat -- To unsubscribe from this list: send the

merge --no-commit not able to report stats more verbosely?

2012-10-22 Thread Scott R. Godin
As you can see from the below, I can't seem to get it to give me more verbose results of what's being merged (as in the actual merge below) with --stat or -v .. is it supposed to do that? (develop)$ git merge --no-commit --stat -v widget_twitter Automatic merge went well; stopped before

Re: [PATCH] transport-helper: check when helpers fail

2012-10-22 Thread Johannes Sixt
Am 10/22/2012 13:50, schrieb Felipe Contreras: On Mon, Oct 22, 2012 at 8:35 AM, Johannes Sixt j.s...@viscovery.net wrote: Another thought: In your use-case, isn't it so that it would be an error that the process exited for whatever reason? I.e., even if it exited with code 0 (success), it

Re: make test

2012-10-22 Thread Joachim Schmitz
Joachim Schmitz j...@schmitz-digital.de schrieb im Newsbeitrag news:k5gov5$fe1$1...@ger.gmane.org... Hi folks I'm trying to understand why certain tests in 'make test' fail. Here's the first one $ ../git --version git version 1.8.0.rc2.5.g6b89306 $ GIT_TEST_CMP_USE_COPIED_CONTEXT=true

[PATCH] fix 'make test' for HP NonStop

2012-10-22 Thread Joachim Schmitz
This fixes the vast majority of test failures on HP NonStop. Signed-off-by: Joachim Schmitz j...@schmitz-digital.de --- A few more still insist on /usr/local/bin being 1st in PATH and having done that we're down to one single failing test, t0301 #12 helper (cache --timeout=1) times out Makefile

Re: [PATCH] transport-helper: check when helpers fail

2012-10-22 Thread Felipe Contreras
On Mon, Oct 22, 2012 at 3:46 PM, Johannes Sixt j.s...@viscovery.net wrote: Am 10/22/2012 13:50, schrieb Felipe Contreras: On Mon, Oct 22, 2012 at 8:35 AM, Johannes Sixt j.s...@viscovery.net wrote: Another thought: In your use-case, isn't it so that it would be an error that the process exited

Re: Subtree in Git

2012-10-22 Thread dag
Herman van Rink r...@initfour.nl writes: On 10/21/2012 08:32 AM, Junio C Hamano wrote: Herman van Rink r...@initfour.nl writes: Junio, Could you please consider merging the single commit from my subtree-updates branch? https://github.com/helmo/git/tree/subtree-updates In general, in areas

Re: Subtree in Git

2012-10-22 Thread dag
Junio C Hamano gits...@pobox.com writes: I haven't formed an opinion on the particular change as to how bad its collapsing unrelated changes into a single change is. Maybe they are not as unrelated and form a coherent whole. Maybe not. It is difficult for me to tell which is one of the red

git daemon test fails

2012-10-22 Thread Joachim Schmitz
Here's one test failing (on HP NonStop, git-1.8.0), which needs to get enable first. /home/jojo/git/git/t $ PATH=/usr/local/bin:$PATH GIT_TEST_GIT_DAEMON=true bash ./t5570-git-daemon.sh ok 1 - setup repository ok 2 - create git-accessible bare repository ok 3 - clone git repository [946798748]

Re: Subtree in Git

2012-10-22 Thread dag
Herman van Rink r...@initfour.nl writes: The problem is that I don't have the time to split all these out. Dag has indicated that he does not have the time either. I would have the time to review and integrate separate patches. I do not have time to unwrap the ball of wax and ensure the

Re: [PATCH] transport-helper: check when helpers fail

2012-10-22 Thread Felipe Contreras
On Mon, Oct 22, 2012 at 4:31 PM, Felipe Contreras felipe.contre...@gmail.com wrote: - import-begin - feature X - feature Y - import refs/heads/master - exported stuff - import refs/heads/devel - exported stuff - import-end - done This would certainly makes things easier for

[PATCH] git-submodule add: Record branch name in .gitmodules

2012-10-22 Thread W. Trevor King
From: W. Trevor King wk...@tremily.us This removes a configuration step if you're trying to setup Ævar's $ git submodule foreach 'git checkout $(git config --file $toplevel/.gitmodules submodule.$name.branch) git pull' workflow from commit f030c96d8643fa0a1a9b2bd9c2f36a77721fb61f

Re: [PATCH] transport-helper: check when helpers fail

2012-10-22 Thread Felipe Contreras
On Mon, Oct 22, 2012 at 7:12 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Mon, Oct 22, 2012 at 4:31 PM, Felipe Contreras I've tried everything, and yet a SIGPIPE is detected only with remote-testgit, not with my code, and they both exit the same way, and at the same time, and

Re: [PATCH v3 6/8] longest_ancestor_length(): require prefix list entries to be normalized

2012-10-22 Thread Johannes Sixt
Am 21.10.2012 07:57, schrieb Michael Haggerty: Move the responsibility for normalizing the prefixes passed to longest_ancestor_length() to its caller. In t0060, only test longest_ancestor_lengths using normalized paths: remove empty entries and non-absolute paths, strip trailing slashes from

[PATCH] remote-testgit: properly check for errors

2012-10-22 Thread Felipe Contreras
'feature done' was missing, which allowed fast-import exit properly, and transport-helper to continue checking for refs and what not when in fact the remote-helper died. Let's enable that, and make sure the error paths are triggered. Now transport-helper correctly detects the errors from

Re: [PATCH] remote-testgit: properly check for errors

2012-10-22 Thread Sverre Rabbelier
On Mon, Oct 22, 2012 at 1:56 PM, Felipe Contreras felipe.contre...@gmail.com wrote: diff --git a/git-remote-testgit.py b/git-remote-testgit.py index 5f3ebd2..b8707e6 100644 --- a/git-remote-testgit.py +++ b/git-remote-testgit.py @@ -159,6 +159,11 @@ def do_import(repo, args): ref =

Re: The config include mechanism doesn't allow for overwriting

2012-10-22 Thread Jeff King
On Mon, Oct 22, 2012 at 05:55:00PM +0200, Ævar Arnfjörð Bjarmason wrote: I was hoping to write something like this: [user] name = Luser email = some-defa...@example.com [include] path = ~/.gitconfig.d/user-email Where that file would contain:

tag storage format

2012-10-22 Thread Uri Moszkowicz
I'm doing some testing on a large Git repository and am finding local clones to take a very long time. After some investigation I've determined that the problem is due to a very large number of tags (~38k). Even with hard links, it just takes a really long time to visit that many inodes. As it

Re: tag storage format

2012-10-22 Thread Andreas Schwab
Uri Moszkowicz u...@4refs.com writes: Perhaps Git should switch to a single-file block text or binary format once a large number of tags becomes present in a repository. This is what git pack-refs (called by git gc) does (by putting the refs in .git/packed-refs). Andreas. -- Andreas Schwab,

[PATCH 1/2] git-pull: Avoid merge-base on detached head

2012-10-22 Thread Phil Hord
git pull --rebase does some clever tricks to find the base for $upstream , but it forgets that we may not have any branch at all. When this happens, git merge-base reports its usage help in the middle of an otherwise successful rebase operation, because git-merge is called with one too few

[PATCH] git-status: show short sequencer state

2012-10-22 Thread Phil Hord
Recently git-status learned to display the state of the git sequencer in long form to help the user remember an interrupted command. This information is also useful in short form to humans and scripts, but no option is available to boil it down. Teach git-status to report the sequencer state in

Re: [PATCH] remote-testgit: properly check for errors

2012-10-22 Thread Felipe Contreras
On Mon, Oct 22, 2012 at 11:01 PM, Sverre Rabbelier srabbel...@gmail.com wrote: On Mon, Oct 22, 2012 at 1:56 PM, Felipe Contreras felipe.contre...@gmail.com wrote: diff --git a/git-remote-testgit.py b/git-remote-testgit.py index 5f3ebd2..b8707e6 100644 --- a/git-remote-testgit.py +++

[PATCH] Move try_merge_command and checkout_fast_forward to libgit.a

2012-10-22 Thread Nguyễn Thái Ngọc Duy
These functions are called in sequencer.c, which is part of libgit.a. This makes libgit.a potentially require builtin/merge.c for external git commands. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- I made some unrelated changes in sequencer.c and this problem shown up.

Re: Links broken in ref docs.

2012-10-22 Thread Scott Chacon
So, this is due to the major AWS outage today. git-scm.com is hosted on Heroku and thus on AWS. Heroku is continuing to bring up their database systems in the wake of the massive AWS outage. Once that is back online, git-scm.com will also be back online. As for the git-fetch issue, we'll look

[BUG] (git commit --patch --message $MESSAGE) disallows hunk editing

2012-10-22 Thread Max Nanasy
Tested against v1.7.12.4 Steps to reproduce: A. cd $DIRTY_WORKING_COPY B. git commit --patch --message $MESSAGE C. Stage this hunk? e Expected behavior: After step C, the hunk opens in the user's editor Actual behavior: After step C, the hunk is selected