My work is available in the git repository at: git://repo.or.cz/git-stats.git master Please use a subtree merge to put this in contrib/gitstats. David Symonds (2): Insert the git_stats path to the start of os.sys.path, not 1 element in. Fix some spelling mistakes. Sverre Rabbelier (237): Created a script to setup a repo to test metrics on. Converted the setupRepo script to python to allow creating the same repo. Added the use cases in text form. Added ...

They are there because the work was done incrementally, having them as seperate commits shows when the changelog was modified. Having a description for a change to the changelog is pretty senseless, since it would be the same text as what is in the diff. That said, sure, I can squash those commits no problem. -- Cheers, Sverre Rabbelier --

Sure, I'm fine with rewriting all commit messages to have a "gitstats:" prefix. -- Cheers, Sverre Rabbelier --

A few months ago I produced a set of patches to allow git to work even in the presence of pack corruption given that the corrupted objects have a good duplicate in the object store. Turns out that this work was rather incomplete and covered only a limited set of cases. This series extend coverage to all cases I could think about, and make repack-objects able to create a good pack in such conditions to "fix" the corruption without having to perform a full repack. Yes, this is all about the small ...

In one case, it was possible to have a bad offset equal to 0 effectively pointing a delta onto itself and crashing git after too many recursions. In the other cases, a negative offset could result due to off_t being signed. Catch those. Signed-off-by: Nicolas Pitre <nico@cam.org> --- builtin-pack-objects.c | 4 ++-- builtin-unpack-objects.c | 2 ++ index-pack.c | 2 +- sha1_file.c | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --gi...

In the same spirit as commit 8eca0b47ff, let's try to survive a pack corruption by making packed_object_info() able to fall back to alternate packs or loose objects. Signed-off-by: Nicolas Pitre <nico@cam.org> --- sha1_file.c | 36 ++++++++++++++++++++++++++++++------ 1 files changed, 30 insertions(+), 6 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 7698177..384a430 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1314,8 +1314,10 @@ unsigned long get_size_from_delta(struct ...

It currently calls die() whenever given offset is not found thinking that such thing should never happen. But this offset may come from a corrupted pack whych _could_ happen and not be found. Callers should deal with this possibility gracefully instead. Signed-off-by: Nicolas Pitre <nico@cam.org> --- builtin-pack-objects.c | 2 ++ pack-revindex.c | 3 ++- sha1_file.c | 18 ++++++++++++------ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/built...

Signed-off-by: Nicolas Pitre <nico@cam.org> --- t/t5303-pack-corruption-resilience.sh | 96 ++++++++++++++++++++++++++++++--- 1 files changed, 89 insertions(+), 7 deletions(-) diff --git a/t/t5303-pack-corruption-resilience.sh b/t/t5303-pack-corruption-resilience.sh index 31b20b2..ac181ea 100755 --- a/t/t5303-pack-corruption-resilience.sh +++ b/t/t5303-pack-corruption-resilience.sh @@ -41,11 +41,17 @@ create_new_pack() { git verify-pack -v ${pack}.pack } +do_repack() { + p...

No, we aren't hosted in any repository yet. The pom file exists to make it easier for people who prefer maven to build, but its not the Use a Transport instance to execute a default fetch (no args) on say the "remote" origin. That will download the objects to the local database, but it won't update a working directory. But I'm not sure Yea, about that, we wanted to write more tutorials on the API... ;-) -- Shawn. --

Well, the new changes are what "git log 131dcf5..078d43f" outputs. -- Shawn. --

I looked a little bit at how bad tree lookup speed would be for notes. My test implementation was a notes tree made like this: blob=`echo this is a note | git hash-object -w --stdin` export GIT_INDEX_FILE=.git/notes # attach the note to every commit; # note that this uses a less-efficient ascii encoding git rev-list HEAD | while read commit; do echo -e "100644 blob $blob\t$commit" done | git update-index --index-info tree=`git write-tree` commit=`echo notes | git commit-tree $tree` ...

Make the description of pushing tags easier to read, but move the shorthand notation towards the end of the description. This gives a better flow. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> --- Documentation/git-push.txt | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 9788d49..52035db 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -38,7 +38,7 @@ OPTIO...

Most of the git push page talks about branches, so make it consistent also in this paragraph. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> --- Documentation/git-push.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 52035db..4e339c7 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -53,8 +53,8 @@ Pushing an empty <src> allows you to delete the <dst&g...

I have skimmed the git-push manpage many times over a period of several months, without fully understanding it. Today I sat down and figured it out. It took some experiments and a little reading of the source. Here I offer some updates to the refspec documentation, so that others can hopefully learn it faster than I did. As I expect some changes to be more controversial than others, I have split it up in several small parts. Feel free to squash. There is a risk that I have changed some things ...

I actually think that <src> defaulting to HEAD would be reasonable, but it is probably less reasonable to change the meaning at this point. Anders --

This is copied from pull-fetch-param.txt and helps the reader to not get stuck in the URL section. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> --- Documentation/git-push.txt | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index df99c0b..02c7dae 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -28,7 +28,9 @@ OPTIONS ------- <repository>:: The "remote" r...

One irregularity hear is that there is no way to explicitly say what you want to compare against the index (the staging area). Diff compares two things to each other, and a more regular and general way to express what it does would be something like git diff STAGE WORKTREE (like "git diff" today) git diff HEAD WORKTREE (like "git diff HEAD" today) git diff WORKTREE HEAD (like "git diff -R HEAD" today) git diff HEAD STAGE (like "git diff --cached" today) git dif...

I think this is Yet Another docbook or asciidoc issue. The resulting XML from asciidoc is: <literallayout> 
.ft C
 ... the actual example contents ... 
.ft
 </literallayout> which kind of seems wrong to me, since it implies that that is part of the literal layout, and would be subject to quoting. It gets rendered into git-log.1 as: \&.ft C ... the actual examples contents \&.ft so the problem is the extra \&. But ...

I had a similar problem after upgrading on Ubuntu and came up with a patch to optionally disable some of asciidoc.conf (commit 7f55cf451c9e7). Try putting DOCBOOK_XSL_172=Yes in your config.mak. -- Jonas Fonseca --

Hi all, I'd like to announce the new v0.2.0 release of gitbuilder, an auto-bisecting autobuilder tool for git-based projects. The new version incorporates several suggestions from end users, including: - a new bar at the top shows the most recent builds and their status - the RSS link is now more obvious - non-fatal warnings now turn your build yellow instead of green - we now count and report warnings, errors, and test failures separately - a new changelog script can email recent changes ...

Hmm. I wonder if it would make it more sense to make the "official" name --staged, and leave --cached forever as a synonym. If the goal is giving sane names to end users, then we should probably advertise the sane ones. OTOH, maybe it is better to start slow, let people who are doing I had to investigate this hunk closely, as it really looks at first glance (from the function name, and the fact that there are two hunks, one here and one for cmd_diff) that this is impacting diff-index --cache...

Hi, Yes, I would like that, too. However, note that we have to hash out what to do about the convention that --cached traditionally means that only the staging area (formerly known as "the index") is affected, while --index means that the command touches the working directory, too. Ciao, Dscho --

We have had a few "crossed stream" problems when developers are working on a local branch and they do an unguarded git push/pull, when they really intended to do git push/pull origin branchname. We use git in a way that makes it desirable for us to only push/pull to the same remote branch. So, if I'm in branch X, I want 'git push' to push to origin/X, and 'git pull' to fetch into origin/X and then merge into X from origin/X. In other words, we want git push/pull to behave in branches other than ...

Ah, problem solved then. I'll just have everyone upgrade to the latest git. Thanks very much, Santi. Bill --

The test "validate file modification time" was broken on admittedly broken combination of Windows, Cygwin, and ActiveState Perl. Something (I blame ActiveState) of the three is very confused about what time zone to use for the modification time. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> --- I could not find what exactly does the ActiveState's Perl use for its stat implementation (and honestly, have no motivation to look harder). It seems to honor TZ, but the produced time does not se...