Code

git.git
18 years agoAdd "git show-ref" builtin command
Linus Torvalds [Fri, 15 Sep 2006 18:19:32 +0000 (11:19 -0700)]
Add "git show-ref" builtin command

It's kind of like "git peek-remote", but works only locally (and thus
avoids the whole overhead of git_connect()) and has some extra
verification features.

For example, it allows you to filter the results, and to choose whether
you want the tag dereferencing or not. You can also use it to just test
whether a particular ref exists.

For example:

git show-ref master

will show all references called "master", whether tags or heads or
anything else, and regardless of how deep in the reference naming
hierarchy they are (so it would show "refs/heads/master" but also
"refs/remote/other-repo/master").

When using the "--verify" flag, the command requires an exact ref path:

git show-ref --verify refs/heads/master

will only match the exact branch called "master".

If nothing matches, show-ref will return an error code of 1, and in the
case of verification, it will show an error message.

For scripting, you can ask it to be quiet with the "--quiet" flag, which
allows you to do things like

git-show-ref --quiet --verify -- "refs/heads/$headname" ||
echo "$headname is not a valid branch"

to check whether a particular branch exists or not (notice how we don't
actually want to show any results, and we want to use the full refname for
it in order to not trigger the problem with ambiguous partial matches).

To show only tags, or only proper branch heads, use "--tags" and/or
"--heads" respectively (using both means that it shows tags _and_ heads,
but not other random references under the refs/ subdirectory).

To do automatic tag object dereferencing, use the "-d" or "--dereference"
flag, so you can do

git show-ref --tags --dereference

to get a listing of all tags together with what they dereference.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAllow multiple "git_path()" uses
Linus Torvalds [Mon, 11 Sep 2006 19:03:15 +0000 (12:03 -0700)]
Allow multiple "git_path()" uses

This allows you to maintain a few filesystem pathnames concurrently, by
simply replacing the single static "pathname" buffer with a LRU of four
buffers.

We did exactly the same thing with sha1_to_hex(), for pretty much exactly
the same reason. Sometimes you want to use two pathnames, and while it's
easy enough to xstrdup() them, why not just do the LU buffer thing.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Add link to "project_index" view to "project_list" page
Jakub Narebski [Fri, 15 Sep 2006 09:11:33 +0000 (11:11 +0200)]
gitweb: Add link to "project_index" view to "project_list" page

Add link to "project_index" view as [TXT] beside link to "opml" view,
(which is marked by [OPML]) to "project_list" page.

While at it add alternate links for "opml" and "project_list" to HTML
header for "project_list" view.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Allow for href() to be used for links without project param
Jakub Narebski [Fri, 15 Sep 2006 17:30:34 +0000 (19:30 +0200)]
gitweb: Allow for href() to be used for links without project param

Make it possible to use href() subroutine to generate link with
query string which does not include project ('p') parameter.
href() used to add project=$project to its parameters, if it
was not set (to be more exact if $params{'project'} was false).
Now you can pass "project => undef" if you don't want for href()
to add project parameter to query string in the generated link.

Links to "project_list", "project_index" and "opml" (all related
to list of all projects/all git repositories) doesn't need project
parameter. Moreover "project_list" is default view (action) if
project ('p') parameter is not set, just like "summary" is default
view (action) if project is set; project list served as a kind
of "home" page for gitweb instalation, and links to "project_list"
view were done without specyfying it as an action.

Convert remaining links (except $home_link and anchor links)
to use href(); this required adding 'order => "o"' to @mapping
in href(). This finishes consolidation of URL generation.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDefine fallback PATH_MAX on systems that do not define one in <limits.h>
Junio C Hamano [Sat, 16 Sep 2006 05:47:21 +0000 (22:47 -0700)]
Define fallback PATH_MAX on systems that do not define one in <limits.h>

Notably on GNU/Hurd, as reported by Gerrit Pape.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocument git-grep -[Hh]
Junio C Hamano [Sat, 16 Sep 2006 01:37:01 +0000 (18:37 -0700)]
Document git-grep -[Hh]

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix duplicate xmalloc in builtin-add
Liu Yubao [Fri, 15 Sep 2006 20:46:07 +0000 (13:46 -0700)]
Fix duplicate xmalloc in builtin-add

[jc: patch came without sign-off but it was too obvious and trivial.]

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Add git_project_index for generating index.aux
Jakub Narebski [Fri, 15 Sep 2006 02:56:03 +0000 (04:56 +0200)]
gitweb: Add git_project_index for generating index.aux

Add git_project_index, which generates index.aux file that can be used
as a source of projects list, instead of generating projects list from
a directory.  Using file as a source of projects list allows for some
projects to be not present in gitweb main (project_list) page, and/or
correct project owner info. And is probably faster.

Additionally it can be used to get the list of all available repositories
for scripts (in easily parseable form).

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Do not parse refs by hand, use git-peek-remote instead
Jakub Narebski [Fri, 15 Sep 2006 01:43:28 +0000 (03:43 +0200)]
gitweb: Do not parse refs by hand, use git-peek-remote instead

This is in response to Linus's work on packed refs. Additionally it
makes gitweb work with symrefs, too.

Do not parse refs by hand, using File::Find and reading individual
heads to get hash of reference, but use git-peek-remote output
instead.  Assume that the hash for deref (with ^{}) always follows hash
for ref, and that we have derefs only for tag objects; this removes
call to git_get_type (and git-cat-file -t invocation) for tags, which
speeds "summary" and "tags" views generation, but might slow generation
of "heads" view a bit.  For now, we do not save and use the deref hash.

Remove git_get_hash_by_ref while at it, as git_get_refs_list was the
only place it was used.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Use File::Find::find in git_get_projects_list
Jakub Narebski [Thu, 14 Sep 2006 20:18:59 +0000 (22:18 +0200)]
gitweb: Use File::Find::find in git_get_projects_list

Earlier code to get list of projects when $projects_list is a
directory (e.g. when it is equal to $projectroot) had a hardcoded flat
(one level) list of directories.  Allow for projects to be in
subdirectories also for $projects_list being a directory by using
File::Find.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoHandle invalid argc gently
Dmitry V. Levin [Thu, 14 Sep 2006 01:04:09 +0000 (05:04 +0400)]
Handle invalid argc gently

describe, git: Handle argc==0 case the same way as argc==1.
merge-tree: Refuse excessive arguments.

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd "-h/-H" parsing to "git grep"
Linus Torvalds [Thu, 14 Sep 2006 17:45:12 +0000 (10:45 -0700)]
Add "-h/-H" parsing to "git grep"

It turns out that I actually wanted to avoid the filenames (because I
didn't care - I just wanted to see the context in which something was
used) when doing a grep. But since "git grep" didn't take the "-h"
parameter, I ended up having to do "grep -5 -h *.c" instead.

So here's a trivial patch that adds "-h" (and thus has to enable -H too)
to "git grep" parsing.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoTrivial support for cloning and fetching via ftp://.
Sasha Khapyorsky [Thu, 14 Sep 2006 02:24:04 +0000 (05:24 +0300)]
Trivial support for cloning and fetching via ftp://.

This adds trivial support for cloning and fetching via ftp://.

Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation: Fix broken links
Dmitry V. Levin [Thu, 14 Sep 2006 01:04:33 +0000 (05:04 +0400)]
Documentation: Fix broken links

core-tutorial.txt, cvs-migration.txt, tutorial-2.txt:
Fix broken links.

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake count-objects, describe and merge-tree work in subdirectory
Dmitry V. Levin [Thu, 14 Sep 2006 01:03:59 +0000 (05:03 +0400)]
Make count-objects, describe and merge-tree work in subdirectory

Call setup_git_directory() to make these commands work in subdirectory.

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branches 'maint' and 'jc/http'
Junio C Hamano [Thu, 14 Sep 2006 06:36:03 +0000 (23:36 -0700)]
Merge branches 'maint' and 'jc/http'

* maint:
  http-fetch: fix alternates handling.

* jc/http:
  http-fetch: fix alternates handling.

18 years agoMerge branch 'jc/unpack'
Junio C Hamano [Wed, 13 Sep 2006 20:00:02 +0000 (13:00 -0700)]
Merge branch 'jc/unpack'

* jc/unpack:
  unpack-objects -r: call it "recover".
  unpack-objects desperately salvages objects from a corrupt pack

18 years agounpack-objects -r: call it "recover".
Junio C Hamano [Wed, 13 Sep 2006 19:59:20 +0000 (12:59 -0700)]
unpack-objects -r: call it "recover".

The code called this operation "desperate" but the option flag is -r
and the word "recover" describes what it does better.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/binary'
Junio C Hamano [Wed, 13 Sep 2006 19:39:02 +0000 (12:39 -0700)]
Merge branch 'jc/binary'

* jc/binary:
  diff --binary generates full index on binary files.
  Make apply --binary a no-op.

18 years agoMerge branch 'aw/send-pack'
Junio C Hamano [Wed, 13 Sep 2006 19:30:20 +0000 (12:30 -0700)]
Merge branch 'aw/send-pack'

* aw/send-pack:
  send-pack: switch to using git-rev-list --stdin

18 years agoTest return value of finish_connect()
Franck Bui-Huu [Wed, 13 Sep 2006 08:26:47 +0000 (10:26 +0200)]
Test return value of finish_connect()

Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agohttp-fetch: fix alternates handling. v1.4.2.1
Junio C Hamano [Wed, 13 Sep 2006 06:53:27 +0000 (23:53 -0700)]
http-fetch: fix alternates handling.

Fetch over http from a repository that uses alternates to borrow
from neighbouring repositories were quite broken, apparently for
some time now.

We parse input and count bytes to allocate the new buffer, and
when we copy into that buffer we know exactly how many bytes we
want to copy from where.  Using strlcpy for it was simply
stupid, and the code forgot to take it into account that strlcpy
terminated the string with NUL.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agohttp-fetch: fix alternates handling.
Junio C Hamano [Wed, 13 Sep 2006 06:53:27 +0000 (23:53 -0700)]
http-fetch: fix alternates handling.

Fetch over http from a repository that uses alternates to borrow
from neighbouring repositories were quite broken, apparently for
some time now.

We parse input and count bytes to allocate the new buffer, and
when we copy into that buffer we know exactly how many bytes we
want to copy from where.  Using strlcpy for it was simply
stupid, and the code forgot to take it into account that strlcpy
terminated the string with NUL.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocontrib/vim: add syntax highlighting file for commits
Jeff King [Mon, 11 Sep 2006 23:22:49 +0000 (19:22 -0400)]
contrib/vim: add syntax highlighting file for commits

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix space in string " false" problem in "trace.c".
Christian Couder [Tue, 12 Sep 2006 04:43:08 +0000 (06:43 +0200)]
Fix space in string " false" problem in "trace.c".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoconnect.c: finish_connect(): allow null pid parameter
Franck Bui-Huu [Tue, 12 Sep 2006 09:00:13 +0000 (11:00 +0200)]
connect.c: finish_connect(): allow null pid parameter

git_connect() can return 0 if we use git protocol for example.
Users of this function don't know and don't care if a process
had been created or not, and to avoid them to check it before
calling finish_connect() this patch allows finish_connect() to
take a null pid. And in that case return 0.

[jc: updated function signature of git_connect() with a comment on
 its return value. ]

Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix a memory leak in "connect.c" and die if command too long.
Christian Couder [Mon, 11 Sep 2006 05:04:50 +0000 (07:04 +0200)]
Fix a memory leak in "connect.c" and die if command too long.

Use "add_to_string" instead of "sq_quote" and "snprintf", so
that there is no memory allocation and no memory leak.
Also check if the command is too long to fit into the buffer
and die if this is the case, instead of truncating it to the
buffer size.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMove add_to_string to "quote.c" and make it extern.
Christian Couder [Mon, 11 Sep 2006 04:59:22 +0000 (06:59 +0200)]
Move add_to_string to "quote.c" and make it extern.

So that this function may be used in places other than "rsh.c".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Paginate history output
Jakub Narebski [Sun, 10 Sep 2006 22:36:04 +0000 (00:36 +0200)]
gitweb: Paginate history output

git_history output is now divided into pages, like git_shortlog,
git_tags and git_heads output. As whole git-rev-list output is now
read into array before writing anything, it allows for better
signaling of errors.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Make pickaxe search a feature
Jakub Narebski [Sun, 10 Sep 2006 22:29:27 +0000 (00:29 +0200)]
gitweb: Make pickaxe search a feature

As pickaxe search (selected using undocumented 'pickaxe:' operator in
search query) is resource consuming, allow to turn it on/off using
feature meachanism.  Turned on by default, for historical reasons.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoget_sha1_hex() micro-optimization
Junio C Hamano [Sun, 10 Sep 2006 05:21:27 +0000 (22:21 -0700)]
get_sha1_hex() micro-optimization

The function appeared high on a gprof output for a rev-list run of
a non-trivial size, and it was an obvious low-hanging fruit.

The code is from Linus.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoautoconf: Add config.cache to .gitignore
Jakub Narebski [Thu, 7 Sep 2006 12:30:06 +0000 (14:30 +0200)]
autoconf: Add config.cache to .gitignore

Add generated file config.cache (default cache file, when running
./configure with -C, --config-cache option) to the list of ignored
files.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoautoconf: Add support for setting NO_ICONV and ICONVDIR
Jakub Narebski [Thu, 7 Sep 2006 11:48:49 +0000 (13:48 +0200)]
autoconf: Add support for setting NO_ICONV and ICONVDIR

Add support for ./configure options --without-iconv (if neither libc
nor libiconv properly support iconv), and for --with-iconv=PATH (to
set prefix to libiconv library and headers, used only when
NEED_LIBICONV is set).  While at it, make ./configure set or unset
NO_ICONV always (it is not autodetected in Makefile).

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoautoconf: Set NO_ICONV if iconv is found neither in libc, nor in libiconv
Jakub Narebski [Thu, 7 Sep 2006 11:48:08 +0000 (13:48 +0200)]
autoconf: Set NO_ICONV if iconv is found neither in libc, nor in libiconv

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodiff --binary generates full index on binary files.
Junio C Hamano [Thu, 7 Sep 2006 07:54:22 +0000 (00:54 -0700)]
diff --binary generates full index on binary files.

... without --full-index.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake apply --binary a no-op.
Junio C Hamano [Thu, 7 Sep 2006 05:45:21 +0000 (22:45 -0700)]
Make apply --binary a no-op.

Historically we did not allow binary patch applied without an
explicit permission from the user, and this flag was the way to
do so.  This makes the flag a no-op by always allowing binary
patch application.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosend-pack: switch to using git-rev-list --stdin
Andy Whitcroft [Tue, 5 Sep 2006 21:52:12 +0000 (22:52 +0100)]
send-pack: switch to using git-rev-list --stdin

When we are generating packs to update remote repositories we
want to supply as much information as possible about the revisions
that already exist to rev-list in order optimise the pack as much
as possible.  We need to pass two revisions for each branch we are
updating in the remote repository and one for each additional branch.
Where the remote repository has numerous branches we can run out
of command line space to pass them.

Utilise the git-rev-list --stdin mode to allow unlimited numbers
of revision constraints.  This allows us to move back to the much
simpler unordered revision selection code.

[jc: added some comments in the code to describe the pipe flow
 a bit.]

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/daemon'
Junio C Hamano [Thu, 7 Sep 2006 09:37:18 +0000 (02:37 -0700)]
Merge branch 'jc/daemon'

* jc/daemon:
  Revert "daemon: add upload-tar service."
  multi-service daemon: documentation
  daemon: add upload-tar service.

18 years agoRevert "daemon: add upload-tar service."
Junio C Hamano [Thu, 7 Sep 2006 08:40:04 +0000 (01:40 -0700)]
Revert "daemon: add upload-tar service."

This reverts parts of commit 74c0cc2 and part of commit 355f541.

Franck and Rene are working on a unified upload-archive which
would supersede this when done, so better not to get in their
way.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'pm/diff'
Junio C Hamano [Thu, 7 Sep 2006 08:33:45 +0000 (01:33 -0700)]
Merge branch 'pm/diff'

* pm/diff:
  diff-index --cc shows a 3-way diff between HEAD, index and working tree.

18 years agogit-repack: create new packs inside $GIT_DIR, not cwd
Martin Langhoff [Mon, 4 Sep 2006 05:42:32 +0000 (17:42 +1200)]
git-repack: create new packs inside $GIT_DIR, not cwd

Avoid failing when cwd is !writable by writing the
packfiles in $GIT_DIR, which is more in line with other commands.

Without this, git-repack was failing when run from crontab
by non-root user accounts. For large repositories, this
also makes the mv operation a lot cheaper, and avoids leaving
temp packfiles around the fs upon failure.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoTeach rev-list an option to read revs from the standard input.
Junio C Hamano [Wed, 6 Sep 2006 04:39:02 +0000 (21:39 -0700)]
Teach rev-list an option to read revs from the standard input.

When --stdin option is given, in addition to the <rev>s listed
on the command line, the command can read one rev parameter per
line from the standard input.  The list of revs ends at the
first empty line or EOF.

Note that you still have to give all the flags from the command
line; only rev arguments (including A..B, A...B, and A^@ notations)
can be give from the standard input.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorevision.c: allow injecting revision parameters after setup_revisions().
Junio C Hamano [Wed, 6 Sep 2006 04:28:36 +0000 (21:28 -0700)]
revision.c: allow injecting revision parameters after setup_revisions().

setup_revisions() wants to get all the parameters at once and
then postprocesses the resulting revs structure after it is done
with them.  This code structure is a bit cumbersome to deal with
efficiently when we want to inject revision parameters from the
side (e.g. read from standard input).

Fortunately, the nature of this postprocessing is not affected by
revision parameters; they are affected only by flags.  So it is
Ok to do add_object() after the it returns.

This splits out the code that deals with the revision parameter
out of the main loop of setup_revisions(), so that we can later
call it from elsewhere after it returns.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix memory leak in prepend_to_path (git.c).
Christian Couder [Tue, 5 Sep 2006 06:22:16 +0000 (08:22 +0200)]
Fix memory leak in prepend_to_path (git.c).

Some memory was allocated for a new path but not freed
after the path was used.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosend-pack: remove remote reference limit
Andy Whitcroft [Tue, 5 Sep 2006 19:00:17 +0000 (20:00 +0100)]
send-pack: remove remote reference limit

When build a pack for a push we query the remote copy for existant
heads.  These are used to prune unnecessary objects from the pack.
As we receive the remote references in get_remote_heads() we validate
the reference names via check_ref() which includes a length check;
rejecting those >45 characters in size.

This is a miss converted change, it was originally designed to reject
messages which were less than 45 characters in length (a 40 character
sha1 and refs/) to prevent comparing unitialised memory.  check_ref()
now gets the raw length so check for at least 5 characters.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoautoconf: Fix copy'n'paste error
Jakub Narebski [Tue, 5 Sep 2006 20:03:48 +0000 (22:03 +0200)]
autoconf: Fix copy'n'paste error

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodiff-index --cc shows a 3-way diff between HEAD, index and working tree.
Paul Mackerras [Mon, 4 Sep 2006 11:38:40 +0000 (21:38 +1000)]
diff-index --cc shows a 3-way diff between HEAD, index and working tree.

This implements a 3-way diff between the HEAD commit, the state in the
index, and the working directory.  This is like the n-way diff for a
merge, and uses much of the same code.  It is invoked with the -c flag
to git-diff-index, which it already accepted and did nothing with.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/pack'
Junio C Hamano [Tue, 5 Sep 2006 01:57:35 +0000 (18:57 -0700)]
Merge branch 'jc/pack'

* jc/pack:
  more lightweight revalidation while reusing deflated stream in packing
  pack-objects: fix thinko in revalidate code
  pack-objects: re-validate data we copy from elsewhere.

18 years agoautoconf: Quote AC_CACHE_CHECK arguments
Jakub Narebski [Mon, 4 Sep 2006 22:58:25 +0000 (00:58 +0200)]
autoconf: Quote AC_CACHE_CHECK arguments

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoautoconf: Check for subprocess.py
Jakub Narebski [Mon, 4 Sep 2006 22:57:45 +0000 (00:57 +0200)]
autoconf: Check for subprocess.py

Add custom test for checking if Python comes with subprocess.py, or
should we use our own subprocess.py by defining WITH_OWN_SUBPROCESS_PY.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoautoconf: Add -liconv to LIBS when NEEDS_LIBICONV
Jakub Narebski [Mon, 4 Sep 2006 22:55:52 +0000 (00:55 +0200)]
autoconf: Add -liconv to LIBS when NEEDS_LIBICONV

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Divide page path into directories -- path's "breadcrumbs"
Jakub Narebski [Mon, 4 Sep 2006 16:17:58 +0000 (18:17 +0200)]
gitweb: Divide page path into directories -- path's "breadcrumbs"

Divide page path into directories, so that each part of path links to
the "tree" view of the $hash_base (or HEAD, if $hash_base is not set)
version of the directory.

If the entity is blob, final part (basename) links to $hash_base or
HEAD revision of the "raw" blob ("blob_plain" view).  If the entity is
tree, link to the "tree" view.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Correct typo: '==' instead of 'eq' in git_difftree_body
Jakub Narebski [Mon, 4 Sep 2006 16:19:58 +0000 (18:19 +0200)]
gitweb: Correct typo: '==' instead of 'eq' in git_difftree_body

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Add GIT favicon, assuming image/png type
Jakub Narebski [Mon, 4 Sep 2006 18:32:13 +0000 (20:32 +0200)]
gitweb: Add GIT favicon, assuming image/png type

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix git-fsck-objects SIGSEGV/divide-by-zero
Linus Torvalds [Mon, 4 Sep 2006 15:34:12 +0000 (08:34 -0700)]
Fix git-fsck-objects SIGSEGV/divide-by-zero

If you try to fsck a repository that isn't entirely empty, but that has no
inter-object references (ie all the objects are blobs, and don't refer to
anything else), git-fsck-objects currently fails.

This probably cannot happen in practice, but can be tested with something
like

git init-db
touch dummy
git add dummy
git fsck-objects

where the fsck will die by a divide-by-zero when it tries to look up the
references from the one object it found (hash_obj() will do a modulus by
refs_hash_size).

On some other archiectures (ppc, sparc) the divide-by-zero will go
unnoticed, and we'll instead SIGSEGV when we hit the "refs_hash[j]"
access.

So move the test that should protect against this from mark_reachable()
into lookup_object_refs(), which incidentally in the process also fixes
mark_reachable() itself (it used to not mark the one object that _was_
reachable, because it decided that it had no refs too early).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agounpack-objects desperately salvages objects from a corrupt pack
Junio C Hamano [Mon, 4 Sep 2006 05:55:54 +0000 (22:55 -0700)]
unpack-objects desperately salvages objects from a corrupt pack

The command unpack-objects dies upon the first error.  This is
probably considered a feature -- if a pack is corrupt, instead
of trying to extract from it and possibly risking to contaminate
a good repository with objects whose validity is dubious, we
should seek a good copy of the pack and retry.  However, we may
not have any good copy anywhere.  This implements the last
resort effort to extract what are salvageable from such a
corrupt pack.

This flag might have helped Sergio when recovering from a
corrupt pack.  In my test, it managed to salvage 247 objects out
of a pack that had 251 objects but without it the command
stopped after extracting 73 objects.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomore lightweight revalidation while reusing deflated stream in packing
Junio C Hamano [Mon, 4 Sep 2006 04:09:18 +0000 (21:09 -0700)]
more lightweight revalidation while reusing deflated stream in packing

When copying from an existing pack and when copying from a loose
object with new style header, the code makes sure that the piece
we are going to copy out inflates well and inflate() consumes
the data in full while doing so.

The check to see if the xdelta really apply is quite expensive
as you described, because you would need to have the image of
the base object which can be represented as a delta against
something else.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Change the name of diff to parent link in "commit" view to "diff
Jakub Narebski [Sun, 3 Sep 2006 21:43:03 +0000 (23:43 +0200)]
gitweb: Change the name of diff to parent link in "commit" view to "diff

Change the name of diff to parent (current commit to one of parents)
link in "commit" view (git_commit subroutine) from "commitdiff" to
"diff".  Let's leave "commitdiff" for equivalent of git-show, or
git-diff-tree with one revision, i.e. diff for a given commit to its
parent (parents).

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agopack-objects: fix thinko in revalidate code
Junio C Hamano [Sun, 3 Sep 2006 21:44:46 +0000 (14:44 -0700)]
pack-objects: fix thinko in revalidate code

When revalidating an entry from an existing pack entry->size and
entry->type are not necessarily the size of the final object
when the entry is deltified, but for base objects they must
match.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoUpdate GIT_TRACE documentation.
Christian Couder [Sun, 3 Sep 2006 15:32:24 +0000 (17:32 +0200)]
Update GIT_TRACE documentation.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'master' into cc/trace
Junio C Hamano [Sun, 3 Sep 2006 00:10:16 +0000 (17:10 -0700)]
Merge branch 'master' into cc/trace

* master:
  Trace into a file or an open fd and refactor tracing code.
  Replace uses of strdup with xstrdup.
  consolidate two copies of new style object header parsing code.
  Documentation: Fix howto/revert-branch-rebase.html generation
  fmt-merge-msg: fix off-by-one bug
  git-rev-list(1): group options; reformat; document more options
  Constness tightening for move/link_temp_to_file()
  gitweb: Fix git_blame
  Include config.mak.autogen in the doc Makefile
  Use xmalloc instead of malloc
  git(7): move gitk(1) to the list of porcelain commands
  gitk: Fix some bugs in the new cherry-picking code
  gitk: Improve responsiveness while reading and layout out the graph
  gitk: Update preceding/following tag info when creating a tag
  gitk: Add a menu item for cherry-picking commits
  gitk: Fix a couple of buglets in the branch head menu items
  gitk: Add a context menu for heads
  gitk: Add a row context-menu item for creating a new branch
  gitk: Recompute ancestor/descendent heads/tags when rereading refs
  gitk: Minor cleanups

18 years agopack-objects: re-validate data we copy from elsewhere.
Junio C Hamano [Fri, 1 Sep 2006 22:05:12 +0000 (15:05 -0700)]
pack-objects: re-validate data we copy from elsewhere.

When reusing data from an existing pack and from a new style
loose objects, we used to just copy it staight into the
resulting pack.  Instead make sure they are not corrupt, but
do so only when we are not streaming to stdout, in which case
the receiving end will do the validation either by unpacking
the stream or by constructing the .idx file.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoTrace into a file or an open fd and refactor tracing code.
Christian Couder [Sat, 2 Sep 2006 16:23:48 +0000 (18:23 +0200)]
Trace into a file or an open fd and refactor tracing code.

If GIT_TRACE is set to an absolute path (starting with a
'/' character), we interpret this as a file path and we
trace into it.

Also if GIT_TRACE is set to an integer value greater than
1 and lower than 10, we interpret this as an open fd value
and we trace into it.

Note that this behavior is not compatible with the
previous one.

We also trace whole messages using one write(2) call to
make sure messages from processes do net get mixed up in
the middle.

This patch makes it possible to get trace information when
running "make test".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoReplace uses of strdup with xstrdup.
Shawn Pearce [Sat, 2 Sep 2006 04:16:31 +0000 (00:16 -0400)]
Replace uses of strdup with xstrdup.

Like xmalloc and xrealloc xstrdup dies with a useful message if
the native strdup() implementation returns NULL rather than a
valid pointer.

I just tried to use xstrdup in new code and found it to be missing.
However I expected it to be present as xmalloc and xrealloc are
already commonly used throughout the code.

[jc: removed the part that deals with last_XXX, which I am
 finding more and more dubious these days.]

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoconsolidate two copies of new style object header parsing code.
Junio C Hamano [Fri, 1 Sep 2006 22:17:01 +0000 (15:17 -0700)]
consolidate two copies of new style object header parsing code.

Also while we are at it, remove redundant typename[] array from
unpack_sha1_header.  The only reason it is different from the
type_names[] array in object.c module is that this code cares
about the subset of object types that are valid in a loose
object, so prepare a separate array of boolean that tells us
which types are valid, and share the name translation with the
others.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation: Fix howto/revert-branch-rebase.html generation
Sergey Vlasov [Fri, 1 Sep 2006 18:42:59 +0000 (22:42 +0400)]
Documentation: Fix howto/revert-branch-rebase.html generation

The rule for howto/*.html used "$?", which expands to the list of all
newer prerequisites, including asciidoc.conf added by another rule.
"$<" should be used instead.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofmt-merge-msg: fix off-by-one bug
Johannes Schindelin [Fri, 1 Sep 2006 08:49:29 +0000 (10:49 +0200)]
fmt-merge-msg: fix off-by-one bug

Thanks to the recent malloc()->xmalloc() change, and XMALLOC_POISON, this bug
was found.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-rev-list(1): group options; reformat; document more options
Jonas Fonseca [Thu, 31 Aug 2006 22:37:15 +0000 (00:37 +0200)]
git-rev-list(1): group options; reformat; document more options

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge git://git.kernel.org/pub/scm/gitk/gitk
Junio C Hamano [Fri, 1 Sep 2006 07:54:01 +0000 (00:54 -0700)]
Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix some bugs in the new cherry-picking code
  gitk: Improve responsiveness while reading and layout out the graph
  gitk: Update preceding/following tag info when creating a tag
  gitk: Add a menu item for cherry-picking commits
  gitk: Fix a couple of buglets in the branch head menu items
  gitk: Add a context menu for heads
  gitk: Add a row context-menu item for creating a new branch
  gitk: Recompute ancestor/descendent heads/tags when rereading refs
  gitk: Minor cleanups

18 years agoConstness tightening for move/link_temp_to_file()
Junio C Hamano [Fri, 1 Sep 2006 07:17:47 +0000 (00:17 -0700)]
Constness tightening for move/link_temp_to_file()

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Fix git_blame
Aneesh Kumar K.V [Fri, 1 Sep 2006 03:43:32 +0000 (09:13 +0530)]
gitweb: Fix git_blame

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoInclude config.mak.autogen in the doc Makefile
Jonas Fonseca [Thu, 31 Aug 2006 22:31:08 +0000 (00:31 +0200)]
Include config.mak.autogen in the doc Makefile

... to install documentation relative to the path set with configure's
--prefix option.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoUse xmalloc instead of malloc
Jonas Fonseca [Thu, 31 Aug 2006 22:32:39 +0000 (00:32 +0200)]
Use xmalloc instead of malloc

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit(7): move gitk(1) to the list of porcelain commands
Jonas Fonseca [Thu, 31 Aug 2006 23:15:38 +0000 (01:15 +0200)]
git(7): move gitk(1) to the list of porcelain commands

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoTrace into open fd and refactor tracing code.
Christian Couder [Thu, 31 Aug 2006 06:42:11 +0000 (08:42 +0200)]
Trace into open fd and refactor tracing code.

Now if GIT_TRACE is set to an integer value greater than 1
and lower than 10, we interpret this as an open fd value
and we trace into it. Note that this behavior is not
compatible with the previous one.

We also trace whole messages using one write(2) call to
make sure messages from processes do net get mixed up in
the middle.

It's now possible to run the tests like this:

GIT_TRACE=9 make test 9>/var/tmp/trace.log

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agot5710: fix two thinkos.
Junio C Hamano [Thu, 31 Aug 2006 21:14:20 +0000 (14:14 -0700)]
t5710: fix two thinkos.

The intention of the test seems to be to build a long chain of
clones that locally borrow objects from their parents and see the
system give up dereferencing long chains.  There were two problems:

 (1) it did not test the right repository;
 (2) it did not build a chain long enough to trigger the limitation.

I do not think it is a good test to make sure the limitation the
current implementation happens to have still exists, but that is
a topic at a totally different level.

At least this fixes the broken test.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge early part of branch 'jc/daemon'
Junio C Hamano [Thu, 31 Aug 2006 20:00:39 +0000 (13:00 -0700)]
Merge early part of branch 'jc/daemon'

18 years agogitweb: Extend parse_difftree_raw_line to save commit info
Jakub Narebski [Wed, 30 Aug 2006 22:36:04 +0000 (00:36 +0200)]
gitweb: Extend parse_difftree_raw_line to save commit info

Extend parse_difftree_raw_line to save commit info from when
git-diff-tree is given only one <tree-ish>, for example when fed
from git-rev-list using --stdin option.

git-diff-tree outputs a line with the commit ID when applicable.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Separate printing of git_tree row into git_print_tree_entry
Jakub Narebski [Wed, 30 Aug 2006 22:35:07 +0000 (00:35 +0200)]
gitweb: Separate printing of git_tree row into git_print_tree_entry

This is preparation for "tree blame" (similar to what ViewVC shows)
output, i.e. for each entry give commit where it was changed.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Move git-ls-tree output parsing to parse_ls_tree_line
Jakub Narebski [Wed, 30 Aug 2006 22:32:15 +0000 (00:32 +0200)]
gitweb: Move git-ls-tree output parsing to parse_ls_tree_line

Add new subroutine parse_ls_tree_line and use it in git_tree.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agouse do() instead of require() to include configuration
Dennis Stosberg [Tue, 29 Aug 2006 07:19:02 +0000 (09:19 +0200)]
use do() instead of require() to include configuration

When run under mod_perl, require() will read and execute the configuration
file on the first invocation only.  On every subsequent invocation, all
configuration variables will be reset to their default values.  do() reads
and executes the configuration file unconditionally.

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Remove forgotten call to git_to_hash
Dennis Stosberg [Thu, 31 Aug 2006 19:32:45 +0000 (21:32 +0200)]
gitweb: Remove forgotten call to git_to_hash

On Aug 27th, Jakub Narebski sent a patch which removed the git_to_hash()
function and this call to it. The patch did not apply cleanly and had to
be applied manually. Removing the last chunk has obviously been forgotten.

See: commit  0aea33762b1262d11fb43eda9f3fc152b5622cca and
     message <200608272345.26722.jnareb@gmail.com>

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agolog-tree.c: cleanup a bit append_signoff()
Franck Bui-Huu [Tue, 29 Aug 2006 11:37:06 +0000 (13:37 +0200)]
log-tree.c: cleanup a bit append_signoff()

This patch clean up append_signoff() by moving specific code that
looks up for "^[-A-Za-z]+: [^@]+@" pattern into a function.

It also stops the primary search when the cursor oversteps
'buf + at' limit.

This patch changes slightly append_signoff() behaviour too. If we
detect any Signed-off-by pattern during the primary search, we
needn't to do a pattern research after.

Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRemove uneeded #include
Johannes Schindelin [Tue, 29 Aug 2006 11:02:35 +0000 (13:02 +0200)]
Remove uneeded #include

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMakefile: fix typo
Johannes Schindelin [Tue, 29 Aug 2006 10:51:14 +0000 (12:51 +0200)]
Makefile: fix typo

We checked NO_SETENV instead of NO_UNSETENV to decide if unsetenv
is available.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agounpack-objects: remove unused variable "eof"
Johannes Schindelin [Tue, 29 Aug 2006 10:50:29 +0000 (12:50 +0200)]
unpack-objects: remove unused variable "eof"

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-fsck-objects: lacking default references should not be fatal
Linus Torvalds [Tue, 29 Aug 2006 18:47:30 +0000 (11:47 -0700)]
git-fsck-objects: lacking default references should not be fatal

The comment added says it all: if we have lost all references in a git
archive, git-fsck-objects should still work, so instead of dying it should
just notify the user about that condition.

This change was triggered by me just doing a "git-init-db" and then
populating that empty git archive with a pack/index file to look at it.
Having git-fsck-objects not work just because I didn't have any references
handy was rather irritating, since part of the reason for running
git-fsck-objects in the first place was to _find_ the missing references.

However, "--unreachable" really doesn't make sense in that situation, and
we want to turn it off to protect anybody who uses the old "git prune"
shell-script (rather than the modern built-in). The old pruning script
used to remove all objects that were reported as unreachable, and without
any refs, that obviously means everything - not worth it.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoCheck if pack directory exists prior to descending into it
Matthias Kestenholz [Tue, 29 Aug 2006 09:12:14 +0000 (11:12 +0200)]
Check if pack directory exists prior to descending into it

This fixes the following warning:

git-repack: line 42: cd: .git/objects/pack: No such file or directory

This happens only, when git-repack -a is run without any packs in the
repository.

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Add local time and timezone to git_print_authorship
Jakub Narebski [Mon, 28 Aug 2006 21:17:31 +0000 (23:17 +0200)]
gitweb: Add local time and timezone to git_print_authorship

Add local time (hours and minutes) and local timezone to the output of
git_print_authorship command, used by git_commitdiff.  The code was
taken from git_commit subroutine.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Add diff tree, with links to patches, to commitdiff view
Jakub Narebski [Mon, 28 Aug 2006 12:48:14 +0000 (14:48 +0200)]
gitweb: Add diff tree, with links to patches, to commitdiff view

Added/uncommented git_difftree_body invocation in git_commitdiff.
Added anchors (via 'id' attribute) to patches in patchset.
git_difftree_body is modified to link to patch anchor when called from
git_commitdiff, instead of link to blobdiff.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: git_print_log: signoff line is non-empty line
Jakub Narebski [Mon, 28 Aug 2006 12:48:13 +0000 (14:48 +0200)]
gitweb: git_print_log: signoff line is non-empty line

This correct minor error in git_print_log that didn't add final empty
line when requested, if commit log ended with signoff.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Add author information to commitdiff view
Jakub Narebski [Mon, 28 Aug 2006 12:48:12 +0000 (14:48 +0200)]
gitweb: Add author information to commitdiff view

Add subroutine git_print_authorship to print author and date of
commit, div.author_date style to CSS, and use them in git_commitdiff.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Do not remove signoff lines in git_print_simplified_log
Jakub Narebski [Mon, 28 Aug 2006 12:48:11 +0000 (14:48 +0200)]
gitweb: Do not remove signoff lines in git_print_simplified_log

Remove '-remove_signoff => 1' option to git_print_log call in the
git_print_simplified_log subroutine.  This means that in "log" and
"commitdiff" views (git_log and git_commitdiff subroutines) signoff
lines will be shown.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Make git_print_log generic; git_print_simplified_log uses it
Jakub Narebski [Mon, 28 Aug 2006 12:48:10 +0000 (14:48 +0200)]
gitweb: Make git_print_log generic; git_print_simplified_log uses it

Collapse git_print_log and git_print_simplified_log into one
subroutine git_print_log.  git_print_simplified_log now simply calls
git_print_log with proper options.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Use --git-dir parameter instead of setting $ENV{'GIT_DIR'}
Dennis Stosberg [Mon, 28 Aug 2006 15:49:58 +0000 (17:49 +0200)]
gitweb: Use --git-dir parameter instead of setting $ENV{'GIT_DIR'}

This makes it possible to run gitweb under mod_perl's Apache::Registry.

It needs a fairly new git version, with --git-dir=<path>
parameter to git wrapper, i.e. post v1.4.2-rc2-g6acbcb9 version.

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd --relative-date option to the revision interface
Jonas Fonseca [Mon, 28 Aug 2006 13:52:13 +0000 (15:52 +0200)]
Add --relative-date option to the revision interface

Exposes the infrastructure from 9a8e35e98793af086f05d1ca9643052df9b44a74.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'gl/web'
Junio C Hamano [Mon, 28 Aug 2006 23:20:28 +0000 (16:20 -0700)]
Merge branch 'gl/web'

* gl/web: (46 commits)
  gitweb: Use @diff_opts, default ('M'), as git-diff and git-diff-tree paramete
  gitweb: Remove git_to_hash function
  gitweb: Remove unused git_get_{preceding,following}_references
  gitweb: Fix typo in git_patchset_body
  gitweb: Fix typo in git_difftree_body
  gitweb: blobs defined by non-textual hash ids can be cached
  gitweb: Improve comments about gitweb features configuration
  gitweb: Remove workaround for git-diff bug fixed in f82cd3c
  gitweb: Remove creating directory for temporary files
  gitweb: Remove git_diff_print subroutine
  gitweb: git_blobdiff_plain is git_blobdiff('plain')
  gitweb: Use git-diff-tree or git-diff patch output for blobdiff
  gitweb: Change here-doc back for style consistency in git_blobdiff
  gitweb: Always display link to blobdiff_plain in git_blobdiff
  gitweb: Add invisible hyperlink to from-file/to-file diff header
  gitweb: Parse two-line from-file/to-file diff header in git_patchset_body
  gitweb: Allow for pre-parsed difftree info in git_patchset_body
  gitweb: Add support for hash_parent_base parameter for blobdiffs
  gitweb: Use git_get_name_rev_tags for commitdiff_plain X-Git-Tag: header
  gitweb: Add git_get_rev_name_tags function
  ...

18 years agogitk: Fix some bugs in the new cherry-picking code
Paul Mackerras [Mon, 28 Aug 2006 12:41:09 +0000 (22:41 +1000)]
gitk: Fix some bugs in the new cherry-picking code

When inserting the new commit row for the cherry-picked commit, we weren't
advancing the selected line (if there is one), and we weren't updating
commitlisted properly.

18 years agomulti-service daemon: documentation
Junio C Hamano [Mon, 21 Aug 2006 02:32:43 +0000 (19:32 -0700)]
multi-service daemon: documentation

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodaemon: add upload-tar service.
Junio C Hamano [Mon, 21 Aug 2006 02:03:50 +0000 (19:03 -0700)]
daemon: add upload-tar service.

This allows clients to ask for tarballs with:

git tar-tree --remote=git://server/repo refname

By default, the upload-tar service is not enabled.  To enable
it server-wide, the server can be started with:

git-daemon --enable=upload-tar

This service is by default overridable per repostiory, so
alternatively, a repository can define "daemon.uploadtar = true"
to enable it.

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