git mailing list

FromSubjectsort iconDate
Nicolas Pitre
builtin git-shortlog still broken
On the Linux kernel repository, doing "git shortlog v2.6.18.." works fine. "git shortlog v2.6.17.." works fine. "git shortlog v2.6.16.." also works fine. But "git shortlog v2.6.15.." dies with a segmentation fault. Trying "git log v2.6.15.. | git shortlog" also produces the same crash while "git log v2.6.16.. | git shortlog" works fine. The old perl version doesn't have any such issue with those test cases, not even with the whole kernel history. Nicolas -
Dec 8, 11:23 pm 2006
Jeff King
[PATCH] shortlog: fix segfault on empty authorname
The old code looked backwards from the email address to parse the name, allowing an arbitrary number of spaces between the two. However, in the case of no name, we looked back too far to the 'author' (or 'Author:') header. Instead, remove at most one space between name and address. The bug was triggered by commit febf7ea4bed from linux-2.6. Signed-off-by: Jeff King <peff@peff.net> --- builtin-shortlog.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin-...
Dec 9, 12:04 am 2006
Linus Torvalds
Re: kernel.org mirroring (Re: [GIT PULL] MMC update)
Ok, this doesn't do the locking either, so on cache misses or expiry, you're still going to be that thundering herd. Also, if you want to be nice to clients, I'd seriously suggest that when you hit in the cache, but it's expired (or it's close to expired), you still serve the cached data back, but you set up a thread in the background (with some maximum number of active threads, of course!) that refreshes the cached entry and then you extend the expiration time so that you won't end up ...
Dec 8, 8:45 pm 2006
H. Peter Anvin
Re: kernel.org mirroring (Re: [GIT PULL] MMC update)
Yup, DNS does this, and it's a Very Good Thing. -hpa -
Dec 8, 8:47 pm 2006
Jakub Narebski
Re: git-commit: select which files to commit while editing t...
Perhaps git-commit should also accept --exclude=<pattern> option? Would that help? -- Jakub Narebski Warsaw, Poland ShadeHawk on #git -
Dec 8, 8:07 pm 2006
Seth Falcon
Re: git-commit: select which files to commit while editing t...
I don't think I understand what an --exclude=<pattern> option would do, but I'm pretty sure it doesn't help the use case I'm thinking of: Editing away, you've made changes in 8 files. Reviewing diff, you want to commit 6 of those and continue working on the other two. It seems that there could be a less manual way than git update-index f1 f2 ... f6 Hmm, maybe I could do: git diff --name-only > changed ## edit changed cat changed|xargs git update-inde...
Dec 8, 8:37 pm 2006
Junio C Hamano
Re: git-commit: select which files to commit while editing t...
Note that output of cat piped to anything is almost always a bad programming ;-) Maybe the "git add --interactive" would give you a transcript like this: $ git add --interactive '*.c' '*.h' showing list of modified files... 1) bozbar.c 2) filfre.c 3) frotz.h 4) nitfol.c 5) rezrov.h 6) xyzzy.c 7) yomin.h 8) z.c choice> 2 3 5 6 7 showing list of modified files... 1) bozbar.c 2* filfre.c 3* frotz.h 4) nitfol.c 5* rezrov.h 6* xyzzy.c 7...
Dec 8, 8:59 pm 2006
Jakub Narebski
Re: Collection of stgit issues and wishes
Here are some issues which are a bit annoying for me: - make "stg help" (without command name) equivalent to "stg --help" - stg new lacks --sign option (I have to remember to do this during "stg refresh"). Stacked GIT 0.11 git version 1.4.4.1 Python version 2.4.3 (#1, Jun 13 2006, 16:41:18) [GCC 4.0.2 20051125 (Red Hat 4.0.2-8)] -- Jakub Narebski Warsaw, Poland ShadeHawk on #git -
Dec 8, 6:27 pm 2006
Yann Dirson
Collection of stgit issues and wishes
Here is the remaining of my queue of stgit issues and ideas noted in the last months. A number of items in the "wishlist" section is really here to spawn discussion. Maybe some of them should end up in the TODO list. bugs: - "show" still shows previous patch, after pushing resulted in empty patch (after solving conflict, when "refresh" then has nothing to do) - "stg import" leaves empty patch on the stack after failed patch application - "push --undo" should restore series order - "import --s...
Dec 8, 6:17 pm 2006
Jakub Narebski
Re: [RFC] Light-weight checkouts via ".gitlink"
A few (very few) comments: If I remember correctly, while git ignores .git, it does not ignore by default (i.e. without entry in either GIT_DIR/info/excludes, or .gitignore) the directory which has .git directory in it. And that should not change for .gitlink. You can always add Why use once "key = value", once "key: value" form? Better to stick with one. I Would prefer "key = value" one. GIT_DIR = path to base git repository it is equivalent to setting the following: GIT_INDEX_FILE = p...
Dec 8, 6:18 pm 2006
Josef Weidendorfer
Re: [RFC] Light-weight checkouts via ".gitlink"
I know. But this is essential. We _have_ to ignore all the files and subdirectories in the directory which contains the .gitlink file, as these files/subdirectories belong to the submodule. There is no other way. You could try to use a special name for the whole directory with the light-weight checkout, e.g. ".checkout". But then, this is useless for submodules, as for submodules, we want to be able to specify the root directory name of the submodule, as that That is not possible: .gitignore...
Dec 8, 6:54 pm 2006
Josef Weidendorfer
Re: [RFC] Light-weight checkouts via ".gitlink"
Forgot to mention in the proposal: If you recursively have light-weight checkouts inside each other, the real "name" (for .git/external/<name/ and for further submodule configuration e.g. in .git/modules of the base repository) should of course be the concatenation of the names in the .gitlink is crazy. Do you want to scan all of your home directory everytime this lookup is needed? So "..." really only makes sense in front of the relative path, but there, you also can leave it out. Josef ...
Dec 8, 7:25 pm 2006
Jakub Narebski
Re: [RFC] Light-weight checkouts via ".gitlink"
Why concatenation? I thought the name would be ID of submodule, and should be just somehow unique. And if concatenation, pehaps some forbidden character inserted between No. I meant /home/user/.../linux to mean searching for /home/user/linux /home/linux /linux but I don't think it is useful. As to relative path matching in any parent directory... well, that differs only in direction (up instead of down) in matching filename in .gitignore when path does not contain / (well, actually it...
Dec 8, 7:53 pm 2006
Josef Weidendorfer
Re: [RFC] Light-weight checkouts via ".gitlink"
Yes, you are right. Nesting of submodules really is an important issue. The .gitlink file allows us to put the submodule GITDIR somewhere in the supermodul's GITDIR. The idea is that you can clone the submodule GITDIR if you want. With submodule "inner" nesting inside of submodule "outer", the GITDIR of "outer" should have the GITDIR of inner inside to allow for cloning "outer" together with its submodule "inner". So it is not enough to have a submodule "outer" and a submodule "outer/inner" in...
Dec 8, 9:46 pm 2006
Jakub Narebski Dec 8, 7:24 pm 2006
Josef Weidendorfer
Re: [RFC] Light-weight checkouts via ".gitlink"
Yes. This whole .gitlink thing more or less is about trying to avoid as far as possible any path configuration in the supermodule which would have to be changed when the user moves or even deletes the submodule. Exactly for the latter, we want the GITDIR for submodules Actually, I am fine with allowing them in .gitlink. This makes Ooops, yes. I am not actually sure what's the best name here: "external", "submodule", ... ? I thought the the SVN name also fits for the submodule case. The submodul...
Dec 8, 7:40 pm 2006
Josef Weidendorfer
[RFC] Light-weight checkouts via ".gitlink"
Hi, when I recently thought about submodule support, I had the idea that it is easier to get it by going in small, incremental steps, introducing usefull subfeatures on their on while on it. The following is one outcome of this, a proposal for light-weight checkouts of git branches, without the need to have to full repository in a .git subdirectory, but the just have a file .gitlink is simple as possible, which manages the link to the real repository. Of course, this feature is tailored to s...
Dec 8, 5:52 pm 2006
Jakub Narebski Dec 8, 5:48 pm 2006
Jakub Narebski
Re: [PATCH] rerere: record (or avoid misrecording) resolved,...
Eric Wong wrote: Just one comment: > +
Dec 8, 5:44 pm 2006
Eric Wong Dec 8, 5:50 pm 2006
Arkadiusz Miskiewicz
reexporting git repository via git-daemon
Hi, I have weird problem wit git (1.4.4.2). git --bare clone git://git.kernel.org/pub/scm/git/git.git fetches everything correctly; $ cd /tmp $ git clone /gitroot/home/gitrepo/git remote: Generating pack... remote: Done counting 33527 objects. remote: Deltifying 33527 objects. remote: 100% (33527/33527) done Indexing 33527 objects. remote: Total 33527, written 33527 (delta 23162), reused 33527 (delta 23162) 100% (33527/33527) done Resolving 23162 deltas. 100% (23162/23162) done Ch...
Dec 8, 5:12 pm 2006
Luben Tuikov
Problem compiling: that perl thing again
Over the last 2 months each time I pull, check out next and compile, I'm seeing _some_ kind of problem with compiling the perl section of git. Sometimes git-reset --hard, or a fresh checkout, or git-clean resolve the situation. But not this time. Here is what I see now: $ make ... make -C perl PERL_PATH='/usr/bin/perl' prefix='/home/luben' all make[1]: Entering directory `/home/luben/projects/git-next/perl' Makefile out-of-date with respect to Makefile.PL /usr/lib64/perl5/5.8.6/x86_64-linux-th...
Dec 8, 4:36 pm 2006
Junio C Hamano
Re: Problem compiling: that perl thing again
This particular breakage cannot be "last two months", but there was a recent breakage by commit f848718a last week on the 'master' branch. --- Now, I am CLUELESS about what MakeMaker does, but would this help? --- diff --git a/perl/Makefile b/perl/Makefile index bd483b0..099beda 100644 --- a/perl/Makefile +++ b/perl/Makefile @@ -29,7 +29,7 @@ $(makfile): ../GIT-CFLAGS Makefile echo ' echo $(instdir_SQ)' >> $@ else $(makfile): Makefile.PL ../GIT-CFLAGS - '$(PERL_PATH_SQ)' $&...
Dec 8, 4:49 pm 2006
Luben Tuikov
Re: Problem compiling: that perl thing again
Yes, this helps. Please commit. Thanks, Luben -
Dec 8, 5:26 pm 2006
Jakub Narebski
Re: git-commit: select which files to commit while editing t...
I was to raise the same objection. But this can be solved by using magic _only_ if the template with exception of "modified:" lines matches, and if there is at least one file in "modified:" section. -- Jakub Narebski Warsaw, Poland ShadeHawk on #git -
Dec 8, 3:32 pm 2006
Luben Tuikov
Re: git-commit: select which files to commit while editing t...
I raise the same objection as Junio. This is how perforce does it*, and while it is useful, git is NOT perforce, and I agree with Junio and Jakub. If you want to commit only few files, update the index for only the ones you want to commit. If you did update the index for all of them, "git-read-tree -m -i HEAD" is your friend. Luben * The reason being is that there is no "index-cache" and the commit message needs to be scanned to determine which of the edited files you actually intend...
Dec 8, 4:45 pm 2006
Josef Weidendorfer
Re: git-commit: select which files to commit while editing t...
However, the idea itself is not bad. AFAIK, cogito does it this way. It could be done as separate command, e.g. "git add --interactive", and would only update the index. Josef -
Dec 8, 6:10 pm 2006
Seth Falcon
Re: git-commit: select which files to commit while editing t...
I think such a feature could be quite useful and it would seem to be an easy thing to provide in an optional or configurable fashion so that those that don't like it could avoid it. Spelling out a bunch of files spread around your tree for update-index can be annoying. Some way of marking a list seems natural. Maybe that is a separate issue. + seth -
Dec 8, 7:59 pm 2006
Junio C Hamano
Re: Documentation/git-commit.txt
Well, that's why the description says 'the changes to the tracked files' above to make it clear. An obvious alternative is not to talk about staging in terms of `git add` and `git rm` but instead mention `git update-index` in that part of the documentation, but I think that is going backwards. I think the conclusion of recent discussions is not to paper over the differences from new people (nor making git closer to other systems by castrating git), but make things easier to learn for them. My a...
Dec 8, 3:31 pm 2006
Nicolas Pitre
Re: Documentation/git-commit.txt
... making the UI even more consistent. Nicolas -
Dec 8, 3:45 pm 2006
Seth Falcon
Trouble with git-svn when upstream svn URL changed
Hi, One of the repositories I have been tracking with git-svn was reorganized and the path that I have been tracking is now in a new location. I was hoping that the following would work: git clone orig new cd new git svn rebuild $NEW_URL I also tried git svn rebuild --remote $NEW_URL This have some output that looked reasonable (svn rev nums and git sha1's). But git svn fetch does nothing and I don't seem to have any of the new content. Am I using this incorrectly? ...
Dec 8, 1:43 pm 2006
Eric Wong
Re: Trouble with git-svn when upstream svn URL changed
This is incorrect, rebuild is not designed to handle new urls. However, You can look at "Advanced Example: Tracking a Reorganized Repository" in the manpage. Ignore the text about --follow-parent since you already have the old stuff fetched, and start following the instructions beginning with "# And now, we continue tracking the new revisions:" If that fails (I don't think it would); you can always link branches together using grafts (git-svn graft-branches tries to automate this; but it's im...
Dec 8, 2:11 pm 2006
Seth Falcon
Re: Trouble with git-svn when upstream svn URL changed
ok, I was lead astray by this part of the doc for rebuild: A Subversion URL may be optionally specified at the command-line if the directory/repository you're tracking has Oh, sorry I didn't find that example. This worked perfectly, thanks! One question: My fingers are in the habit of typing remotes/git-svn. Can I do: cd .git/svn rm -r git-svn mv git-newsvn git-svn Or is there a safer way to rename? Or are there other config-file ways to make this work -- to ...
Dec 8, 2:34 pm 2006
Eric Wong
Re: Trouble with git-svn when upstream svn URL changed
Hmm.. it seems that rebuild will work as intended iff you didn't clone (and therefore still have .git/svn/git-svn/.rev_db intact). Otherwise, it will rebuild the .rev_db file and ignore your specified URL. Perhaps running rebuild twice (specifying the URL on a second clone) after a clone would work. I honestly haven't used or looked at rebuild in a You need to mv refs/remotes/git-newsvn refs/remotes/git-svn, too. Then it should be safe. -- Eric Wong -
Dec 8, 3:13 pm 2006
Jakub Narebski Dec 8, 1:44 pm 2006
Han-Wen Nienhuys Dec 8, 2:14 pm 2006
Han-Wen Nienhuys
[PATCH] Allow building GIT in a different directory from the...
From 105d331aee95c0cf3610ac0d2fd4aa7688bd5211 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys <hanwen@xs4all.nl> Date: Fri, 8 Dec 2006 18:07:56 +0100 GIT can now be built in a separate builddirectory. This is done as follows: mkdir build cd build $my_git_dir/configure make In this case, configure creates an empty directory tree based on the source directory, and wraps Makefiles from source directory in the build directory. The rest of the functionality is delivered with the...
Dec 8, 1:15 pm 2006
Alex Riesen
Re: [PATCH] Allow building GIT in a different directory from...
Hurts my eyes :) $src_prefix = defined($ENV{PERL_SRCDIR}) ? "$ENV{PERL_SRCDIR}/": ''; could be shorter, unless you want (you do) strict syntax check. -
Dec 8, 9:16 pm 2006
Han-Wen Nienhuys
[PATCH] Add support for building documentation in separate b...
From 6969e092758f65e8b4b3875ab3050cd0c049cc60 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys <hanwen@xs4all.nl> Date: Fri, 8 Dec 2006 18:09:23 +0100 Signed-off-by: Han-Wen Nienhuys <hanwen@xs4all.nl> --- Documentation/Makefile | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index c00f5f6..51cd707 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -1,6 +1,6...
Dec 8, 1:16 pm 2006
Han-Wen Nienhuys
[PATCH] Install git-sh-setup.sh into $(prefix)/share/git-cor...
git-sh-setup isn't a 'normal' binary, in that it should be called by bash only and not run in a subshell. Therefore, it should not be installed in a executable directory, but rather in $prefix/share/git-core/ From 4cefe86667d01ecc912c1f9d8b78c831c33792a1 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys <hanwen@xs4all.nl> Date: Wed, 6 Dec 2006 13:27:16 +0100 Subject: Signed-off-by: Han-Wen Nienhuys <hanwen@xs4all.nl> --- Makefile | 10 ++++++++-- git-am.sh ...
Dec 8, 1:13 pm 2006
Eric Wong
Re: [PATCH] Install git-sh-setup.sh into $(prefix)/share/git...
This seems to break existing hooks, or at least old repositories can be stuck using an old version of git-sh-setup in those hooks. You could to add GIT_datadir to PATH before invoking hooks for existing You shoudl probably change these, too: templates/hooks--pre-applypatch:. git-sh-setup templates/hooks--applypatch-msg:. git-sh-setup -- Eric Wong -
Dec 8, 3:37 pm 2006
Junio C Hamano
Re: [PATCH] Install git-sh-setup.sh into $(prefix)/share/git...
Honestly speaking, I do not think this patch is worth it. People who care deeply enough should just use gitexecdir that is separate from bindir. -
Dec 8, 4:45 pm 2006
Nguyen Thai Ngoc Duy
Re: [PATCH] Install git-sh-setup.sh into $(prefix)/share/git...
Executables should not go to $prefix/share I think. Maybe $prefix/libexec? BTW, I think you touched a larger issue: plumbling/porcelain separation. -- Duy -
Dec 8, 3:11 pm 2006
Han-Wen Nienhuys Dec 8, 4:50 pm 2006
Han-Wen Nienhuys
doc bug?
Hi, while messing with GIT's build system, I got ** asciidoc -b docbook -d manpage -f ../Documentation/asciidoc.conf ../Documentation/git-tools.txt ERROR: git-tools.txt: line 2: malformed manpage title ERROR: git-tools.txt: line 6: first section must be named NAME ERROR: git-tools.txt: line 9: malformed NAME section body FAILED: /home/lilydev/vc/git/Documentation/git-tools.txt: line 9: unexpected error: ------------------------------------------------------------ Traceback (most recent call l...
Dec 8, 1:07 pm 2006
Jakub Narebski
Re: What's in git.git (stable)
What happened to "[ANNOUNCE] GIT 1.4.4.2" thread? -- Jakub Narebski Warsaw, Poland ShadeHawk on #git -
Dec 8, 11:36 am 2006
Pazu
git-commit: select which files to commit while editing the c...
Junio's reworking of the git-commit documentation, and the ensuing discussion about what is commited, and how do you select that, made me remember how much I liked SVK -- particularly, how much I liked to remove files from the commit message template, and have them removed from the commit. At first, I thought "great opportunity to contribute my first patch to git", until I realized that git-commit is written in bash, and my brain refuses to understand that. Yep, I'm that bad. So I'm writing this, an...
Dec 8, 8:36 am 2006
Junio C Hamano
Re: git-commit: select which files to commit while editing t...
Personally, I would refuse to use such a modified git, because often the first thing I would do in the commit log buffer is check the listed files and remove the '# ...' lines while typing. I do not want that to affect the set of changes I staged in any way. But maybe that is just me. -
Dec 8, 3:18 pm 2006
Jakub Narebski Dec 8, 8:07 am 2006
Jakub Narebski
Re: git pull and merging.
The change of semantic would prohibit the "pull without tracking branch" semantic (probably not used anymore, since git supports multiple heads from long time). I proposed in another thread to allow to either specify full refspec (in addition to current specifying remote branch), or ':' and local branch. Or perhaps add branch.*.localmerge configuration option? -- Jakub Narebski Warsaw, Poland ShadeHawk on #git -
Dec 8, 7:48 am 2006
previous daytodaynext day
December 7, 2006December 8, 2006December 9, 2006