Code

git.git
18 years agogitweb: fix $project usage
Matthias Lederhofer [Sun, 6 Aug 2006 11:25:41 +0000 (13:25 +0200)]
gitweb: fix $project usage

There were some places where $project was used even if it was not
defined.

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: fix commitdiff_plain for root commits
Matthias Lederhofer [Sun, 6 Aug 2006 17:24:47 +0000 (19:24 +0200)]
gitweb: fix commitdiff_plain for root commits

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Skip nonmatching lines in difftree output, consistently
Jakub Narebski [Sun, 6 Aug 2006 15:59:52 +0000 (17:59 +0200)]
gitweb: Skip nonmatching lines in difftree output, consistently

This fixes error for commitdiff on root commit (without parents).

Noticed-by: Matthias Lederhofer (matled)
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: fix commitdiff for root commits
Jakub Narebski [Sun, 6 Aug 2006 14:14:25 +0000 (16:14 +0200)]
gitweb: fix commitdiff for root commits

After changing all "-|" open invocations to list form, commitdiff for
initial commit (without parent) got broken; it returned incorrectly
empty patch earlier.  Use '--root' option to git-diff-tree for initial
(root) commit.

No checking for empty $hash_parent in git_commitdiff_plain -- we rely
on gitweb to give correct parameters for commitdiff_plain action.

Noticed by Matthias Lederhofer (matled).

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: check if HTTP_ACCEPT is really set
Matthias Lederhofer [Sun, 6 Aug 2006 13:55:02 +0000 (15:55 +0200)]
gitweb: check if HTTP_ACCEPT is really set

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd gitweb.cgi to .gitignore
Matthias Kestenholz [Sun, 6 Aug 2006 10:47:33 +0000 (12:47 +0200)]
Add gitweb.cgi to .gitignore

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Refactor untabifying - converting tabs to spaces
Jakub Narebski [Sun, 6 Aug 2006 00:08:31 +0000 (02:08 +0200)]
gitweb: Refactor untabifying - converting tabs to spaces

Add untabify subroutine and use it.  It also fixes git_diff_print
which used to get the tabstop wrong.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Inline $rss_link
Jakub Narebski [Sat, 5 Aug 2006 11:18:58 +0000 (13:18 +0200)]
gitweb: Inline $rss_link

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: PATH_INFO=/ means no project
Jakub Narebski [Sat, 5 Aug 2006 11:16:03 +0000 (13:16 +0200)]
gitweb: PATH_INFO=/ means no project

Prepared for refactoring input validation.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: No error messages with unescaped/unprotected user input
Jakub Narebski [Sat, 5 Aug 2006 11:15:24 +0000 (13:15 +0200)]
gitweb: No error messages with unescaped/unprotected user input

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: No periods for error messages
Jakub Narebski [Sat, 5 Aug 2006 11:13:53 +0000 (13:13 +0200)]
gitweb: No periods for error messages

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Acked-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Cleanup and uniquify error messages
Jakub Narebski [Sat, 5 Aug 2006 11:12:51 +0000 (13:12 +0200)]
gitweb: Cleanup and uniquify error messages

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Don't undefine query parameter related variables before die_error
Jakub Narebski [Sat, 5 Aug 2006 10:58:06 +0000 (12:58 +0200)]
gitweb: Don't undefine query parameter related variables before die_error

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Use undef for die_error to use default first (status) parameter value
Jakub Narebski [Sat, 5 Aug 2006 10:56:42 +0000 (12:56 +0200)]
gitweb: Use undef for die_error to use default first (status) parameter value

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: die_error first (optional) parameter is HTTP status
Jakub Narebski [Sat, 5 Aug 2006 10:56:04 +0000 (12:56 +0200)]
gitweb: die_error first (optional) parameter is HTTP status

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Separate input validation and dispatch, add comment about opml action
Jakub Narebski [Sat, 5 Aug 2006 10:55:20 +0000 (12:55 +0200)]
gitweb: Separate input validation and dispatch, add comment about opml action

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix "grep -w"
Junio C Hamano [Sat, 5 Aug 2006 05:16:42 +0000 (22:16 -0700)]
Fix "grep -w"

We used to find the first match of the pattern and then if the
match is not for the entire word, declared that the whole line
does not match.

But that is wrong.  The command "git grep -w -e mmap" should
find that a line "foo_mmap bar mmap baz" matches, by tring the
second instance of pattern "mmap" on the same line.

Problems an earlier round of "fix" had were pointed out by Morten
Welinder, which have been incorporated in the t7002 tests.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMakefile: Cygwin does not seem to need NO_STRLCPY
Junio C Hamano [Sat, 5 Aug 2006 07:20:51 +0000 (00:20 -0700)]
Makefile: Cygwin does not seem to need NO_STRLCPY

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocommit walkers: setup_ident() to record correct committer in ref-log.
Ramsay Jones [Fri, 4 Aug 2006 21:01:34 +0000 (22:01 +0100)]
commit walkers: setup_ident() to record correct committer in ref-log.

The function pull() in fetch.c calls write_ref_sha1(), which may
need committer identity to update the ref-log, so they need to
call setup_ident() before calling git_config() function.

Acked-by: Shawn Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agohttp-push: avoid fork() by calling merge_bases() directly
Johannes Schindelin [Fri, 4 Aug 2006 15:50:41 +0000 (17:50 +0200)]
http-push: avoid fork() by calling merge_bases() directly

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAllow config file to specify Signed-off-by identity in format-patch.
Ramsay Jones [Fri, 4 Aug 2006 21:01:30 +0000 (22:01 +0100)]
Allow config file to specify Signed-off-by identity in format-patch.

Unlike git-commit, git-format-patch was not picking up and using the
user.email config variable for the email part of the committer info.
I was forced to use the GIT_COMMITTER_EMAIL environment variable to
override the default <user@localhost.localdomain>. The fix was to
simply move the call to setup_ident() to come before the git_config()
call.

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: git_tree displays blame based on repository config
Luben Tuikov [Fri, 4 Aug 2006 22:14:27 +0000 (15:14 -0700)]
gitweb: git_tree displays blame based on repository config

git_tree() will now conditionally display "blame"
depending on how "gitweb.blame" variable is configured
using "git-repo-config".

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoautoconf: NO_IPV6
Junio C Hamano [Fri, 4 Aug 2006 23:46:16 +0000 (16:46 -0700)]
autoconf: NO_IPV6

We would need both "struct addrinfo" and getaddrinfo()
available.  Check them and set NO_IPV6 otherwise.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoautoconf: Set NEEDS_LIBICONV unconditionally if there is no iconv in libc
Jakub Narebski [Fri, 4 Aug 2006 21:28:11 +0000 (23:28 +0200)]
autoconf: Set NEEDS_LIBICONV unconditionally if there is no iconv in libc

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoautoconf: fix NEEDS_SSL_WITH_CRYPTO
Junio C Hamano [Fri, 4 Aug 2006 23:33:18 +0000 (16:33 -0700)]
autoconf: fix NEEDS_SSL_WITH_CRYPTO

NEEDS_SSL_WITH_CRYPTO means you cannot just say "-lcrypto" to
use SHA1 stuff, but need to say "-lcrypto -lssl".

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/c99'
Junio C Hamano [Fri, 4 Aug 2006 19:09:53 +0000 (12:09 -0700)]
Merge branch 'jc/c99'

* jc/c99:
  Cygwin needs NO_C99_FORMAT???

18 years agoCopy description of new build configuration variables to configure.ac
Jakub Narebski [Fri, 4 Aug 2006 15:55:59 +0000 (17:55 +0200)]
Copy description of new build configuration variables to configure.ac

Copy description of new build configuration variables from the
commentary in the top Makefile, namely NO_FINK and NO_DARWIN_PORTS
configuration variables, putting them in site configuration section.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoautoconf: Typo cleanup, reordering etc.
Jakub Narebski [Fri, 4 Aug 2006 15:55:58 +0000 (17:55 +0200)]
autoconf: Typo cleanup, reordering etc.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoautoconf: Check for ll hh j z t size specifiers introduced by C99
Jakub Narebski [Fri, 4 Aug 2006 15:55:57 +0000 (17:55 +0200)]
autoconf: Check for ll hh j z t size specifiers introduced by C99

Add custom test for checking whether formatted IO functions
(printf/scanf et.al.) support 'size specifiers' introduced by C99,
namely ll, hh, j, z, t. (representing long long int, char, intmax_t,
size_t, ptrdiff_t).

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix crash when GIT_DIR is invalid
Johannes Schindelin [Fri, 4 Aug 2006 15:46:19 +0000 (17:46 +0200)]
Fix crash when GIT_DIR is invalid

We used to test if a pointer was NULL, and if it was, try to access it.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-tar-tree: fix minor memory leak
Rene Scharfe [Fri, 4 Aug 2006 08:54:08 +0000 (10:54 +0200)]
git-tar-tree: fix minor memory leak

Free the root tree object buffer when we're done, plugging a minor leak
in generate_tar().  Note: we cannot simply free(tree.buf) because this
pointer is modified by tree_entry() calls in traverse_tree().

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocument rev-list's option --merge
Uwe Zeisberger [Fri, 4 Aug 2006 08:11:15 +0000 (10:11 +0200)]
Document rev-list's option --merge

Signed-off-by: Uwe Zeisberger <Uwe_Zeisberger@digi.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit.c: Rename NEEDS_PREFIX to RUN_SETUP
Junio C Hamano [Fri, 4 Aug 2006 09:04:00 +0000 (02:04 -0700)]
git.c: Rename NEEDS_PREFIX to RUN_SETUP

As Matthias Kestenholz noted, the flag does not quite mean
"needs prefix" -- it is more like "run setup_git_directory()
before running this command", so rename it to avoid future
confusion.

While we are at it, rewrite the definition of options to make it
obvious that we are talking about flag bits by using standard (1<<n)
notation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltins: Makefile clean-up
Junio C Hamano [Fri, 4 Aug 2006 08:51:04 +0000 (01:51 -0700)]
builtins: Makefile clean-up

This cleans up the build procedure for built-in commands by:

 - generating mostly redundant definition of BUILT_INS from
   BUILTIN_OBJS in the Makefile,
 - renaming a few files to make the above possible, and
 - sorting the built-in command table in git.c.

It might be a good idea to binary search (or perfect hash) the built-in
command table, but that can be done later when somebody feels like.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake git-checkout-index a builtin
Junio C Hamano [Fri, 4 Aug 2006 08:23:19 +0000 (01:23 -0700)]
Make git-checkout-index a builtin

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake git-symbolic-ref a builtin
Matthias Kestenholz [Thu, 3 Aug 2006 15:24:38 +0000 (17:24 +0200)]
Make git-symbolic-ref a builtin

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake git-unpack-objects a builtin
Matthias Kestenholz [Thu, 3 Aug 2006 15:24:37 +0000 (17:24 +0200)]
Make git-unpack-objects a builtin

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake git-pack-objects a builtin
Matthias Kestenholz [Thu, 3 Aug 2006 15:24:36 +0000 (17:24 +0200)]
Make git-pack-objects a builtin

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake git-name-rev a builtin
Matthias Kestenholz [Thu, 3 Aug 2006 15:24:35 +0000 (17:24 +0200)]
Make git-name-rev a builtin

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFurther clean-up: usage() vs die()
Junio C Hamano [Fri, 4 Aug 2006 04:55:41 +0000 (21:55 -0700)]
Further clean-up: usage() vs die()

This hopefully finishes the clean-up Ramsay started with recent
commit 15e593e4d37d1d350fef20ab666d58f6881c7f5f and commit
8cdf33643dc0b21d9ea922a3fdd7f64226c421aa.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoReplace some calls to die(usage_str) with usage(usage_str).
Ramsay Allan Jones [Thu, 3 Aug 2006 15:48:41 +0000 (16:48 +0100)]
Replace some calls to die(usage_str) with usage(usage_str).

The only change in behaviour should be having a "usage: " prefix
on the output string rather than "fatal: ", and an exit code of
129 rather than 128.

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFixup command names in some usage strings.
Ramsay Allan Jones [Thu, 3 Aug 2006 15:38:39 +0000 (16:38 +0100)]
Fixup command names in some usage strings.

Most usage strings, such as for command xxx, start with "git-xxx".
This updates the rebels to conform to the general pattern.
(The git wrapper is an exception to this, of course ...)

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoGIT 1.4.2-rc3 v1.4.2-rc3
Junio C Hamano [Thu, 3 Aug 2006 23:40:20 +0000 (16:40 -0700)]
GIT 1.4.2-rc3

We ended up merging too many stuff after -rc2, so here is
another round of release candidate.  Non bugfixes will be
queued to "next" from now on until a real 1.4.2 happens.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation/git.txt: link git-svn and git-instaweb from the main page.
Junio C Hamano [Thu, 3 Aug 2006 23:28:24 +0000 (16:28 -0700)]
Documentation/git.txt: link git-svn and git-instaweb from the main page.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/sideband'
Junio C Hamano [Thu, 3 Aug 2006 23:02:14 +0000 (16:02 -0700)]
Merge branch 'jc/sideband'

* jc/sideband:
  sideband: do not use color, just say "remote:"
  fetch/clone: mark messages from remote side stand out.

18 years agosideband: do not use color, just say "remote:"
Junio C Hamano [Thu, 3 Aug 2006 23:01:58 +0000 (16:01 -0700)]
sideband: do not use color, just say "remote:"

... per suggestion by Andrew.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoShow both blob names from "git diff blob1 blob2"
Junio C Hamano [Thu, 3 Aug 2006 18:57:11 +0000 (11:57 -0700)]
Show both blob names from "git diff blob1 blob2"

Earlier we deliberately showed only blob1's name because showing
both names labeled the output as a renaming patch.  Now the output
routine (namely, diff.c::resolve_rename_copy()) is taught not to
use pathname comparison to tell if a filepair is a rename, we can
safely do this change.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodiff.c: do not use pathname comparison to tell renames
Junio C Hamano [Thu, 3 Aug 2006 19:01:01 +0000 (12:01 -0700)]
diff.c: do not use pathname comparison to tell renames

The final output from diff used to compare pathnames between
preimage and postimage to tell if the filepair is a rename/copy.
By explicitly marking the filepair created by diffcore_rename(),
the output routine, resolve_rename_copy(), does not have to do
so anymore.  This helps feeding a filepair that has different
pathnames in one and two elements to the diff machinery (most
notably, comparing two blobs).

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd a couple of subdirectory tests.
Junio C Hamano [Thu, 3 Aug 2006 21:41:29 +0000 (14:41 -0700)]
Add a couple of subdirectory tests.

We still have too few of them, but we have to start from somewhere.
The general rule is to make tests easy to debug when run with -v (notice
use of seemingly useless echo everywhere in the new tests).

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoread-tree: shadowed variable fix.
Junio C Hamano [Thu, 3 Aug 2006 20:44:09 +0000 (13:44 -0700)]
read-tree: shadowed variable fix.

Recent changes to built-ins broke committing from subdirectory,
because the unused parameter "prefix" shadowed a global variable.

Spotted by Jeff King.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofixed variable declaration in gitk
Michael [Thu, 3 Aug 2006 15:42:44 +0000 (17:42 +0200)]
fixed variable declaration in gitk

Signed-off-by: Michael <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix "git diff blob1 blob2" showing the diff in reverse.
Junio C Hamano [Thu, 3 Aug 2006 18:50:10 +0000 (11:50 -0700)]
Fix "git diff blob1 blob2" showing the diff in reverse.

This was introduced by mistake when revision.c::add_pending_object()
was modified to use object-array instead of object-list.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoautoconf: Add support for setting PYTHON_PATH or NO_PYTHON
Jakub Narebski [Wed, 2 Aug 2006 22:40:40 +0000 (00:40 +0200)]
autoconf: Add support for setting PYTHON_PATH or NO_PYTHON

This patch adds support for setting either PYTHON_PATH or NO_PYTHON to
autoconf generated ./configure script via --with-python=PATH (sets
PYTHON_PATH) or --without-python (sets NO_PYTHON).  Autodetect
PYTHON_PATH via AC_PATH_PROGS.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoautoconf: Move site configuration section earlier in configure.ac
Jakub Narebski [Wed, 2 Aug 2006 22:38:56 +0000 (00:38 +0200)]
autoconf: Move site configuration section earlier in configure.ac

Move site configuration section, i.e. --with-PACKAGE[=ARG] and
--without-PACKAGE, --enable-FEATURE[=ARG] and --disable-FEATURE
options to the beginning of configure.ac file, just after definitions
of macros.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoautoconf: Add support for setting SHELL_PATH and PERL_PATH
Jakub Narebski [Wed, 2 Aug 2006 22:38:11 +0000 (00:38 +0200)]
autoconf: Add support for setting SHELL_PATH and PERL_PATH

This patch adds support for setting SHELL_PATH and PERL_PATH to
autoconf generated ./configure script via --with-shell=PATH and
--with-perl=PATH options.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoCygwin needs NO_C99_FORMAT???
Junio C Hamano [Wed, 2 Aug 2006 22:44:07 +0000 (15:44 -0700)]
Cygwin needs NO_C99_FORMAT???

I noticed that t3800 test breaks with git built without this
option.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-grep: document --and, --or, --not, ( and )
Matthias Lederhofer [Wed, 2 Aug 2006 22:04:56 +0000 (00:04 +0200)]
git-grep: document --and, --or, --not, ( and )

[jc: added an example section.]

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agouse declarations from builtin.h for builtin commands
Matthias Kestenholz [Wed, 2 Aug 2006 21:52:00 +0000 (23:52 +0200)]
use declarations from builtin.h for builtin commands

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake git-repo-config a builtin
Matthias Kestenholz [Wed, 2 Aug 2006 21:51:59 +0000 (23:51 +0200)]
Make git-repo-config a builtin

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: do not use @@FOO@@ for replaced tokens
Junio C Hamano [Wed, 2 Aug 2006 20:50:20 +0000 (13:50 -0700)]
gitweb: do not use @@FOO@@ for replaced tokens

This makes it easier to run gitweb/gitweb.perl without token substitution.
Using @@ makes Perl emit "unintended interpolation" warnings.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: require $ENV{'GITWEB_CONFIG'}
Matthias Lederhofer [Wed, 2 Aug 2006 20:29:36 +0000 (22:29 +0200)]
gitweb: require $ENV{'GITWEB_CONFIG'}

With this patch it is possible to use gitweb.perl for developing by
loading the configuration from $GITWEB_CONFIG.  This might also be
useful for normal usage of gitweb.

Example:

    % cat cfg
    $GIT = '/usr/bin/git';
    $projectroot = '/home/matled/src/git';
    $projects_list = '/home/matled/src/git/git/gitweb/list';
    % cat run
    #!/bin/sh
    export GATEWAY_INTERFACE="CGI/1.1"
    export HTTP_ACCEPT="*/*"
    export REQUEST_METHOD="GET"
    export GITWEB_CONFIG='./cfg'
    export QUERY_STRING=""$1""
    exec ./gitweb.perl
    % time ./run p=git/.git > /dev/null

This makes it easy to check for warnings and do performance tests
after changes, you can also pipe this to lynx -dump -force-html
/dev/stdin to get more than just html.

This also documents the original patch adding require $GITWEB_CONFIG.

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: optionally read config from GITWEB_CONFIG
Jeff King [Wed, 2 Aug 2006 19:23:34 +0000 (15:23 -0400)]
gitweb: optionally read config from GITWEB_CONFIG

Configuration will first be taken from variables inside the gitweb.cgi
script, which in turn come from the Makefile. Afterwards, the contents of
GITWEB_CONFIG are read, overriding the builtin defaults.

This should eliminate the need for editing the gitweb script at all. Users
should edit the Makefile and/or add a config file.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake git-prune-packed a builtin
Matthias Kestenholz [Wed, 2 Aug 2006 16:32:32 +0000 (18:32 +0200)]
Make git-prune-packed a builtin

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-annotate: remove extraneous debugging line
Jeff King [Wed, 2 Aug 2006 16:34:44 +0000 (12:34 -0400)]
git-annotate: remove extraneous debugging line

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation: convert uses of git-link macro to gitlink
Jeff King [Wed, 2 Aug 2006 16:32:32 +0000 (12:32 -0400)]
Documentation: convert uses of git-link macro to gitlink

There isn't and never was such a macro; all uses are typos.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-push: remove obsolete git-push.sh
Jeff King [Wed, 2 Aug 2006 15:37:42 +0000 (11:37 -0400)]
git-push: remove obsolete git-push.sh

This was converted to a C builtin over three months ago.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-push: allow -f as an alias for --force
Jeff King [Wed, 2 Aug 2006 15:28:16 +0000 (11:28 -0400)]
git-push: allow -f as an alias for --force

This was already documented in the options section of the manpage. This
patch implements it, adds it to the usage message, and mentions it at the
top of the manpage.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix header breakage with _XOPEN_SOURCE.
Ramsay Allan Jones [Sun, 30 Jul 2006 15:52:09 +0000 (16:52 +0100)]
Fix header breakage with _XOPEN_SOURCE.

convert-objects.c sets _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED before
including <time.h>, in order to get the declaration of strptime().
This leads to breakage in cache.h, due to S_ISLNK and S_IFLNK no longer
being defined by <sys/stat.h>.  These definitions are protected by the
__USE_BSD symbol, which is not set when _XOPEN_SOURCE is set.  Moving
the #defines and #include <time.h> below all other #includes does not
fix the problem, however, since now _USE_XOPEN, which protects the
declaration of strptime(), is now not defined (don't ask!).

The fix is to #define _GNU_SOURCE, which enables the definition of
practically everything.

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRemove cmd_usage() routine and re-organize the help/usage code.
Ramsay Allan Jones [Sun, 30 Jul 2006 21:42:25 +0000 (22:42 +0100)]
Remove cmd_usage() routine and re-organize the help/usage code.

The cmd_usage() routine was causing warning messages due to a NULL
format parameter being passed in three out of four calls. This is a
problem if you want to compile with -Werror. A simple solution is to
simply remove the GNU __attribute__ format pragma from the cmd_usage()
declaration in the header file. The function interface was somewhat
muddled anyway, so re-write the code to finesse the problem.

[jc: this incidentally revealed that t9100 test assumed that the output
 from "git help" to be fixed in stone, but this patch lower-cases
 "Usage" to "usage".  Update the test not to rely on "git help" output.]

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix header breakage due to redefining PATH_MAX.
Ramsay Allan Jones [Sun, 30 Jul 2006 16:00:40 +0000 (17:00 +0100)]
Fix header breakage due to redefining PATH_MAX.

The header builtin.h was, incorrectly, redefining PATH_MAX which
causes a header order dependency in builtin-write-tree.c.  The fix
is to simply include <limits.h> directly to obtain the correct
definition of PATH_MAX.

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd NO_C99_FORMAT to support older compilers.
Ramsay Allan Jones [Sun, 30 Jul 2006 15:38:28 +0000 (16:38 +0100)]
Add NO_C99_FORMAT to support older compilers.

The NO_C99_FORMAT macro allows compilers that lack support for the
ll,hh,j,z,t size specifiers (eg. gcc 2.95.2) to adapt the code to avoid
runtime errors in the formatted IO functions.

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoNew tests and en-passant modifications to mktag.
Ramsay Allan Jones [Sat, 29 Jul 2006 17:15:47 +0000 (18:15 +0100)]
New tests and en-passant modifications to mktag.

These changes were originally part of the next patch, but have been
split out since they were peripheral to the main purpose of that patch.

  - update comment describing the signature format to reflect
    the current code.
  - remove trailing \n in calls to error(), since a \n is already
    provided by error().
  - remove redundant call to get_sha1_hex().
  - call sha1_to_hex(sha1) to convert to ascii, rather than attempting
    to print the raw sha1.

The new tests provide a regression suite to support the modifications
to git-mktag in this and the next patch.

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix installation of templates on ancient systems.
Ramsay Allan Jones [Sat, 29 Jul 2006 16:25:03 +0000 (17:25 +0100)]
Fix installation of templates on ancient systems.

Do not use $(call) for 'shell quoting' paths, and pass DESTDIR down
to the templates makefile.

[jc: we have fixed the main Makefile long time ago, but somehow
 forgot to apply the same fix to templates Makefile.]

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix annotate test script; notice when git-annotate fails.
Ramsay Allan Jones [Sat, 29 Jul 2006 16:20:41 +0000 (17:20 +0100)]
Fix annotate test script; notice when git-annotate fails.

The t8001-annotate.sh test claimed all tests pass, when in fact
the git-annotate perl script failed to run! (prior to fixing the
script to work with perl 5.5).

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoEnsure git-clone exits with error if perl script fails.
Ramsay Allan Jones [Sat, 29 Jul 2006 16:12:34 +0000 (17:12 +0100)]
Ensure git-clone exits with error if perl script fails.

This helps tests 5400,5600,5700,5710 "fail correctly" rather than
give some false positives.  Also ensure cleanup actions in exit trap
work correctly even if user has alias rm='rm -i'.

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMakefile: gitweb/gitweb.cgi is now generated.
Junio C Hamano [Tue, 1 Aug 2006 23:23:47 +0000 (16:23 -0700)]
Makefile: gitweb/gitweb.cgi is now generated.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb/README: do not bug Kay with gitweb questions anymore
Junio C Hamano [Tue, 1 Aug 2006 22:56:28 +0000 (15:56 -0700)]
gitweb/README: do not bug Kay with gitweb questions anymore

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: use out-of-line GIT logo.
Martin Waitz [Sun, 30 Jul 2006 22:38:39 +0000 (00:38 +0200)]
gitweb: use out-of-line GIT logo.

Use the normal web server instead of the CGI to provide the git logo,
just like the gitweb.css.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: fill in gitweb configuration by Makefile
Martin Waitz [Tue, 1 Aug 2006 19:34:08 +0000 (21:34 +0200)]
gitweb: fill in gitweb configuration by Makefile

Generate gitweb/gitweb.cgi to reduce the need to patch gitweb.cgi
by the end user.  The GIT installation directory is already known
by the Makefile, and can be inserted directly into gitweb.
All other gitweb configuration parameters can now be specified by
providing GITWEB_* variables while building GIT.  These are described
in gitweb/README.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofetch/clone: mark messages from remote side stand out.
Junio C Hamano [Tue, 1 Aug 2006 08:34:53 +0000 (01:34 -0700)]
fetch/clone: mark messages from remote side stand out.

When dealing with a corrupt or out of sync remote repository,
the user often gets error messages like this:

error: refs/heads/devel does not point to a valid commit object!

which leaves the user wondering if the breakage is on the local
end or on the remote end.  This is unnecessarily alarming.

This patch changes the way we display messages received from the
remote side over the git protocol sideband (i.e. stderr stream
of the remote process).  It shows them with blue background with
white letters, but this presentation is subject to proposals of
better ways from the list.

The problem was pointed out by Andrew Morton.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'rs/rebase'
Junio C Hamano [Tue, 1 Aug 2006 06:02:28 +0000 (23:02 -0700)]
Merge branch 'rs/rebase'

* rs/rebase:
  rebase: Make the fast-fowarding message more user-friendly by using branch names instead of SHA1 IDs.
  rebase: Fix the detection of fast-forwarding of the current branch to upstream.

18 years agoMerge branch 'ml/pager'
Junio C Hamano [Tue, 1 Aug 2006 06:00:51 +0000 (23:00 -0700)]
Merge branch 'ml/pager'

18 years agoMerge branch 'jc/checkout'
Junio C Hamano [Tue, 1 Aug 2006 05:59:33 +0000 (22:59 -0700)]
Merge branch 'jc/checkout'

* jc/checkout:
  git-checkout: allow "checkout HEAD -- path"

18 years agogitweb: Refactoring git_project_list
Jakub Narebski [Tue, 1 Aug 2006 00:59:12 +0000 (02:59 +0200)]
gitweb: Refactoring git_project_list

Slightly reworking git_project_list, including moving setting $order,
as it is used only in this action. Mostly reindent.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: avoid undefined value warning in print_page_path
Junio C Hamano [Tue, 1 Aug 2006 04:00:16 +0000 (21:00 -0700)]
gitweb: avoid undefined value warning in print_page_path

The function unconditionally tried to match $type but some
callers did not pass it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: when showing history of a tree, show tree link not blob
Junio C Hamano [Tue, 1 Aug 2006 02:36:50 +0000 (19:36 -0700)]
gitweb: when showing history of a tree, show tree link not blob

Otherwise clicking on that erroneous blob link would produce nonsense.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: fix use of uninitialized value.
Junio C Hamano [Tue, 1 Aug 2006 02:24:37 +0000 (19:24 -0700)]
gitweb: fix use of uninitialized value.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: an obvious cut and paste error.
Junio C Hamano [Tue, 1 Aug 2006 02:12:18 +0000 (19:12 -0700)]
gitweb: an obvious cut and paste error.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: There can be more than two levels of subdirectories
Junio C Hamano [Tue, 1 Aug 2006 02:18:34 +0000 (19:18 -0700)]
gitweb: There can be more than two levels of subdirectories

Earlier code to read .git/refs/{tags,heads} hierarchy had a
hardcoded up-to-two-level assumption.  Lift it by using
File::Find.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: use a hash to lookup the sub for an action
Matthias Lederhofer [Mon, 31 Jul 2006 21:46:25 +0000 (23:46 +0200)]
gitweb: use a hash to lookup the sub for an action

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agopager: environment variable GIT_PAGER to override PAGER
Matthias Lederhofer [Mon, 31 Jul 2006 13:27:00 +0000 (15:27 +0200)]
pager: environment variable GIT_PAGER to override PAGER

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agopager: config variable pager.color
Matthias Lederhofer [Sat, 29 Jul 2006 22:27:43 +0000 (00:27 +0200)]
pager: config variable pager.color

enable/disable colored output when the pager is in use

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoBuiltins: control the use of pager from the command table.
Junio C Hamano [Mon, 31 Jul 2006 09:53:46 +0000 (02:53 -0700)]
Builtins: control the use of pager from the command table.

This moves the built-in "always-use-pager" logic for log family
to the command dispatch table of git wrapper.  This makes it
easier to change the default use of pager, and has an added
benefit that we fork and exec the pager early before packs are
mmapped.

Pointed out by Juergen Ruehle <j.ruehle@bmiag.de>.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix up some fallout from "setup_git_directory()" cleanups
Linus Torvalds [Mon, 31 Jul 2006 20:13:55 +0000 (13:13 -0700)]
Fix up some fallout from "setup_git_directory()" cleanups

git-ls-files was broken by the setup_git_directory() calling changes,
because I had missed the fact that the "prefix" variable in that file was
static to the whole file, and unlike git-ls-tree (where I had fixed it
up), it ended up using two different variables with the same name
depending on what the scoping happened to be.

This fixes it up properly (by just removing the static variable, and
passing the automatic one around properly), and git-ls-files should work
again.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Reordering code and dividing it into categories
Jakub Narebski [Mon, 31 Jul 2006 19:22:15 +0000 (21:22 +0200)]
gitweb: Reordering code and dividing it into categories

Reorder gitweb code around, divide it into sections (categories) and
add some comments.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Remove characters entities entirely when shortening string -- correction
Jakub Narebski [Mon, 31 Jul 2006 18:58:00 +0000 (20:58 +0200)]
gitweb: Remove characters entities entirely when shortening string -- correction

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: do not quote path for list version of open "-|"
Jakub Narebski [Mon, 31 Jul 2006 16:33:37 +0000 (18:33 +0200)]
gitweb: do not quote path for list version of open "-|"

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix double "close()" in ce_compare_data
Linus Torvalds [Mon, 31 Jul 2006 16:55:15 +0000 (09:55 -0700)]
Fix double "close()" in ce_compare_data

Doing an "strace" on "git diff" shows that we close() a file descriptor
twice (getting EBADFD on the second one) when we end up in ce_compare_data
if the index does not match the checked-out stat information.

The "index_fd()" function will already have closed the fd for us, so we
should not close it again.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Refactor generation of shortlog, tags and heads body
Jakub Narebski [Mon, 31 Jul 2006 09:22:13 +0000 (11:22 +0200)]
gitweb: Refactor generation of shortlog, tags and heads body

Add git_shortlog_body, git_tags_body and git_heads_body to generate
table with shortlog, tags and heads respectively in git_summary and
git_shortlog, git_tags, git_heads respectively.

Better support for lightweight tags in git_read_refs; currently only
lightweight tag pointing to tag object is not resolved fully.

Shortlog, tags and heads body tables have proper class now (we could
use id instead of class).

Add support for showing full comment on mouseover to tags list when
comment is shortened, similar to how full title of commit was/is
shown on mouseover when title was shortened.  Changed layout of tags
table to better show lightweight tags.

Add showing which branch (head) is current branch (current head),
using "current_head" class (we could use id instead).

Corrected "</table\n>" and hit_header_div instead of git_header_div.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-checkout: allow "checkout HEAD -- path"
Junio C Hamano [Mon, 31 Jul 2006 10:07:12 +0000 (03:07 -0700)]
git-checkout: allow "checkout HEAD -- path"

Even though -- is redundant in this case, we should allow it to prevent
confusion.

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