gitweb.git
git-fetch: Fix single_force in append_fetch_headSanti Béjar Sun, 18 Mar 2007 23:16:23 +0000 (00:16 +0100)

git-fetch: Fix single_force in append_fetch_head

This fixes the single force (+) when fetched with fetch_per_ref.

Also use $LF as separator because IFS is $LF.

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge git://git2.kernel.org/pub/scm/gitk/gitkJunio C Hamano Tue, 20 Mar 2007 06:47:22 +0000 (23:47 -0700)

Merge git://git2.kernel.org/pub/scm/gitk/gitk

* git://git2.kernel.org/pub/scm/gitk/gitk:
[PATCH] gitk: bind <F5> key to Update (reread commits)

make git clone -q suppress the noise with http fetchChris Wright Tue, 20 Mar 2007 02:18:18 +0000 (19:18 -0700)

make git clone -q suppress the noise with http fetch

We already have -q in git clone. So for those who care to suppress
the noise during an http based clone, make -q actually do a quiet
http fetch.

Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Cc: Fernando Herrera <fherrera@onirica.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix loose object uncompression check.Linus Torvalds Tue, 20 Mar 2007 05:49:53 +0000 (22:49 -0700)

Fix loose object uncompression check.

The thing is, if the output buffer is empty, we should *still* actually
use the zlib routines to *unpack* that empty output buffer.

But we had a test that said "only unpack if we still expect more output".

So we wouldn't use up all the zlib stream, because we felt that we didn't
need it, because we already had all the bytes we wanted. And it was
"true": we did have all the output data. We just needed to also eat all
the input data!

We've had this bug before - thinking that we don't need to inflate()
anything because we already had it all..

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

contrib/continuous: a continuous integration build... Shawn O. Pearce Tue, 20 Mar 2007 04:33:41 +0000 (00:33 -0400)

contrib/continuous: a continuous integration build manager

This is a simple but powerful continuous integration build system
for Git. It works by receiving push events from repositories
through the post-receive hook, aggregates them on a per-branch
basis into a first-come-first-serve build queue, and lets a
background build daemon perform builds one at a time.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Provide some technical documentation for shallow clonesJohannes Schindelin Tue, 20 Mar 2007 02:41:11 +0000 (03:41 +0100)

Provide some technical documentation for shallow clones

There has not been any work on the shallow stuff lately, so it is hard
to find out what it does, and how. This document describes the ideas
as well as the current problems, and can serve as a starting point for
shallow people.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Add a HOWTO for setting up a standalone git daemonJohannes Schindelin Tue, 20 Mar 2007 02:29:56 +0000 (03:29 +0100)

Add a HOWTO for setting up a standalone git daemon

Setting up a git-daemon came up the other day on IRC, and it is slightly
non trivial for the uninitiated.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

xdiff/xutils.c(xdl_hash_record): factor out whitespace... Johannes Schindelin Tue, 20 Mar 2007 03:05:10 +0000 (04:05 +0100)

xdiff/xutils.c(xdl_hash_record): factor out whitespace handling

Since in at least one use case, xdl_hash_record() takes over 15% of the
CPU time, it makes sense to even micro-optimize it. For many cases, no
whitespace special handling is needed, and in these cases we should not
even bother to check for whitespace in _every_ iteration of the loop.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

blame: micro-optimize cmp_suspect()Junio C Hamano Tue, 20 Mar 2007 05:17:10 +0000 (22:17 -0700)

blame: micro-optimize cmp_suspect()

The commit structures are guaranteed their uniqueness by the object
layer, so we can check their address and see if they are the same
without going down to the object sha1 level.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Replace remaining instances of strdup with xstrdup.James Bowes Mon, 19 Mar 2007 21:42:40 +0000 (17:42 -0400)

Replace remaining instances of strdup with xstrdup.

Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

use a LRU eviction policy for the delta base cacheNicolas Pitre Mon, 19 Mar 2007 20:31:04 +0000 (16:31 -0400)

use a LRU eviction policy for the delta base cache

This provides a smoother degradation in performance when the cache
gets trashed due to the delta_base_cache_limit being reached. Limited
testing with really small delta_base_cache_limit values appears to confirm
this.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

clean up the delta base cache size a bitNicolas Pitre Mon, 19 Mar 2007 20:28:51 +0000 (16:28 -0400)

clean up the delta base cache size a bit

Currently there are 3 different ways to deal with the cache size.
Let's stick to only one. The compiler is smart enough to produce the exact
same code in those cases anyway.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

GIT 1.5.1-rc1 v1.5.1-rc1Junio C Hamano Mon, 19 Mar 2007 09:28:29 +0000 (02:28 -0700)

GIT 1.5.1-rc1

I think we can start to slow down, as we now have covered
everything I listed earlier in the short-term release plan.

The last release 1.5.0 took painfully too long.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix merge-indexJunio C Hamano Mon, 19 Mar 2007 09:48:37 +0000 (02:48 -0700)

Fix merge-index

An earlier conversion to run_command() from execlp() forgot that
run_command() takes an array that is terminated with NULL.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Set up for better tree diff optimizationsLinus Torvalds Sun, 18 Mar 2007 22:18:30 +0000 (15:18 -0700)

Set up for better tree diff optimizations

This is mainly just a cleanup patch, and sets up for later changes where
the tree-diff.c "interesting()" function can return more than just a
yes/no value.

In particular, it should be quite possible to say "no subsequent entries
in this tree can possibly be interesting any more", and thus allow the
callers to short-circuit the tree entirely.

In fact, changing the callers to do so is trivial, and is really all this
patch really does, because changing "interesting()" itself to say that
nothing further is going to be interesting is definitely more complicated,
considering that we may have arbitrary pathspecs.

But in cleaning up the callers, this actually fixes a potential small
performance issue in diff_tree(): if the second tree has a lot of
uninterestign crud in it, we would keep on doing the "is it interesting?"
check on the first tree for each uninteresting entry in the second one.

The answer is obviously not going to change, so that was just not helping.
The new code is clearer and simpler and avoids this issue entirely.

I also renamed "interesting()" to "tree_entry_interesting()", because I
got frustrated by the fact that

- we actually had *another* function called "interesting()" in another
file, and I couldn't tell from the profiles which one was the one that
mattered more.

- when rewriting it to return a ternary value, you can't just do

if (interesting(...))
...

any more, but want to assign the return value to a local variable. The
name of choice for that variable would normally be "interesting", so
I just wanted to make the function name be more specific, and avoid
that whole issue (even though I then didn't choose that name for either
of the users, just to avoid confusion in the patch itself ;)

In other words, this doesn't really change anything, but I think it's a
good thing to do, and if somebody comes along and writes the logic for
"yeah, none of the pathspecs you have are interesting", we now support
that trivially.

It could easily be a meaningful optimization for things like "blame",
where there's just one pathspec, and stopping when you've seen it would
allow you to avoid about 50% of the tree traversals on average.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Trivial cleanup of track_tree_refs()Linus Torvalds Sun, 18 Mar 2007 20:38:19 +0000 (13:38 -0700)

Trivial cleanup of track_tree_refs()

This makes "track_tree_refs()" use the same "tree_entry()" function for
counting the entries as it does for actually traversing them a few lines
later.

Not a biggie, but the reason I care was that this was the only user of
"update_tree_entry()" that didn't actually *extract* the tree entry first.
It doesn't matter as things stand now, but it meant that a separate
test-patch I had that avoided a few more "strlen()" calls by just saving
the entry length in the entry descriptor and using it directly when
updating wouldn't work without this patch.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git.el: Add support for commit hooks.Alexandre Julliard Sat, 17 Mar 2007 19:40:12 +0000 (20:40 +0100)

git.el: Add support for commit hooks.

Run the pre-commit and post-commit hooks at appropriate places, and
display their output if any.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'jb/gc'Junio C Hamano Mon, 19 Mar 2007 05:46:30 +0000 (22:46 -0700)

Merge branch 'jb/gc'

* jb/gc:
Make gc a builtin.

Merge branch 'fl/cvsserver'Junio C Hamano Mon, 19 Mar 2007 05:44:25 +0000 (22:44 -0700)

Merge branch 'fl/cvsserver'

* fl/cvsserver:
cvsserver: further improve messages on commit and status
cvsserver: Be more chatty

Limit the size of the new delta_base_cacheShawn O. Pearce Mon, 19 Mar 2007 05:14:37 +0000 (01:14 -0400)

Limit the size of the new delta_base_cache

The new configuration variable core.deltaBaseCacheLimit allows the
user to control how much memory they are willing to give to Git for
caching base objects of deltas. This is not normally meant to be
a user tweakable knob; the "out of the box" settings are meant to
be suitable for almost all workloads.

We default to 16 MiB under the assumption that the cache is not
meant to consume all of the user's available memory, and that the
cache's main purpose was to cache trees, for faster path limiters
during revision traversal. Since trees tend to be relatively small
objects, this relatively small limit should still allow a large
number of objects.

On the other hand we don't want the cache to start storing 200
different versions of a 200 MiB blob, as this could easily blow
the entire address space of a 32 bit process.

We evict OBJ_BLOB from the cache first (credit goes to Junio) as
we want to favor OBJ_TREE within the cache. These are the objects
that have the highest inflate() startup penalty, as they tend to
be small and thus don't have that much of a chance to ammortize
that penalty over the entire data.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'sp/run-command'Junio C Hamano Mon, 19 Mar 2007 05:21:06 +0000 (22:21 -0700)

Merge branch 'sp/run-command'

* sp/run-command:
Use run_command within send-pack
Use run_command within receive-pack to invoke index-pack
Use run_command within merge-index
Use run_command for proxy connections
Use RUN_GIT_CMD to run push backends
Correct new compiler warnings in builtin-revert
Replace fork_with_pipe in bundle with run_command
Teach run-command to redirect stdout to /dev/null
Teach run-command about stdout redirection

Make git-send-email aware of Cc: lines.J. Bruce Fields Mon, 19 Mar 2007 01:37:53 +0000 (21:37 -0400)

Make git-send-email aware of Cc: lines.

In the Linux kernel, for example, it's common to include Cc: lines
for cases when you want to remember to cc someone on a patch without
necessarily claiming they signed off on it. Make git-send-email
aware of these.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>

mergetool: print an appropriate warning if merge.tool... Theodore Ts'o Mon, 19 Mar 2007 02:30:10 +0000 (22:30 -0400)

mergetool: print an appropriate warning if merge.tool is unknown

Also add support for vimdiff

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

mergetool: Add support for vimdiff.James Bowes Mon, 19 Mar 2007 02:11:54 +0000 (22:11 -0400)

mergetool: Add support for vimdiff.

Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Update main git.html page to point at 1.5.0.5 documentationJunio C Hamano Sun, 18 Mar 2007 22:58:07 +0000 (15:58 -0700)

Update main git.html page to point at 1.5.0.5 documentation

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'ar/diff'Junio C Hamano Sun, 18 Mar 2007 22:48:06 +0000 (15:48 -0700)

Merge branch 'ar/diff'

* ar/diff:
Add tests for --quiet option of diff programs
try-to-simplify-commit: use diff-tree --quiet machinery.
revision.c: explain what tree_difference does
Teach --quiet to diff backends.
diff --quiet
Remove unused diffcore_std_no_resolve
Allow git-diff exit with codes similar to diff(1)

Avoid unnecessary strlen() callsLinus Torvalds Sun, 18 Mar 2007 03:06:24 +0000 (20:06 -0700)

Avoid unnecessary strlen() calls

This is a micro-optimization that grew out of the mailing list discussion
about "strlen()" showing up in profiles.

We used to pass regular C strings around to the low-level tree walking
routines, and while this worked fine, it meant that we needed to call
strlen() on strings that the caller always actually knew the size of
anyway.

So pass the length of the string down wih the string, and avoid
unnecessary calls to strlen(). Also, when extracting a pathname from a
tree entry, use "tree_entry_len()" instead of strlen(), since the length
of the pathname is directly calculable from the decoded tree entry itself
without having to actually do another strlen().

This shaves off another ~5-10% from some loads that are very tree
intensive (notably doing commit filtering by a pathspec).

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>"
Signed-off-by: Junio C Hamano <junkio@cox.net>

Reuse cached data out of delta base cache.Nicolas Pitre Sun, 18 Mar 2007 01:13:57 +0000 (21:13 -0400)

Reuse cached data out of delta base cache.

A malloc() + memcpy() will always be faster than mmap() +
malloc() + inflate(). If the data is already there it is
certainly better to copy it straight away.

With this patch below I can do 'git log drivers/scsi/ >
/dev/null' about 7% faster. I bet it might be even more on
those platforms with bad mmap() support.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Implement a simple delta_base cacheLinus Torvalds Sat, 17 Mar 2007 19:44:06 +0000 (12:44 -0700)

Implement a simple delta_base cache

This trivial 256-entry delta_base cache improves performance for some
loads by a factor of 2.5 or so.

Instead of always re-generating the delta bases (possibly over and over
and over again), just cache the last few ones. They often can get re-used.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Make trivial wrapper functions around delta base genera... Linus Torvalds Sat, 17 Mar 2007 19:42:15 +0000 (12:42 -0700)

Make trivial wrapper functions around delta base generation and freeing

This doesn't change any code, it just creates a point for where we'd
actually do the caching of delta bases that have been generated.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge 1.5.0.5 in from 'maint'Junio C Hamano Sun, 18 Mar 2007 22:36:44 +0000 (15:36 -0700)

Merge 1.5.0.5 in from 'maint'

GIT 1.5.0.5 v1.5.0.5Junio C Hamano Sun, 18 Mar 2007 21:40:35 +0000 (14:40 -0700)

GIT 1.5.0.5

Signed-off-by: Junio C Hamano <junkio@cox.net>

Make gc a builtin.James Bowes Wed, 14 Mar 2007 01:58:22 +0000 (21:58 -0400)

Make gc a builtin.

Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'maint'Junio C Hamano Sat, 17 Mar 2007 07:33:17 +0000 (00:33 -0700)

Merge branch 'maint'

* maint:
git-merge: finish when git-read-tree fails

[PATCH] clean up pack index handling a bitNicolas Pitre Fri, 16 Mar 2007 20:42:50 +0000 (16:42 -0400)

[PATCH] clean up pack index handling a bit

Especially with the new index format to come, it is more appropriate
to encapsulate more into check_packed_git_idx() and assume less of the
index format in struct packed_git.

To that effect, the index_base is renamed to index_data with void * type
so it is not used directly but other pointers initialized with it. This
allows for a couple pointer cast removal, as well as providing a better
generic name to grep for when adding support for new index versions or
formats.

And index_data is declared const too while at it.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] add test for OFS_DELTA objectsNicolas Pitre Fri, 16 Mar 2007 17:50:18 +0000 (13:50 -0400)

[PATCH] add test for OFS_DELTA objects

Make sure pack-objects with --delta-base-offset works fine, and that
it actually produces smaller packs as expected.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] fix t5300-pack-object.shNicolas Pitre Fri, 16 Mar 2007 17:37:42 +0000 (13:37 -0400)

[PATCH] fix t5300-pack-object.sh

The 'use packed deltified objects' test was flawed as it failed to
remove the pack and index from the previous test, effectively preventing
the desired pack from being exercised as objects could be found in that
other pack instead.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] local-fetch.c: some error printing cleanupNicolas Pitre Fri, 16 Mar 2007 17:20:19 +0000 (13:20 -0400)

[PATCH] local-fetch.c: some error printing cleanup

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

applymbox: brown paper bag fix.Junio C Hamano Sat, 17 Mar 2007 04:22:05 +0000 (21:22 -0700)

applymbox: brown paper bag fix.

An earlier patch 87ab7992 broke applymbox by blindly copying piece
from git-am, causing a harmless but annoying series of error messages.

Signed-off-by: Junio C Hamano <junkio@cox.net>

git-merge: finish when git-read-tree failsSanti Béjar Fri, 16 Mar 2007 10:46:09 +0000 (11:46 +0100)

git-merge: finish when git-read-tree fails

The message formating (commit v1.5.0.3-28-gbe242d5) broke the && chain.

Noticed by Dmitry Torokhov.

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Add tests for --quiet option of diff programsAlex Riesen Wed, 14 Mar 2007 22:57:23 +0000 (23:57 +0100)

Add tests for --quiet option of diff programs

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>

use xstrdup pleaseShawn O. Pearce Fri, 16 Mar 2007 01:02:51 +0000 (21:02 -0400)

use xstrdup please

We generally prefer xstrdup to just plain strdup.
Make it so.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-fetch, git-branch: Support local --track via a... Paolo Bonzini Thu, 15 Mar 2007 08:23:20 +0000 (09:23 +0100)

git-fetch, git-branch: Support local --track via a special remote '.'

This patch adds support for a dummy remote '.' to avoid having
to declare a fake remote like

[remote "local"]
url = .
fetch = refs/heads/*:refs/heads/*

Such a builtin remote simplifies the operation of "git-fetch",
which will populate FETCH_HEAD but will not pretend that two
repositories are in use, will not create a thin pack, and will
not perform any useless remapping of names. The speed
improvement is around 20%, and it should improve more if
"git-fetch" is converted to a builtin.

To this end, git-parse-remote is grown with a new kind of
remote, 'builtin'. In git-fetch.sh, we treat the builtin remote
specially in that it needs no pack/store operations. In fact,
doing git-fetch on a builtin remote will simply populate
FETCH_HEAD appropriately.

The patch also improves of the --track/--no-track support,
extending it so that branch.<name>.remote items referring '.'
can be created. Finally, it fixes a typo in git-checkout.sh.

Signed-off-by: Paolo Bonzini <bonzini@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

try-to-simplify-commit: use diff-tree --quiet machinery.Junio C Hamano Wed, 14 Mar 2007 20:18:15 +0000 (13:18 -0700)

try-to-simplify-commit: use diff-tree --quiet machinery.

This uses diff-tree --quiet machinery to terminate the internal
diff-tree between a commit and its parents via revs.pruning (not
revs.diffopt) as soon as we find enough about the tree change.

With respect to the optionally given pathspec, we are interested
if the tree of commit is identical to the parent's, only adds
new paths to the parent's, or there are other differences. As
soon as we find out that there is one such other kind of
difference, we do not have to compare the rest of the tree.

Because we do not call standard diff_addremove/diff_change, we
instruct the diff-tree machinery to stop early by setting
has_changes when we say we found the trees to be different.

Signed-off-by: Junio C Hamano <junkio@cox.net>

revision.c: explain what tree_difference doesJunio C Hamano Wed, 14 Mar 2007 20:12:18 +0000 (13:12 -0700)

revision.c: explain what tree_difference does

This explains how tree_difference variable is used, and updates two
places where the code knows symbolic constant REV_TREE_SAME is 0.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Teach --quiet to diff backends.Junio C Hamano Wed, 14 Mar 2007 18:12:51 +0000 (11:12 -0700)

Teach --quiet to diff backends.

This teaches git-diff-files, git-diff-index and git-diff-tree
backends to exit early under --quiet option.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --quietJunio C Hamano Wed, 14 Mar 2007 18:12:13 +0000 (11:12 -0700)

diff --quiet

This adds the command line option 'quiet' to tell 'git diff-*'
that we are not interested in the actual diff contents but only
want to know if there is any change. This option automatically
turns --exit-code on, and turns off output formatting, as it
does not make much sense to show the first hit we happened to
have found.

The --quiet option is silently turned off (but --exit-code is
still in effect, so is silent output) if postprocessing filters
such as pickaxe and diff-filter are used. For all practical
purposes I do not think of a reason to want to use these filters
and not viewing the diff output.

The backends have not been taught about the option with this patch.
That is a topic for later rounds.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Remove unused diffcore_std_no_resolveJunio C Hamano Wed, 14 Mar 2007 17:36:42 +0000 (10:36 -0700)

Remove unused diffcore_std_no_resolve

This was only used by diff-tree-helper program, whose purpose
was to translate a raw diff to a patch.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Allow git-diff exit with codes similar to diff(1)Alex Riesen Wed, 14 Mar 2007 00:17:04 +0000 (01:17 +0100)

Allow git-diff exit with codes similar to diff(1)

This introduces a new command-line option: --exit-code. The diff
programs will return 1 for differences, return 0 for equality, and
something else for errors.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge GIT 1.5.0.4Junio C Hamano Wed, 14 Mar 2007 22:59:04 +0000 (15:59 -0700)

Merge GIT 1.5.0.4

GIT 1.5.0.4 v1.5.0.4Junio C Hamano Wed, 14 Mar 2007 22:56:49 +0000 (15:56 -0700)

GIT 1.5.0.4

Signed-off-by: Junio C Hamano <junkio@cox.net>

Clarify doc for git-config --unset-all.Yann Dirson Wed, 14 Mar 2007 21:08:41 +0000 (22:08 +0100)

Clarify doc for git-config --unset-all.

Previous formulation could make it appear as removing all lines
matching a regexp (at least, I was looking for such a flag, and
confused this flag for what I was looking for).

Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-checkout: fix "eval" used for merge labelling.Junio C Hamano Wed, 14 Mar 2007 16:48:13 +0000 (09:48 -0700)

git-checkout: fix "eval" used for merge labelling.

The symbolic notation of the fork point can contain whitespaces (e.g.
"git checkout -m 'HEAD@{9 hours ago}'"). Quote strings properly
when using eval to prepare GITHEAD_$new

Signed-off-by: Junio C Hamano <junkio@cox.net>

update-hook: fix incorrect use of git-describe and... Andy Parkins Wed, 14 Mar 2007 14:25:52 +0000 (14:25 +0000)

update-hook: fix incorrect use of git-describe and sed for finding previous tag

Previously git-describe would output lines of the form
v1.1.1-gf509d56
The update hook found the dash and stripped it off using
sed 's/-g.*//'
The remainder was then used as the previous tag name.

However, git-describe has changed format. The output is now of the form
v1.1.1-23-gf509d56
The above sed fragment doesn't strip the middle "-23", and so the
previous tag name used would be "v1.1.1-23". This is incorrect.

Since the hook script was written, git-describe now gained support for
"--abbrev=0", which it uses as a special flag to tell it not to output
anything other than the nearest tag name. This patch fixes the problem,
and prevents any future recurrence by using this new flag rather than
sed to find the previous tag.

Signed-off-by: Andy Parkins <andyparkins@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

cvsserver: further improve messages on commit and statusFrank Lichtenheld Tue, 13 Mar 2007 17:25:23 +0000 (18:25 +0100)

cvsserver: further improve messages on commit and status

commit: Also print the old revision similar to how cvs does it and
prepend a line stating the filename so that one can actually
understand what happened when commiting more than one file.

status: Fix the RCS filename displayed. The directory was
printed twice.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

cvsserver: Be more chattyFrank Lichtenheld Tue, 13 Mar 2007 17:25:22 +0000 (18:25 +0100)

cvsserver: Be more chatty

Submit some additional messages to the client on commit and update.
Inspired by the standard CVS server though a little more terse.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'jc/repack'Junio C Hamano Wed, 14 Mar 2007 09:08:48 +0000 (02:08 -0700)

Merge branch 'jc/repack'

* jc/repack:
prepare_packed_git(): sort packs by age and localness.

Merge branch 'jc/fetch'Junio C Hamano Wed, 14 Mar 2007 08:40:19 +0000 (01:40 -0700)

Merge branch 'jc/fetch'

* jc/fetch:
.gitignore: add git-fetch--tool
builtin-fetch--tool: fix reflog notes.
git-fetch: retire update-local-ref which is not used anymore.
builtin-fetch--tool: make sure not to overstep ls-remote-result buffer.
fetch--tool: fix uninitialized buffer when reading from stdin
builtin-fetch--tool: adjust to updated sha1_object_info().
git-fetch--tool takes flags before the subcommand.
Use stdin reflist passing in git-fetch.sh
Use stdin reflist passing in parse-remote
Allow fetch--tool to read from stdin
git-fetch: rewrite expand_ref_wildcard in C
git-fetch: rewrite another shell loop in C
git-fetch: move more code into C.
git-fetch--tool: start rewriting parts of git-fetch in C.
git-fetch: split fetch_main into fetch_dumb and fetch_native

Merge branch 'dz/mailinfo'Junio C Hamano Wed, 14 Mar 2007 08:39:19 +0000 (01:39 -0700)

Merge branch 'dz/mailinfo'

* dz/mailinfo:
Add a couple more test cases to the suite.
restrict the patch filtering
builtin-mailinfo.c infrastrcture changes

Merge branch 'jb/per-user-exclude'Junio C Hamano Wed, 14 Mar 2007 08:38:57 +0000 (01:38 -0700)

Merge branch 'jb/per-user-exclude'

* jb/per-user-exclude:
add: Support specifying an excludes file with a configuration variable

Merge branch 'maint'Junio C Hamano Wed, 14 Mar 2007 08:38:39 +0000 (01:38 -0700)

Merge branch 'maint'

* maint:
cvsserver: asciidoc formatting changes

Merge branch 'pb/branch-track'Junio C Hamano Wed, 14 Mar 2007 08:38:28 +0000 (01:38 -0700)

Merge branch 'pb/branch-track'

* pb/branch-track:
Fix broken create_branch() in builtin-branch.
git-branch, git-checkout: autosetup for remote branch tracking

git-grep: don't use sscanfJim Meyering Mon, 12 Mar 2007 12:11:29 +0000 (13:11 +0100)

git-grep: don't use sscanf

If you use scanf or sscanf to parse integers, your code probably
accepts bogus inputs. For example, builtin-grep (aka git-grep) uses
sscanf(scan, "%u", &num) to parse the integer argument to -A, -B, -C.
Currently, "-C 1,000" and "-C 4294967297" are both treated just like
"-C 1":

$ git-grep -h -C 4294967297 juggle
out and you may find it easier to switch back and forth if you
juggle multiple lines of development simultaneously. Of
course, you will pay the price of more disk usage to hold

The obvious fix is to use strtoul instead. But using a bare strtoul is
too messy, at least when done properly, so I've added a wrapper function.

The new function in the patch below belongs elsewhere if it would be
useful in replacing any of the four remaining uses of sscanf.

One final note: With this change, I get a slightly different
diagnostic depending on the context size:

$ ./git-grep -h -C 4294967296 juggle
fatal: 4294967296: invalid context length argument
[Exit 128]
$ ./git-grep -h -C 4294967295 juggle
grep: 4294967295: invalid context length argument

[Exit 1]

A common convention that makes it easy to identify the source
of a diagnostic is to include the program name before the first ":".
Whether that should be "git" or "git-grep" is another question.
Using "grep" or "fatal" is misleading.

Signed-off-by: Jim Meyering <jim@meyering.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Do not output "GEN " when generating perl.makJohannes Schindelin Sun, 11 Mar 2007 13:19:07 +0000 (14:19 +0100)

Do not output "GEN " when generating perl.mak

This fixes the same issue as 8bef6204, which became an issue again
after 31d0399c.

Besides, it is not really helpful to print just "GEN " (_without_
"perl.mak").

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

shortlog: prompt when reading from terminal by mistakeJunio C Hamano Thu, 8 Mar 2007 10:12:06 +0000 (02:12 -0800)

shortlog: prompt when reading from terminal by mistake

I was trying to see who have been active recently to find GSoC
mentor candidates by running:

$ git shortlog -s -n --since=4.months | head -n 20

After waiting for about 20 seconds, I started getting worried,
thinking that the recent revision traversal updates might have
had an unintended side effect.

Not so. "git shortlog" acts as a filter when no revs are given,
unlike "git log" which defaults to HEAD. It was reading from
its standard input.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Documentation: add git-mergetool to the command list.Junio C Hamano Wed, 14 Mar 2007 08:29:26 +0000 (01:29 -0700)

Documentation: add git-mergetool to the command list.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'master' of git://repo.or.cz/git/mergetoolJunio C Hamano Wed, 14 Mar 2007 08:13:39 +0000 (01:13 -0700)

Merge branch 'master' of git://repo.or.cz/git/mergetool

* 'master' of git://repo.or.cz/git/mergetool:
Add git-mergetool to run an appropriate merge conflict resolution program

git-svn: add -l/--local command to "git svn rebase"Eric Wong Tue, 13 Mar 2007 18:40:36 +0000 (11:40 -0700)

git-svn: add -l/--local command to "git svn rebase"

This avoids fetching new revisions remotely, and is usefuly
versus plain "git rebase" because the user does not have to
specify which remote head to rebase against.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

cvsserver: asciidoc formatting changesFrank Lichtenheld Tue, 13 Mar 2007 17:24:26 +0000 (18:24 +0100)

cvsserver: asciidoc formatting changes

Format some lists really as lists. Improves both html and man
output.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Add git-mergetool to run an appropriate merge conflict... Theodore Ts'o Tue, 6 Mar 2007 05:05:16 +0000 (00:05 -0500)

Add git-mergetool to run an appropriate merge conflict resolution program

The git-mergetool program can be used to automatically run an appropriate
merge resolution program to resolve merge conflicts. It will automatically
run one of kdiff3, tkdiff, meld, xxdiff, or emacs emerge programs.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Use run_command within send-packShawn O. Pearce Mon, 12 Mar 2007 23:00:29 +0000 (19:00 -0400)

Use run_command within send-pack

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Use run_command within receive-pack to invoke index... Shawn O. Pearce Mon, 12 Mar 2007 23:00:26 +0000 (19:00 -0400)

Use run_command within receive-pack to invoke index-pack

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Use run_command within merge-indexShawn O. Pearce Mon, 12 Mar 2007 23:00:21 +0000 (19:00 -0400)

Use run_command within merge-index

Maybe unnecessary as the merge-index utility may go away in the
future, but its currently here, its shorter to use run_command,
and probably will help the MinGW port out.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Use run_command for proxy connectionsShawn O. Pearce Mon, 12 Mar 2007 23:00:19 +0000 (19:00 -0400)

Use run_command for proxy connections

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Use RUN_GIT_CMD to run push backendsShawn O. Pearce Mon, 12 Mar 2007 23:00:15 +0000 (19:00 -0400)

Use RUN_GIT_CMD to run push backends

If we hand run_command RUN_GIT_CMD rather than 0 it will use
the execv_git_cmd path rather than execvp at the OS level.
This is typically the preferred way of running another Git
utility.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Correct new compiler warnings in builtin-revertShawn O. Pearce Mon, 12 Mar 2007 19:33:18 +0000 (15:33 -0400)

Correct new compiler warnings in builtin-revert

The new builtin-revert code introduces a few new compiler errors
when I'm building with my stricter set of checks enabled in CFLAGS.
These all just stem from trying to store a constant string into
a non-const char*. Simple fix, make the variables const char*.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Replace fork_with_pipe in bundle with run_commandShawn O. Pearce Mon, 12 Mar 2007 23:00:11 +0000 (19:00 -0400)

Replace fork_with_pipe in bundle with run_command

Now that the run_command family supports all of the redirection
modes needed by builtin-bundle, we can use those functions rather
than the underlying POSIX primitives. This should help to make the
bundle command slightly more portable to other systems, like Windows.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Teach run-command to redirect stdout to /dev/nullShawn O. Pearce Mon, 12 Mar 2007 18:37:55 +0000 (14:37 -0400)

Teach run-command to redirect stdout to /dev/null

Some run-command callers may wish to just discard any data that
is sent to stdout from the child. This is a lot like our existing
no_stdin support, we just open /dev/null and duplicate the descriptor
into position.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Teach run-command about stdout redirectionShawn O. Pearce Mon, 12 Mar 2007 18:37:45 +0000 (14:37 -0400)

Teach run-command about stdout redirection

Some potential callers of the run_command family of functions need
to control not only the stdin redirection of the child, but also
the stdout redirection of the child. This can now be setup much
like the already existing stdin redirection.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Add a couple more test cases to the suite.Don Zickus Mon, 12 Mar 2007 19:52:07 +0000 (15:52 -0400)

Add a couple more test cases to the suite.

They handle cases where there is no attached patch.

Signed-off-by: Don Zickus <dzickus@redhat.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

restrict the patch filteringDon Zickus Mon, 12 Mar 2007 19:52:06 +0000 (15:52 -0400)

restrict the patch filtering

I have come across many emails that use long strings of '-'s as separators
for ideas. This patch below limits the separator to only 3 '-', with the
intent that long string of '-'s will stay in the commit msg and not in the
patch file.

Signed-off-by: Don Zickus <dzickus@redhat.com>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

builtin-mailinfo.c infrastrcture changesDon Zickus Mon, 12 Mar 2007 19:52:04 +0000 (15:52 -0400)

builtin-mailinfo.c infrastrcture changes

I am working on a project that required parsing through regular
mboxes that didn't necessarily have patches embedded in them. I
started by creating my own modified copy of git-am and working
from there. Very quickly, I noticed git-mailinfo wasn't able to
handle a big chunk of my email.

After hacking up numerous solutions and running into more
limitations, I decided it was just easier to rewrite a big chunk
of it. The following patch has a bunch of fixes and features
that I needed in order for me do what I wanted.

Note: I'm didn't follow any email rfc papers but I don't think
any of the changes I did required much knowledge (besides the
boundary stuff).

List of major changes/fixes:
- can't create empty patch files fix
- empty patch files don't fail, this failure will come inside git-am
- multipart boundaries are now handled
- only output inbody headers if a patch exists otherwise assume those
headers are part of the reply and instead output the original headers
- decode and filter base64 patches correctly
- various other accidental fixes

I believe I didn't break any existing functionality or
compatibility (other than what I describe above, which is really
only the empty patch file).

I tested this through various mailing list archives and
everything seemed to parse correctly (a couple thousand emails).

[jc: squashed in another patch from Don's five patch series to
fix the test case, as this patch exposes the bug in the test.]

Signed-off-by: Don Zickus <dzickus@redhat.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano Tue, 13 Mar 2007 06:14:07 +0000 (23:14 -0700)

Merge branch 'master' of git://repo.or.cz/git-gui

* 'master' of git://repo.or.cz/git-gui:
git-gui: Support of "make -s" in: do not output anything of the build itself

Merge branch 'maint'Junio C Hamano Tue, 13 Mar 2007 06:13:01 +0000 (23:13 -0700)

Merge branch 'maint'

* maint:
Don't package the git-gui credits file anymore
git-gui: Allow 'git gui version' outside of a repository
git-gui: Revert "git-gui: Display all authors of git-gui."
git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."
git-gui: Allow committing empty merges

Merge branch 'master' of git://repo.or.cz/git/fastimportJunio C Hamano Tue, 13 Mar 2007 06:10:23 +0000 (23:10 -0700)

Merge branch 'master' of git://repo.or.cz/git/fastimport

* 'master' of git://repo.or.cz/git/fastimport:
Remove unnecessary casts from fast-import
New fast-import test case for valid tree sorting
fast-import: grow tree storage more aggressively

Merge branch 'maint' of git://repo.or.cz/git/fastimport... Junio C Hamano Tue, 13 Mar 2007 06:08:27 +0000 (23:08 -0700)

Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint

* 'maint' of git://repo.or.cz/git/fastimport:
fast-import: grow tree storage more aggressively

Fix t5510-fetch's use of sedShawn O. Pearce Mon, 12 Mar 2007 22:59:16 +0000 (18:59 -0400)

Fix t5510-fetch's use of sed

POSIX says sed may add a trailing LF if there isn't already
one there. We shouldn't rely on it not adding that LF, as
some systems (Mac OS X for example) will add it.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Simplify closing two fds at once in run-command.cShawn O. Pearce Mon, 12 Mar 2007 18:37:28 +0000 (14:37 -0400)

Simplify closing two fds at once in run-command.c

I started hacking on a change to add stdout redirection support to
the run_command family, but found I was using a lot of close calls
on two pipes in an array (such as for pipe). So I'm doing a tiny
bit of refactoring first to make the next set of changes clearer.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Remove unnecessary casts from fast-importShawn O. Pearce Mon, 12 Mar 2007 19:48:37 +0000 (15:48 -0400)

Remove unnecessary casts from fast-import

Jeff King pointed out that these casts are quite unnecessary, as
the compiler should be doing them anyway, and may cause problems
in the future if the size of the argument for to_atom were to ever
be increased.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Merge branch 'maint'Shawn O. Pearce Mon, 12 Mar 2007 19:04:46 +0000 (15:04 -0400)

Merge branch 'maint'

* maint:
fast-import: grow tree storage more aggressively

New fast-import test case for valid tree sortingJeff King Mon, 12 Mar 2007 18:58:50 +0000 (14:58 -0400)

New fast-import test case for valid tree sorting

The Git tree sorting convention is more complex than just the name,
it needs to include the mode too to make sure trees sort as though
their name ends with "/".

This is a simple test case that verifies fast-import keeps the tree
ordering correct after editing the same tree twice in a single
input stream. A recent proposed patch series (that has not yet
been applied) will cause this test to fail, due to a bug in the
way the series handles sorting within the trees.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

fast-import: grow tree storage more aggressivelyJeff King Sun, 11 Mar 2007 02:39:17 +0000 (21:39 -0500)

fast-import: grow tree storage more aggressively

When building up a tree for a commit, fast-import
dynamically allocates memory for the tree entries. When more
space is needed, the allocated memory is increased by a
constant amount. For very large trees, this means
re-allocating and memcpy()ing the memory O(n) times.

To compound this problem, releasing the previous tree
resource does not free the memory; it is kept in a pool
for future trees. This means that each of the O(n)
allocations will consume increasing amounts of memory,
giving O(n^2) memory consumption.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Don't package the git-gui credits file anymoreShawn O. Pearce Mon, 12 Mar 2007 17:40:31 +0000 (13:40 -0400)

Don't package the git-gui credits file anymore

Since git-gui 0.6.4 the credits file is no longer produced.
This file was removed from git-gui due to build issues that
a lot of users and Git developers have reported running into.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'maint' of git://repo.or.cz/git-gui into... Junio C Hamano Mon, 12 Mar 2007 18:43:22 +0000 (11:43 -0700)

Merge branch 'maint' of git://repo.or.cz/git-gui into maint

* 'maint' of git://repo.or.cz/git-gui:
git-gui: Allow 'git gui version' outside of a repository
git-gui: Revert "git-gui: Display all authors of git-gui."
git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."
git-gui: Allow committing empty merges

Re-fix get_sha1_oneline()Linus Torvalds Mon, 12 Mar 2007 18:30:38 +0000 (11:30 -0700)

Re-fix get_sha1_oneline()

What the function wants to return is not if we saw any return
from pop_most_recent_commit(), but if we found what was asked
for.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'maint' gitgui-0.6.5Shawn O. Pearce Mon, 12 Mar 2007 17:26:59 +0000 (13:26 -0400)

Merge branch 'maint'

* maint:
git-gui: Allow 'git gui version' outside of a repository
git-gui: Revert "git-gui: Display all authors of git-gui."
git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."
git-gui: Allow committing empty merges

git-gui: Allow 'git gui version' outside of a repository gitgui-0.6.4Shawn O. Pearce Mon, 12 Mar 2007 17:24:10 +0000 (13:24 -0400)

git-gui: Allow 'git gui version' outside of a repository

I got a little surprise one day when I tried to run 'git gui version'
outside of a Git repository to determine what version of git-gui was
installed on that system. Turns out we were doing the repository
check long before we got around to command line argument handling.

We now look to see if the only argument we have been given is
'version' or '--version', and if so, print out the version and
exit immediately; long before we consider looking at the Git
version or working directory. This way users can still get to
the git-gui version number even if Git's version cannot be read.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

git-gui: Revert "git-gui: Display all authors of git... Shawn O. Pearce Mon, 12 Mar 2007 17:26:04 +0000 (13:26 -0400)

git-gui: Revert "git-gui: Display all authors of git-gui."
This reverts commit 871f4c97ad7e021d1a0a98c80c5da77fcf70e4af.

Too many users have complained about the credits generator in
git-gui, so I'm backing the entire thing out. This revert will
finish that series.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

git-gui: Revert "Don't modify CREDITS-FILE if it hasn... Shawn O. Pearce Mon, 12 Mar 2007 17:25:58 +0000 (13:25 -0400)

git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."
This reverts commit 92446aba47b0e0db28f7b858ea387efcca30ab44.

Too many users have complained about the credits generator in
git-gui, so I'm backing the entire thing out.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

git-gui: Allow committing empty mergesShawn O. Pearce Mon, 12 Mar 2007 17:03:47 +0000 (13:03 -0400)

git-gui: Allow committing empty merges

Johannes Sixt noticed that git-gui would not let the user commit
a merge created by `git merge -s ours` as the ours strategy does
not alter the tree (that is HEAD^1^{tree} = HEAD^{tree} after the
merge). The same issue arises from amending such a merge commit.

We now permit an empty commit (no changed files) if we are doing
a merge commit. Core Git does this with its command line based
git-commit tool, so it makes sense for the GUI to do the same.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>