-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I've noticed it, and I hate it too. But don't know enough about asciidoc or the git documentation process to know how to go about fixing it, so I'm adding the git list on this mail for advice. - -- Don't work too hard, make some time for fun as well! Eric Blake ebb9@byu.net volunteer cygwin git packager -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (Cygwin) Comment: Public key at home.comcast.net/~ericblake/eblake.gpg Com...

Read BOTH OF the error messages. Especially the first one. This error message is telling you that the dst side of the refspec you supplied (that's the second 'master' in "master:master") does not exist there, and we do not create it unless you give a full refname that begins with refs/ (so that push can tell if you want to create a tag or a branch). $ git push /pub/git/foo.git master:refs/heads/master would have worked, without --force. -

This is actually read more as: 1) Expand "master" to "refs/heads/master" 2) Expand "refs/heads/master" to "refs/heads/master:refs/heads/master" We first try to expand the local name to an "absolute" local name, then if the remote name is missing default it to the same as the (now expanded) local name. So "push origin master" is not read as How about: git config alias.incoming 'log ..FETCH_HEAD' ? Or do we need --reverse in there too to simulate "hg incoming"? The thing is, FETCH_H...

Great. I'll go looking for that. And if I don't find what I'm thinking of there, I'll see if I can't cook up something else myself. Thanks again, -Carl

Hi, I am running a Linux From Scratch 6.2 system that does not have cpio installed on it. This means that I can't clone a local repository unless I install cpio. Is it possible to use a fallback method if cpio is not present, as there is no NO_CPIO option on make like there is for OpenSSH, cURL and expat? Also, I have an external USB hardrive that is mounted onto the virtual filesystem. Will clones from the USB harddrive (or a USB flash drive that is mounted) result in a copy being performed, no...

I think that may be good enough as workaround, but I do not think you would get the space saving from hardlinks that way. -

Basically a "blue sky" question about full-text indexing git repositories. A while back, whilst talking about overall git structure (see http://marc.info/?l=git&m=118891945402778&w=2 ), Jon Smirl raised the question of putting a full-text index on a repository. I doubt I full text index is of much use on a code repository because the question tends to be focussed around either released versions or immediate git-blame stuff. However, for repositories of things like evolving documents/pr...

When the server reply carrying JSON data to the client browser to render has a string that looks like a decimal number, it doesn't get quoted. The client-side Javascript code assumes, however, that all the ref names are strings, and so calls string functions on decimal number objects if the ref name is purely numeric (e.g. "2.5"). This patch simply forces the objects that are escaped for HTML presentation to be coerced into strings, which catches this case (and possibly others). --- by-commit.html ...

Thomas, good day. And how is your Apache configuration looks like? I used to make 2.2.4 work flawlessly with git. Perhaps I will get it a shot with the 2.2.6. -- Eygene -

Hi, You might be interested in writing a merge driver. See Documentation/gitattributes.txt. Hth, Dscho -

Several projects prefers to receive patches via a given email address. In these cases it's handy to configure that address once. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> --- Documentation/git-send-email.txt | 3 +++ git-send-email.perl | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 3727776..e38b702 100644 --- a/Documentation/git-send-email.txt +++ b/Documentatio...

Hi, I've been using git-browser hooked up to gitweb for several weeks now (git 1.5.2.1), and it's going great. However, I've hit my first bug: it seems that certain branch head names cause the whole diagram (and log lines, etc.) to fail to render, only displaying the "Starting from: all <repo>.git heads" stuff down the bottom. As to the various names I've tested: okay: master, 2.5j, 2.5-dev, a.b, 2-5, 2.b, b.2, 2.5.0 fails: 2.5, 2.6 I've experimented by just using 'git branch -m <old...

Great, thanks for the pointer. My first real foray into Javascript has been successful -- a patch will soon follow. Dave. -

I'm wondering if there's a pattern for re-using setups across several tests, similar to how a setUp function is used in xUnit. The problem is I need the setup to actually be re-run, for each test to start from a clean slate, so using the following doesn't work as the setup is just run before the first test. test_expect_success setup ' # setup repostory to a particular state ' test_expect_success test1 ' # some test that expects the state to be as defined in setup, and changes state of r...

In this case the first test rebases the branch created in setup (it's testing the rebase merge strategy), the second test should do the same thing, except check there is a warning if a --message option is passed. I suppose I could find the old pre-rebase head and work with that, but that doesn't seem that clean to me. Here's the code (non-working): #!/bin/sh test_description='merge-rebase backend test' . ./test-lib.sh test_expect_success setup ' echo hello >a && ...

That'll be because my git knowledge isn't good enough to make it clean. Thanks for the suggestion :-) -Tom -

This option is handled globally. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> --- builtin-shortlog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/builtin-shortlog.c b/builtin-shortlog.c index 3fe7546..518f27f 100644 --- a/builtin-shortlog.c +++ b/builtin-shortlog.c @@ -264,7 +264,7 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix) wrap_lines = 1; parse_wrap_args(argv[1], &in1, &in2, &wrap); } - else if (!strcmp(...

Hello When I want to look at the history of a particular file ex: gitk path/to/my/file I see only the commits corresponding to that file and this is ok. But sometimes I just want to see the modifications done on this file. So i would like to see only the relevant part of the commit. Is it possible to do with gitk ? Thanks Frederic -

Hi, Unless you have push access, no. And this is very much by design. For example, when somebody mistakenly pushed a secret (like what lines in the kernel infringe on M$ patents, if any) it should be possible to rebase (in a hurry), force a push, and have the safe feeling that nobody can fetch the secret any longer. Ciao, Dscho -

I've thought about this issue a bit more. Letting git_connect() die on error unconditionally is poison for any libification efforts. So here's a plan: 1. Let git_connect() return a struct child_process even for the non-forking case. This way a return value of NULL can uniquely identify a failure. 2. Keep the error checks in the callers (adjust to test for NULL). 3. Change the die() calls to return failure. 4. Note that the int fd[2] parameter to git_connect() is really an o...

Sure: The die()s are converted in a later step. My problem is that if I don't wrap the non-fork connections somehow in this first round, I *must* remove the error checks because there is no unique Did you mean: "even if we don't have a child process"? Seriously? Add an *out* parameter when we can get rid of one and have a return value, too? -- Hannes -

I think coroutine is commonly used as the name for _synchronous_ context switches aka message passing. Basically the same as subroutine calls, except that the called subroutine has its own dynamic context (instruction pointer, call stack, control flow) that gets activated and suspended. If there is parallelism implied, "thread" is the more appropriate name. -- David Kastrup -

Sounds like a good idea. Test? :-) -- Karl Hasselström, kha@treskal.com www.treskal.com/kalle -

But not too easy either because "rebase --interactive" is based on "git merge" and not "git am". You can just use a two step process instead and first "rebase --interactive" followed by "rebase --signoff". Steffen -

Track each branch with a separate git-svn remote. Sam. -