gitweb.git
Merge branch 'np/delta' into nextJunio C Hamano Sat, 29 Apr 2006 05:42:41 +0000 (22:42 -0700)

Merge branch 'np/delta' into next

* np/delta:
replace adler32 with Rabin's polynomial in diff-delta

replace adler32 with Rabin's polynomial in diff-deltaNicolas Pitre Sat, 29 Apr 2006 04:58:05 +0000 (00:58 -0400)

replace adler32 with Rabin's polynomial in diff-delta

This brings another small repacking speedup for sensibly the same pack
size. On the Linux kernel repo, git-repack -a -f is 3.7% faster for a
0.4% larger pack.

Credits to Geert Bosch who brought the Rabin's polynomial idea to my
attention.

This also eliminate the issue of adler32() reading past the data buffer,
as noticed by Johannes Schindelin.

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

Merge branch 'master' into nextJunio C Hamano Sat, 29 Apr 2006 02:30:41 +0000 (19:30 -0700)

Merge branch 'master' into next

* master:
Fix trivial typo in git-log man page.
Properly render asciidoc "callouts" in git man pages.
Fix up remaining man pages that use asciidoc "callouts".
Update the git-branch man page to include the "-r" option,
annotate: display usage information if no filename was given
annotate: fix warning about uninitialized scalar
git-am --resolved: more usable error message.

Merge branch 'fix'Junio C Hamano Fri, 28 Apr 2006 23:57:32 +0000 (16:57 -0700)

Merge branch 'fix'

* fix:
Fix trivial typo in git-log man page.
Properly render asciidoc "callouts" in git man pages.
Fix up remaining man pages that use asciidoc "callouts".
Update the git-branch man page to include the "-r" option,
annotate: display usage information if no filename was given
annotate: fix warning about uninitialized scalar
git-am --resolved: more usable error message.

Fix trivial typo in git-log man page.Sean Estabrooks Fri, 28 Apr 2006 13:15:03 +0000 (09:15 -0400)

Fix trivial typo in git-log man page.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>

Properly render asciidoc "callouts" in git man pages.Sean Estabrooks Fri, 28 Apr 2006 13:15:06 +0000 (09:15 -0400)

Properly render asciidoc "callouts" in git man pages.

Adds an xsl fragment to render docbook callouts when
converting to man page format. Update the Makefile
to have "xmlto" use it when generating man pages.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>

Fix up remaining man pages that use asciidoc "callouts".Sean Estabrooks Fri, 28 Apr 2006 13:15:05 +0000 (09:15 -0400)

Fix up remaining man pages that use asciidoc "callouts".

Unfortunately docbook does not allow a callout to be
referenced from inside a callout list description.
Rewrite one paragraph in git-reset man page to work
around this limitation.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>

Update the git-branch man page to include the "-r"... Sean Estabrooks Fri, 28 Apr 2006 13:15:04 +0000 (09:15 -0400)

Update the git-branch man page to include the "-r" option,

and fix up asciidoc "callouts"

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>

annotate: display usage information if no filename... Matthias Kestenholz Fri, 28 Apr 2006 08:41:19 +0000 (10:41 +0200)

annotate: display usage information if no filename was given

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>

annotate: fix warning about uninitialized scalarMatthias Kestenholz Fri, 28 Apr 2006 08:42:28 +0000 (10:42 +0200)

annotate: fix warning about uninitialized scalar

Use of uninitialized value in scalar chomp at
./git-annotate.perl line 212, <$kid> chunk 4.

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>

git-am --resolved: more usable error message.Junio C Hamano Fri, 28 Apr 2006 09:32:44 +0000 (02:32 -0700)

git-am --resolved: more usable error message.

After doing the hard work of hand resolving the conflicts in the
working tree, if the user forgets to run update-index to mark
the paths that have been resolved, the command gave an
unfriendly "fatal: git-write-tree: not able to write tree" error
message. Catch the situation early and give more meaningful
message and suggestion.

Noticed and suggested by Len Brown.

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

Merge branch 'jc/cache-tree' into nextJunio C Hamano Fri, 28 Apr 2006 08:36:52 +0000 (01:36 -0700)

Merge branch 'jc/cache-tree' into next

* jc/cache-tree:
cache-tree.c: typefix

cache-tree.c: typefixJunio C Hamano Fri, 28 Apr 2006 05:48:27 +0000 (22:48 -0700)

cache-tree.c: typefix

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

Merge branch 'jc/count' into nextJunio C Hamano Fri, 28 Apr 2006 04:38:43 +0000 (21:38 -0700)

Merge branch 'jc/count' into next

* jc/count:
built-in count-objects.
pack-objects: update size heuristucs.
verify-pack: check integrity in a saner order.

built-in count-objects.Junio C Hamano Thu, 27 Apr 2006 22:37:18 +0000 (15:37 -0700)

built-in count-objects.

Also it learned to do -v (verbose) to report:

- number of loose objects
- disk occupied by loose objects
- number of objects in local packs
- number of loose objects that are also in pack
- unrecognised garbage in .git/objects/??/.

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

pack-objects: update size heuristucs.Junio C Hamano Fri, 28 Apr 2006 02:31:46 +0000 (19:31 -0700)

pack-objects: update size heuristucs.

We used to omit delta base candidates that is much bigger than
the target, but delta size does not grow when we delete more, so
that was not a very good heuristics.

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

Merge branch 'np/delta' into nextJunio C Hamano Fri, 28 Apr 2006 01:10:09 +0000 (18:10 -0700)

Merge branch 'np/delta' into next

* np/delta:
use delta index data when finding best delta matches

Merge branch 'jc/cache-tree' into nextJunio C Hamano Thu, 27 Apr 2006 23:25:32 +0000 (16:25 -0700)

Merge branch 'jc/cache-tree' into next

* jc/cache-tree:
test-dump-cache-tree: validate the cached data as well.
cache_tree_update: give an option to update cache-tree only.

test-dump-cache-tree: validate the cached data as well.Junio C Hamano Thu, 27 Apr 2006 23:22:45 +0000 (16:22 -0700)

test-dump-cache-tree: validate the cached data as well.

While dumping the cached data, try recomputing everything from
scratch to make sure things match.

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

cache_tree_update: give an option to update cache-tree... Junio C Hamano Thu, 27 Apr 2006 23:21:54 +0000 (16:21 -0700)

cache_tree_update: give an option to update cache-tree only.

When the extra "dryrun" parameter is true, cache_tree_update()
recomputes the invalid entry but does not actually creates
new tree object.

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

Merge branch 'fix'Junio C Hamano Thu, 27 Apr 2006 22:42:32 +0000 (15:42 -0700)

Merge branch 'fix'

* fix:
verify-pack: check integrity in a saner order.

verify-pack: check integrity in a saner order.Junio C Hamano Thu, 27 Apr 2006 22:42:01 +0000 (15:42 -0700)

verify-pack: check integrity in a saner order.

Check internal integrity to report corrupt pack or idx, and
then check cross-integrity between idx and pack.

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

Merge branch 'jc/pathcheck' into nextJunio C Hamano Thu, 27 Apr 2006 19:51:08 +0000 (12:51 -0700)

Merge branch 'jc/pathcheck' into next

* jc/pathcheck:
revision parsing: make "rev -- paths" checks stronger.

Fix mismerged update-index from jc/cache-tree branch.Junio C Hamano Thu, 27 Apr 2006 19:50:01 +0000 (12:50 -0700)

Fix mismerged update-index from jc/cache-tree branch.

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

Retire rabinpoly fingerprinting codeJunio C Hamano Thu, 27 Apr 2006 19:48:26 +0000 (12:48 -0700)

Retire rabinpoly fingerprinting code

For now let's retire this and reintroduce it as part of the updated
pack-objects series from Geert when it is ready.

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

Merge branch 'master' into nextJunio C Hamano Thu, 27 Apr 2006 19:25:18 +0000 (12:25 -0700)

Merge branch 'master' into next

* master:
Fix "git help -a" terminal autosizing
diff-index: fix compilation warnings.

Merge branch 'pb/config'Junio C Hamano Thu, 27 Apr 2006 19:23:01 +0000 (12:23 -0700)

Merge branch 'pb/config'

* pb/config:
git-cvsserver: typofixes
Deprecate usage of git-var -l for getting config vars list
git-repo-config --list support

Merge branch 'jc/diffstat'Junio C Hamano Thu, 27 Apr 2006 18:58:33 +0000 (11:58 -0700)

Merge branch 'jc/diffstat'

* jc/diffstat:
diff --stat: show complete rewrites consistently.

Fix "git help -a" terminal autosizingLinus Torvalds Thu, 27 Apr 2006 16:02:54 +0000 (09:02 -0700)

Fix "git help -a" terminal autosizing

When I split out the builtin commands into their own files, I left the
include of <sys/ioctl.h> in git.c rather than moving it to the file that
needed it (builtin-help.c).

Nobody seems to have noticed, because everything still worked, but because
the TIOCGWINSZ macro was now no longer defined when compiling the
"term_columns()" function, it would no longer automatically notice the
terminal size unless your system used the ancient "COLUMNS" environment
variable approach.

Trivially fixed by just moving the header include to the file that
actually needs it.

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

diff-index: fix compilation warnings.Junio C Hamano Thu, 27 Apr 2006 08:59:00 +0000 (01:59 -0700)

diff-index: fix compilation warnings.

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

Merge branch 'jc/cache-tree' into nextJunio C Hamano Thu, 27 Apr 2006 08:37:03 +0000 (01:37 -0700)

Merge branch 'jc/cache-tree' into next

* jc/cache-tree:
read-tree: teach 1-way merege and plain read to prime cache-tree.
read-tree: teach 1 and 2 way merges about cache-tree.
update-index: when --unresolve, smudge the relevant cache-tree entries.

read-tree: teach 1-way merege and plain read to prime... Junio C Hamano Thu, 27 Apr 2006 08:33:07 +0000 (01:33 -0700)

read-tree: teach 1-way merege and plain read to prime cache-tree.

This teaches read-tree to fully populate valid cache-tree when
reading a tree from scratch, or reading a single tree into an
existing index, reusing only the cached stat information (i.e.
one-way merge). We have already taught update-index about cache-tree,
so "git checkout" followed by updates to a few path followed by
a "git commit" would become very efficient.

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

read-tree: teach 1 and 2 way merges about cache-tree.Junio C Hamano Thu, 27 Apr 2006 07:13:34 +0000 (00:13 -0700)

read-tree: teach 1 and 2 way merges about cache-tree.

This teaches one-way and two-way "read-tree -m" (and its special
form, "read-tree --reset" as well) not to discard cache-tree but
invalidate only the changed parts of the tree. When switching
between related branches, this helps the eventual commit
(i.e. write-tree) by keeping cache-tree valid as much as
possible.

This does not prime cache-tree yet, but we ought to be able to
do that for no-merge (i.e. reading from a tree object) case and,
and also perhaps 1 way merge case.

With this patch applied, switching between the tip of Linux 2.6
kernel tree and a branch that touches one path (fs/ext3/Makefile)
from it invalidates only 3 paths out of 1201 cache-tree entries
in the index, and subsequent write-tree takes about a half as
much time as before.

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

update-index: when --unresolve, smudge the relevant... Junio C Hamano Thu, 27 Apr 2006 05:05:05 +0000 (22:05 -0700)

update-index: when --unresolve, smudge the relevant cache-tree entries.

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

use delta index data when finding best delta matchesNicolas Pitre Thu, 27 Apr 2006 03:58:00 +0000 (23:58 -0400)

use delta index data when finding best delta matches

This patch allows for computing the delta index for each base object
only once and reuse it when trying to find the best delta match.

This should set the mark and pave the way for possibly better delta
generator algorithms.

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

Merge branch 'jc/cache-tree' into nextJunio C Hamano Thu, 27 Apr 2006 01:48:53 +0000 (18:48 -0700)

Merge branch 'jc/cache-tree' into next

* jc/cache-tree:
t0000-basic: more commit-tree tests.

Merge branch 'master' into jc/cache-treeJunio C Hamano Thu, 27 Apr 2006 01:32:45 +0000 (18:32 -0700)

Merge branch 'master' into jc/cache-tree

* master:
t0000-basic: more commit-tree tests.
commit-tree.c: check_valid() microoptimization.
Fix filename verification when in a subdirectory
rebase: typofix.
socksetup: don't return on set_reuse_addr() error

t0000-basic: more commit-tree tests.Junio C Hamano Thu, 27 Apr 2006 01:25:15 +0000 (18:25 -0700)

t0000-basic: more commit-tree tests.

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

Merge branch 'se/rebase' into nextJunio C Hamano Thu, 27 Apr 2006 00:24:15 +0000 (17:24 -0700)

Merge branch 'se/rebase' into next

* se/rebase:
Add --continue and --abort options to git-rebase.

Merge branch 'nh/fetch-http' into nextJunio C Hamano Thu, 27 Apr 2006 00:23:51 +0000 (17:23 -0700)

Merge branch 'nh/fetch-http' into next

* nh/fetch-http:
git-fetch: resolve remote symrefs for HTTP transport
commit-tree.c: check_valid() microoptimization.
Fix filename verification when in a subdirectory
rebase: typofix.
socksetup: don't return on set_reuse_addr() error

git-fetch: resolve remote symrefs for HTTP transportNick Hengeveld Wed, 26 Apr 2006 16:10:01 +0000 (09:10 -0700)

git-fetch: resolve remote symrefs for HTTP transport

git-fetch validates that a remote ref resolves to a SHA1 prior to calling
git-http-fetch. This adds support for resolving a few levels of symrefs
to get to the SHA1.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Add --continue and --abort options to git-rebase.sean Wed, 26 Apr 2006 14:49:38 +0000 (10:49 -0400)

Add --continue and --abort options to git-rebase.

git rebase [--onto <newbase>] <upstream> [<branch>]
git rebase --continue
git rebase --abort

Add "--continue" to restart the rebase process after
manually resolving conflicts. The user is warned if
there are still differences between the index and the
working files.

Add "--abort" to restore the original branch, and
remove the .dotest working files.

Some minor additions to the git-rebase documentation.

[jc: fix that applies to the maintenance track has been dealt
with separately.]

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

revision parsing: make "rev -- paths" checks stronger.Junio C Hamano Wed, 26 Apr 2006 22:09:27 +0000 (15:09 -0700)

revision parsing: make "rev -- paths" checks stronger.

If you don't have a "--" marker, then:

- all of the arguments we are going to assume are pathspecs
must exist in the working tree.

- none of the arguments we parsed as revisions could be
interpreted as a filename.

so that there really isn't any possibility of confusion in case
somebody does have a revision that looks like a pathname too.

The former rule has been in effect; this implements the latter.

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

Merge branch 'fix'Junio C Hamano Thu, 27 Apr 2006 00:08:00 +0000 (17:08 -0700)

Merge branch 'fix'

* fix:
commit-tree.c: check_valid() microoptimization.
Fix filename verification when in a subdirectory
rebase: typofix.
socksetup: don't return on set_reuse_addr() error

commit-tree.c: check_valid() microoptimization.Junio C Hamano Wed, 26 Apr 2006 23:55:25 +0000 (16:55 -0700)

commit-tree.c: check_valid() microoptimization.

There is no point reading the whole object just to make sure it exists and
it is of the expected type. We added sha1_object_info() for such need
after this code was written, so use it.

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

Fix filename verification when in a subdirectoryLinus Torvalds Wed, 26 Apr 2006 17:15:54 +0000 (10:15 -0700)

Fix filename verification when in a subdirectory

When we are in a subdirectory of a git archive, we need to take the prefix
of that subdirectory into accoung when we verify filename arguments.

Noted by Matthias Lederhofer

This also uses the improved error reporting for all the other git commands
that use the revision parsing interfaces, not just git-rev-parse. Also, it
makes the error reporting for mixed filenames and argument flags clearer
(you cannot put flags after the start of the pathname list).

[jc: with fix to a trivial typo noticed by Timo Hirvonen]

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

rebase: typofix.Junio C Hamano Wed, 26 Apr 2006 19:07:42 +0000 (12:07 -0700)

rebase: typofix.

Noticed by Sean.

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

Merge branch 'jc/cache-tree' into nextJunio C Hamano Wed, 26 Apr 2006 10:39:01 +0000 (03:39 -0700)

Merge branch 'jc/cache-tree' into next

* jc/cache-tree:
commit-tree: allow generic object name for the tree as well.
Makefile: remove and create xdiff library from scratch.
t0000-basic: Add ls-tree recursive test back.

Merge branch 'master' into jc/cache-treeJunio C Hamano Wed, 26 Apr 2006 10:29:09 +0000 (03:29 -0700)

Merge branch 'master' into jc/cache-tree

* master:
commit-tree: allow generic object name for the tree as well.
Makefile: remove and create xdiff library from scratch.
t0000-basic: Add ls-tree recursive test back.
Libified diff-index: backward compatibility fix.
Libify diff-index.
Libify diff-files.
Makefile: remove and create libgit.a from scratch.
Document the configuration file
Document git-var -l listing also configuration variables
rev-parse: better error message for ambiguous arguments
make update-index --chmod work with multiple files and --stdin
socksetup: don't return on set_reuse_addr() error
Fix "git show --stat"
git-update-index --unresolve
Add git-unresolve <paths>...
Add colordiff for git to contrib/colordiff.
gitk: Let git-rev-list do the argument list parsing

commit-tree: allow generic object name for the tree... Junio C Hamano Wed, 26 Apr 2006 10:18:51 +0000 (03:18 -0700)

commit-tree: allow generic object name for the tree as well.

We use get_sha1() for -p (parent) objects, but still used
get_sha1_hex() for the tree. Just to be consistent, allow
extended SHA1 expression for the tree object name.

Note that this is not to encourage funky things like this:

git-commit-tree HEAD^{tree} -p HEAD

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

Makefile: remove and create xdiff library from scratch.Junio C Hamano Wed, 26 Apr 2006 10:12:58 +0000 (03:12 -0700)

Makefile: remove and create xdiff library from scratch.

... in the same spirit as 71459c193d04870076efa0a387c317390b53e3e2.

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

t0000-basic: Add ls-tree recursive test back.Junio C Hamano Wed, 26 Apr 2006 09:27:59 +0000 (02:27 -0700)

t0000-basic: Add ls-tree recursive test back.

When we updated ls-tree recursive output to omit the tree nodes,
246cc52f388cae8ca99e5a12b8458c9bfa467765 adjusted the old test
so that we do not expect to see trees in its output. Later,
with 0f8f45cb4a7e664b396f73c25891da46b953b8b8, we added back the
ability to show both with -t option, but we forgot to update the
test as well.

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

Merge branch 'pb/config' into nextJunio C Hamano Wed, 26 Apr 2006 07:00:49 +0000 (00:00 -0700)

Merge branch 'pb/config' into next

* pb/config:
git-cvsserver: typofixes

git-cvsserver: typofixesJunio C Hamano Wed, 26 Apr 2006 06:59:28 +0000 (23:59 -0700)

git-cvsserver: typofixes

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

Merge branch 'jc/diffstat' into nextJunio C Hamano Wed, 26 Apr 2006 06:50:48 +0000 (23:50 -0700)

Merge branch 'jc/diffstat' into next

* jc/diffstat:
diff --stat: show complete rewrites consistently.
Makefile: remove and create libgit.a from scratch.

diff --stat: show complete rewrites consistently.Junio C Hamano Wed, 26 Apr 2006 06:40:09 +0000 (23:40 -0700)

diff --stat: show complete rewrites consistently.

The patch format shows complete rewrite as deletion of all old lines
followed by addition of all new lines. Count lines consistenly with
that when doing diffstat.

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

Merge branch 'jc/diff'Junio C Hamano Wed, 26 Apr 2006 06:12:21 +0000 (23:12 -0700)

Merge branch 'jc/diff'

* jc/diff:
Libified diff-index: backward compatibility fix.
Libify diff-index.
Libify diff-files.

Makefile: remove and create libgit.a from scratch.Junio C Hamano Wed, 26 Apr 2006 06:11:17 +0000 (23:11 -0700)

Makefile: remove and create libgit.a from scratch.

Foolishly I renamed diff.o around which caused an old diff.o
taken out of libgit.a and got linked into resulting binary and
exhibited mysterious breakage for many people. This borrows
from the kernel Makefile (scripts/Makefile.build) to first remove
the target and then recreate.

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

Merge branch 'jc/cache-tree' into nextJunio C Hamano Wed, 26 Apr 2006 05:51:01 +0000 (22:51 -0700)

Merge branch 'jc/cache-tree' into next

* jc/cache-tree:
test-dump-cache-tree: report number of subtrees.
cache-tree: sort the subtree entries.
Teach fsck-objects about cache-tree.

test-dump-cache-tree: report number of subtrees.Junio C Hamano Wed, 26 Apr 2006 00:40:24 +0000 (17:40 -0700)

test-dump-cache-tree: report number of subtrees.

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

cache-tree: sort the subtree entries.Junio C Hamano Wed, 26 Apr 2006 00:40:02 +0000 (17:40 -0700)

cache-tree: sort the subtree entries.

Not that this makes practical performance difference; the kernel tree
for example has 200 or so directories that have subdirectory, and the
largest ones have 57 of them (fs and drivers). With a test to apply
600 patches with git-apply and git-write-tree, this did not make more
than one per-cent of a difference, but it is a good cleanup.

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

Teach fsck-objects about cache-tree.Junio C Hamano Tue, 25 Apr 2006 23:37:08 +0000 (16:37 -0700)

Teach fsck-objects about cache-tree.

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

socksetup: don't return on set_reuse_addr() error v1.3.1Serge E. Hallyn Tue, 18 Apr 2006 13:11:06 +0000 (08:11 -0500)

socksetup: don't return on set_reuse_addr() error

The set_reuse_addr() error case was the only error case in
socklist() where we returned rather than continued. Not sure
why. Either we must free the socklist, or continue. This patch
continues on error.

Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from 0032d548db56eac9ea09b4ba05843365f6325b85 commit)

Merge branch 'pb/config' into nextJunio C Hamano Tue, 25 Apr 2006 05:31:19 +0000 (22:31 -0700)

Merge branch 'pb/config' into next

* pb/config:
Deprecate usage of git-var -l for getting config vars list
git-repo-config --list support

Merge branch 'np/delta' into nextJunio C Hamano Tue, 25 Apr 2006 05:31:15 +0000 (22:31 -0700)

Merge branch 'np/delta' into next

* np/delta:
split the diff-delta interface
Document the configuration file
Document git-var -l listing also configuration variables
rev-parse: better error message for ambiguous arguments

Deprecate usage of git-var -l for getting config vars... Petr Baudis Mon, 24 Apr 2006 22:59:30 +0000 (00:59 +0200)

Deprecate usage of git-var -l for getting config vars list

This has been an unfortunate sideway in the git API evolution.
We use git-repo-config for all the other .git/config interaction
so let's also use git-repo-config -l for the variable listing.

Signed-off-by: Petr Baudis <pasky@suse.cz>

git-repo-config --list supportPetr Baudis Mon, 24 Apr 2006 22:59:25 +0000 (00:59 +0200)

git-repo-config --list support

This adds git-repo-config --list (or git-repo-config -l) support,
similar to what git-var -l does now (to be phased out so that we
have a single sane interface to the config file instead of fragmented
and confused API).

Signed-off-by: Petr Baudis <pasky@suse.cz>

split the diff-delta interfaceNicolas Pitre Tue, 25 Apr 2006 03:07:47 +0000 (23:07 -0400)

split the diff-delta interface

This patch splits the diff-delta interface into index creation and delta
generation. A wrapper is provided to preserve the diff-delta() call.

This will allow for an optimization in pack-objects.c where the source
object could be fixed and a full window of objects tentatively tried
against
that same source object without recomputing the source index each time.

This patch only restructure things, plus a couple cleanups for good
measure. There is no performance change yet.

Signed-off-by: Nicolas Pitre <nico@cam.org>

Merge branch 'fix'Junio C Hamano Tue, 25 Apr 2006 05:26:57 +0000 (22:26 -0700)

Merge branch 'fix'

* fix:
Document the configuration file
Document git-var -l listing also configuration variables
rev-parse: better error message for ambiguous arguments

Document the configuration filePetr Baudis Mon, 24 Apr 2006 22:59:33 +0000 (00:59 +0200)

Document the configuration file

This patch adds a Documentation/config.txt file included by git-repo-config
and currently aggregating hopefully all the available git plumbing / core
porcelain configuration variables, as well as briefly describing the format.

It also updates an outdated bit of the example in git-repo-config(1).

Signed-off-by: Petr Baudis <pasky@suse.cz>

Document git-var -l listing also configuration variablesPetr Baudis Mon, 24 Apr 2006 22:59:28 +0000 (00:59 +0200)

Document git-var -l listing also configuration variables

Signed-off-by: Petr Baudis <pasky@suse.cz>

rev-parse: better error message for ambiguous argumentsPaul Mackerras Tue, 25 Apr 2006 00:00:03 +0000 (10:00 +1000)

rev-parse: better error message for ambiguous arguments

Currently, if git-rev-parse encounters an argument that is neither a
recognizable revision name nor the name of an existing file or
directory, and it hasn't encountered a "--" argument, it prints an
error message saying "No such file or directory". This can be
confusing for users, including users of programs such as gitk that
use git-rev-parse, who may then think that they can't ask about the
history of files that no longer exist.

This makes it print a better error message, one that points out the
ambiguity and tells the user what to do to fix it.

Signed-off-by: Paul Mackerras <paulus@samba.org>

Merge branch 'jc/cache-tree' into nextJunio C Hamano Tue, 25 Apr 2006 04:28:07 +0000 (21:28 -0700)

Merge branch 'jc/cache-tree' into next

* jc/cache-tree:
index: make the index file format extensible.
cache-tree: protect against "git prune".
Add test-dump-cache-tree

index: make the index file format extensible.Junio C Hamano Tue, 25 Apr 2006 04:18:58 +0000 (21:18 -0700)

index: make the index file format extensible.

... and move the cache-tree data into it.

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

cache-tree: protect against "git prune".Junio C Hamano Mon, 24 Apr 2006 22:12:42 +0000 (15:12 -0700)

cache-tree: protect against "git prune".

We reused the cache-tree data without verifying the tree object
still exists. Recompute in cache_tree_update() an otherwise
valid cache-tree entry when the tree object disappeared.

This is not usually a problem, but theoretically without this
fix things can break when the user does something like this:

- read-index from a side branch
- write-tree the result
- remove the side branch with "git branch -D"
- remove the unreachable objects with "git prune"
- write-tree what is in the index.

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

Merge branch 'master' into nextJunio C Hamano Mon, 24 Apr 2006 09:18:33 +0000 (02:18 -0700)

Merge branch 'master' into next

* master:
gitk: Let git-rev-list do the argument list parsing

Merge branch 'ar/chmod-series'Junio C Hamano Mon, 24 Apr 2006 09:08:35 +0000 (02:08 -0700)

Merge branch 'ar/chmod-series'

* ar/chmod-series:
make update-index --chmod work with multiple files and --stdin

Merge branch 'sh/daemon'Junio C Hamano Mon, 24 Apr 2006 09:08:28 +0000 (02:08 -0700)

Merge branch 'sh/daemon'

* sh/daemon:
socksetup: don't return on set_reuse_addr() error

Merge branch 'jc/cc-stat'Junio C Hamano Mon, 24 Apr 2006 09:06:40 +0000 (02:06 -0700)

Merge branch 'jc/cc-stat'

* jc/cc-stat:
Fix "git show --stat"

Merge branch 'jc/unresolve'Junio C Hamano Mon, 24 Apr 2006 09:05:55 +0000 (02:05 -0700)

Merge branch 'jc/unresolve'

* jc/unresolve:
git-update-index --unresolve
Add git-unresolve <paths>...

Merge branch 'jc/color'Junio C Hamano Mon, 24 Apr 2006 09:05:07 +0000 (02:05 -0700)

Merge branch 'jc/color'

* jc/color:
Add colordiff for git to contrib/colordiff.

Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano Mon, 24 Apr 2006 08:39:01 +0000 (01:39 -0700)

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

* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Let git-rev-list do the argument list parsing

Merge part of 'jc/cache-tree'Junio C Hamano Mon, 24 Apr 2006 07:33:28 +0000 (00:33 -0700)

Merge part of 'jc/cache-tree'

Add test-dump-cache-treeJunio C Hamano Mon, 24 Apr 2006 03:20:25 +0000 (20:20 -0700)

Add test-dump-cache-tree

This was useful in diagnosing the corrupt index.aux format
problem. But do not bother building or installing it by
default.

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

Use cache-tree in update-index.Junio C Hamano Mon, 24 Apr 2006 07:23:54 +0000 (00:23 -0700)

Use cache-tree in update-index.

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

Invalidate cache-tree entries for touched paths in... Junio C Hamano Sun, 23 Apr 2006 23:52:52 +0000 (16:52 -0700)

Invalidate cache-tree entries for touched paths in git-apply.

This updates git-apply to maintain cache-tree information. With
this and the previous write-tree patch, repeated "apply --index"
followed by "write-tree" on a huge tree will hopefully become
faster.

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

Update write-tree to use cache-tree.Junio C Hamano Sun, 23 Apr 2006 23:52:35 +0000 (16:52 -0700)

Update write-tree to use cache-tree.

The updated write-tree reads from $GIT_DIR/index.aux to pick up
subtree objects information, updates the cache-tree with the
index, and updates index.aux file after writing a tree out of
the index file.

Until update-index and other programs that modify the index are
updated to maintain index.aux file, the index.aux file written
by the last write-tree will become stale immediately after they
update the index, which will result in the whole tree
recomputation just like the original write-tree.

The idea is to convert those commands to invalidate cache-tree
whenever they touch the index entries, and write updated
index.aux out. After the index is updated with them, write-tree
will be able to reuse the parts of the cache-tree that have not
been touched.

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

Add cache-tree.Junio C Hamano Sun, 23 Apr 2006 23:52:20 +0000 (16:52 -0700)

Add cache-tree.

The cache_tree data structure is to cache tree object names that
would result from the current index file.

The idea is to have an optional file to record each tree object
name that corresponds to a directory path in the cache when we
run write_cache(), and read it back when we run read_cache().
During various index manupulations, we selectively invalidate
the parts so that the next write-tree can bypass regenerating
tree objects for unchanged parts of the directory hierarchy.

We could perhaps make the cache-tree data an optional part of
the index file, but that would involve the index format updates,
so unless we need it for performance reasons, the current plan
is to use a separate file, $GIT_DIR/index.aux to store this
information and link it with the index file with the checksum
that is already used for index file integrity check.

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

Merge branch 'ar/chmod-series' into nextJunio C Hamano Mon, 24 Apr 2006 00:00:31 +0000 (17:00 -0700)

Merge branch 'ar/chmod-series' into next

* ar/chmod-series:
make update-index --chmod work with multiple files and --stdin

read-cache/write-cache: optionally return cache checksu... Junio C Hamano Sun, 23 Apr 2006 23:52:08 +0000 (16:52 -0700)

read-cache/write-cache: optionally return cache checksum SHA1.

read_cache_1() and write_cache_1() takes an extra parameter
*sha1 that returns the checksum of the index file when non-NULL.

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

gitk: Let git-rev-list do the argument list parsingPaul Mackerras Sun, 23 Apr 2006 08:00:24 +0000 (18:00 +1000)

gitk: Let git-rev-list do the argument list parsing

This is a fix for a problem reported by Jim Radford where an argument
list somewhere overflows on repositories with lots of tags. In fact
it's now unnecessary to use git-rev-parse since git-rev-list can take
all the arguments that git-rev-parse can. This is inspired by but not
the same as the solutions suggested by Jim Radford and Linus Torvalds.

Signed-off-by: Paul Mackerras <paulus@samba.org>

make update-index --chmod work with multiple files... Alex Riesen Sun, 23 Apr 2006 07:01:29 +0000 (09:01 +0200)

make update-index --chmod work with multiple files and --stdin

The patch makes "--chmod=-x" and "--chmod=+x" act like "--add"
and "--remove" to affect the behaviour of the command for the
rest of the path parameters, not just the following one.

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

Merge branch 'jc/diff' into nextJunio C Hamano Sat, 22 Apr 2006 11:04:46 +0000 (04:04 -0700)

Merge branch 'jc/diff' into next

* jc/diff:
Libified diff-index: backward compatibility fix.

Libified diff-index: backward compatibility fix.Junio C Hamano Sat, 22 Apr 2006 10:58:04 +0000 (03:58 -0700)

Libified diff-index: backward compatibility fix.

"diff-index -m" does not mean "do not ignore merges", but means
"pretend missing files match the index".

The previous round tried to address this, but failed because
setup_revisions() ate "-m" flag before the caller had a chance
to intervene.

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

Merge branch 'jc/diff' into nextJunio C Hamano Sat, 22 Apr 2006 10:07:08 +0000 (03:07 -0700)

Merge branch 'jc/diff' into next

* jc/diff:
Libify diff-index.
Libify diff-files.

Merge branch 'jc/fmt-patch' into nextJunio C Hamano Sat, 22 Apr 2006 10:06:58 +0000 (03:06 -0700)

Merge branch 'jc/fmt-patch' into next

* jc/fmt-patch:
git-fmt-patch: thinkofix to show [PATCH] properly.

git-fmt-patch: thinkofix to show [PATCH] properly.Junio C Hamano Sat, 22 Apr 2006 10:06:13 +0000 (03:06 -0700)

git-fmt-patch: thinkofix to show [PATCH] properly.

Updating "subject" variable without changing the hardcoded
number of bytes to memcpy from it would not help much.

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

Libify diff-index.Junio C Hamano Sat, 22 Apr 2006 09:43:00 +0000 (02:43 -0700)

Libify diff-index.

The second installment to libify diff brothers. The pathname
arguments are checked more strictly than before because we now
use the revision.c::setup_revisions() infrastructure.

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

Libify diff-files.Junio C Hamano Sat, 22 Apr 2006 06:57:45 +0000 (23:57 -0700)

Libify diff-files.

This is the first installment to libify diff brothers.

The updated diff-files uses revision.c::setup_revisions()
infrastructure to parse its command line arguments, which means
the pathname arguments are checked more strictly than before.
The tests are adjusted to separate possibly missing paths from
the rest of arguments with double-dashes, to show the kosher
way.

As Linus pointed out, renaming diff.c to diff-lib.c was simply
stupid, so I am renaming it back. The new diff-lib.c is to
contain pieces extracted from diff brothers.

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

Merge branch 'jc/cc-stat' into nextJunio C Hamano Sat, 22 Apr 2006 08:46:29 +0000 (01:46 -0700)

Merge branch 'jc/cc-stat' into next

* jc/cc-stat:
Fix "git show --stat"