git.git
18 years agogitweb: fix project list if PATH_INFO=="/".
Martin Waitz [Wed, 16 Aug 2006 22:28:40 +0000 (00:28 +0200)]
gitweb: fix project list if PATH_INFO=="/".

The project list now uses several common header / footer generation functions.
These functions only check for "defined $project", but when PATH_INFO just
contains a "/" (which is often generated by web servers), then this test
fails.

Now explicitly undef $project if there is none so that the tests in other
gitweb parts work again.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: support for / as home_link.
Martin Waitz [Wed, 16 Aug 2006 22:28:39 +0000 (00:28 +0200)]
gitweb: support for / as home_link.

If the webserver is configured to use gitweb even for the root directory
of the site, then my_uri is empty which leads to a non-functional home
link.  Fix that by defaulting to "/" in this case.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: support for "fp" parameter.
Martin Waitz [Wed, 16 Aug 2006 22:28:38 +0000 (00:28 +0200)]
gitweb: support for "fp" parameter.

The "fp" (file name parent) parameter was previously generated for
blob diffs of renamed files.  However, it was not used in any code.

Now href() can generate "fp" parameters and they are used by the
blobdiff code to show the correct file name.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: continue consolidation of URL generation.
Martin Waitz [Wed, 16 Aug 2006 22:28:36 +0000 (00:28 +0200)]
gitweb: continue consolidation of URL generation.

Further use href() instead of URL generation by string concatenation.
Almost all functions are converted now.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Uniquify version info output, add meta generator in page header
Jakub Narebski [Thu, 17 Aug 2006 09:21:28 +0000 (11:21 +0200)]
gitweb: Uniquify version info output, add meta generator in page header

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/format-patch'
Junio C Hamano [Thu, 17 Aug 2006 02:27:03 +0000 (19:27 -0700)]
Merge branch 'jc/format-patch'

* jc/format-patch:
  Add a newline before appending "Signed-off-by: " line

18 years agoBe nicer if git executable is not installed
Ville Skyttä [Wed, 16 Aug 2006 20:12:26 +0000 (23:12 +0300)]
Be nicer if git executable is not installed

This patch avoids problems if vc-git.el is installed and activated, but
the git executable is not available, for example
http://list-archive.xemacs.org/xemacs-beta/200608/msg00062.html

Signed-off-by: Ville Skyttä <scop@xemacs.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/racy'
Junio C Hamano [Wed, 16 Aug 2006 21:00:34 +0000 (14:00 -0700)]
Merge branch 'jc/racy'

* jc/racy:
  Remove the "delay writing to avoid runtime penalty of racy-git avoidance"
  Add check program "git-check-racy"
  Documentation/technical/racy-git.txt
  avoid nanosleep(2)

18 years agoMerge branch 'maint'
Junio C Hamano [Wed, 16 Aug 2006 21:00:12 +0000 (14:00 -0700)]
Merge branch 'maint'

* maint:
  [PATCH] git-mv: add more path normalization

18 years agobuiltin-grep: remove unused debugging cruft.
Junio C Hamano [Wed, 16 Aug 2006 20:58:32 +0000 (13:58 -0700)]
builtin-grep: remove unused debugging cruft.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Add support for per project git URLs
Jakub Narebski [Wed, 16 Aug 2006 12:50:34 +0000 (14:50 +0200)]
gitweb: Add support for per project git URLs

It is now possible for project to have individual clone/fetch URLs.
They are provided in new file 'cloneurl' added below project's
$GIT_DIR directory.

If there is no cloneurl file, concatenation of git base URLs with
project name is used.

This is merge of Jakub Narebski and David Rientjes
  gitweb: Show project's git URL on summary page
with Aneesh Kumar
  gitweb: Add support for cloneurl.
  gitweb: Support multiple clone urls
patches.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years ago[PATCH] git-mv: add more path normalization
Johannes Schindelin [Wed, 16 Aug 2006 08:44:02 +0000 (10:44 +0200)]
[PATCH] git-mv: add more path normalization

We already use the normalization from get_pathspec(), but now we also
remove a trailing slash. So,

git mv some_path/ into_some_path/

works now.

Also, move the "can not move directory into itself" test before the
subdirectory expansion.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRemove the "delay writing to avoid runtime penalty of racy-git avoidance"
Junio C Hamano [Wed, 16 Aug 2006 04:40:43 +0000 (21:40 -0700)]
Remove the "delay writing to avoid runtime penalty of racy-git avoidance"

The work-around should not be needed.  Even if it turns out we
would want it later, git will remember the patch for us ;-).

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: consolidate action URL generation.
Martin Waitz [Tue, 15 Aug 2006 22:24:30 +0000 (00:24 +0200)]
gitweb: consolidate action URL generation.

Use the href() function instead of string concatenation to generate
most URLs to our own CGI.
This is a work in progress, not everything has been converted yet.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: provide function to format the URL for an action link.
Martin Waitz [Tue, 15 Aug 2006 22:23:50 +0000 (00:23 +0200)]
gitweb: provide function to format the URL for an action link.

Provide a new function which can be used to generate an URL for the CGI.
This makes it possible to consolidate the URL generation in order to make
it easier to change the encoding of actions into URLs.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Show project's git URL on summary page
Jakub Narebski [Tue, 15 Aug 2006 21:03:17 +0000 (23:03 +0200)]
gitweb: Show project's git URL on summary page

From 31e4de9f22a3b17d4ad0ac800132e4e1a0a15006 Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Tue, 15 Aug 2006 11:43:04 -0700
Subject: [PATCH] gitweb: Show project's git URL on summary page

Add support for showing multiple clone/fetch git URLs for project on
a summary page. URL for project is created from base URL and project
name.

For example for XMMS2 project (xmms.se) the git base URL would be
git://git.xmms.se/xmms2.

With corrections from David Rientjes <rientjes@google.com>

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd check program "git-check-racy"
Junio C Hamano [Wed, 16 Aug 2006 04:38:07 +0000 (21:38 -0700)]
Add check program "git-check-racy"

This will help counting the racily clean paths, but it should be
useless for daily use.  Do not even enable it in the makefile.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation/technical/racy-git.txt
Junio C Hamano [Tue, 15 Aug 2006 20:09:49 +0000 (13:09 -0700)]
Documentation/technical/racy-git.txt

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoremove unnecessary initializations
David Rientjes [Tue, 15 Aug 2006 17:23:48 +0000 (10:23 -0700)]
remove unnecessary initializations

[jc: I needed to hand merge the changes to the updated codebase,
 so the result needs to be checked.]

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'maint'
Junio C Hamano [Wed, 16 Aug 2006 04:15:32 +0000 (21:15 -0700)]
Merge branch 'maint'

* maint:
  finish_connect(): thinkofix
  git-mv: succeed even if source is a prefix of destination
  Solaris does not support C99 format strings before version 10

18 years agofinish_connect(): thinkofix
Junio C Hamano [Tue, 15 Aug 2006 23:28:08 +0000 (16:28 -0700)]
finish_connect(): thinkofix

All but one callers have ignore the return value from this
function, but the only caller, builtin-tar-tree.c::remote_tar(),
assumed it returns non-zero on failure and zero on success.  The
implementation however was returning either the waited pid
(which must be the same as its input) or -1 (an error).

Fix this thinko, while getting rid of an assignment of return
value from waitpid() into a variable of type int.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-mv: succeed even if source is a prefix of destination
Johannes Schindelin [Wed, 16 Aug 2006 00:20:32 +0000 (02:20 +0200)]
git-mv: succeed even if source is a prefix of destination

As noted by Fredrik Kuivinen, without this patch, git-mv fails on

git-mv README README-renamed

because "README" is a prefix of "README-renamed".

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agouse appropriate typedefs
David Rientjes [Tue, 15 Aug 2006 17:40:06 +0000 (10:40 -0700)]
use appropriate typedefs

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomake inline is_null_sha1 global
David Rientjes [Tue, 15 Aug 2006 20:37:19 +0000 (13:37 -0700)]
make inline is_null_sha1 global

Replace sha1 comparisons to null_sha1 with a global inline (which previously an
unused static inline in builtin-apply.c)

[jc: with a fix from Jonas Fonseca.]

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoavoid nanosleep(2)
Junio C Hamano [Tue, 15 Aug 2006 10:39:47 +0000 (03:39 -0700)]
avoid nanosleep(2)

On Solaris nanosleep(2) is not available in libc; you need to
link with -lrt to get it.

The purpose of the loop is to wait until the next filesystem
timestamp granularity, and the code uses subsecond sleep in the
hope that it can shorten the delay to 0.5 seconds on average
instead of a full second.  It is probably not worth depending on
an extra library for this.

We might want to yank out the whole "racy-git avoidance is
costly later at runtime, so let's delay writing the index out"
codepath later, but that is a separate issue and needs some
testing on large trees to figure it out.  After playing with the
kernel tree, I have a feeling that the whole thing may not be
worth it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-apply --binary: clean up and prepare for --reverse
Junio C Hamano [Tue, 15 Aug 2006 09:23:06 +0000 (02:23 -0700)]
git-apply --binary: clean up and prepare for --reverse

This cleans up the implementation of "git-apply --binary", and
implements reverse application of binary patches (when git-diff
is converted to emit reversible binary patches).

Earlier, the types of encoding (either deflated literal or
deflated delta) were stored in is_binary field in struct patch,
which meant that we cannot store more than one fragment that
differ in the encoding for a patch.  This moves the information
to a field in struct fragment that is otherwise unused for
binary patches, and makes it possible to hang two (or more, but
two is enough) hunks for a binary patch.

The original "binary patch" output from git-diff is internally
parsed into an "is_binary" patch with one fragment.  Upcoming
reversible binary patch output will have two fragments, the
first one being the forward patch and the second one the reverse
patch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix detection of ipv6 on Solaris
Dennis Stosberg [Tue, 15 Aug 2006 09:01:27 +0000 (11:01 +0200)]
Fix detection of ipv6 on Solaris

The configuration script detects whether linking with -lsocket is
necessary but doesn't add -lsocket to LIBS.  This lets the ipv6 test
fail.

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoLook for sockaddr_storage in sys/socket.h
Dennis Stosberg [Tue, 15 Aug 2006 09:01:25 +0000 (11:01 +0200)]
Look for sockaddr_storage in sys/socket.h

On Solaris and the BSDs the definition of "struct sockaddr_storage"
is not available from "netinet/in.h".  On Solaris "sys/socket.h" is
enough, at least OpenBSD needs "sys/types.h", too.

Using "sys/types.h" and "sys/socket.h" seems to be a more portable
way.

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoSolaris has strlcpy() at least since version 8
Dennis Stosberg [Tue, 15 Aug 2006 09:01:20 +0000 (11:01 +0200)]
Solaris has strlcpy() at least since version 8

See http://docs.sun.com/app/docs/doc/816-3321/6m9k23sjk?a=view

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoSolaris does not support C99 format strings before version 10
Dennis Stosberg [Tue, 15 Aug 2006 09:01:22 +0000 (11:01 +0200)]
Solaris does not support C99 format strings before version 10

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-apply --reverse: simplify reverse option.
Junio C Hamano [Tue, 15 Aug 2006 06:26:51 +0000 (23:26 -0700)]
git-apply --reverse: simplify reverse option.

Having is_reverse in each patch did not make sense.  This will hopefully
simplify the work needed to introduce reversible binary diff format.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agot4116 apply --reverse test
Junio C Hamano [Tue, 15 Aug 2006 06:24:55 +0000 (23:24 -0700)]
t4116 apply --reverse test

The binary patch test needs to be made more careful not to have
the postimage blob in the repository in which the patch is applied

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake sha1flush void and remove conditional return.
David Rientjes [Mon, 14 Aug 2006 20:32:01 +0000 (13:32 -0700)]
Make sha1flush void and remove conditional return.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake upload_pack void and remove conditional return.
David Rientjes [Mon, 14 Aug 2006 20:40:51 +0000 (13:40 -0700)]
Make upload_pack void and remove conditional return.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake track_tree_refs void.
David Rientjes [Mon, 14 Aug 2006 20:40:06 +0000 (13:40 -0700)]
Make track_tree_refs void.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake pack_objects void.
David Rientjes [Mon, 14 Aug 2006 20:38:50 +0000 (13:38 -0700)]
Make pack_objects void.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake fsck_dir void.
David Rientjes [Mon, 14 Aug 2006 20:36:18 +0000 (13:36 -0700)]
Make fsck_dir void.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake checkout_all void.
David Rientjes [Mon, 14 Aug 2006 20:20:12 +0000 (13:20 -0700)]
Make checkout_all void.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake show_entry void
David Rientjes [Mon, 14 Aug 2006 20:39:27 +0000 (13:39 -0700)]
Make show_entry void

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake pprint_tag void and cleans up call in cmd_cat_file.
David Rientjes [Mon, 14 Aug 2006 20:19:15 +0000 (13:19 -0700)]
Make pprint_tag void and cleans up call in cmd_cat_file.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRemove combine-diff.c::uninteresting()
Junio C Hamano [Tue, 15 Aug 2006 01:36:00 +0000 (18:36 -0700)]
Remove combine-diff.c::uninteresting()

A patch from David Rientjes made me realize we do not have to have
this function -- just call diff_unmodified_pair() directly.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoread-cache.c cleanup
David Rientjes [Mon, 14 Aug 2006 20:38:14 +0000 (13:38 -0700)]
read-cache.c cleanup

Removes conditional returns.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agohttp-push.c cleanup
David Rientjes [Mon, 14 Aug 2006 20:37:05 +0000 (13:37 -0700)]
http-push.c cleanup

Removes conditional return.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodiff.c cleanup
David Rientjes [Mon, 14 Aug 2006 20:34:16 +0000 (13:34 -0700)]
diff.c cleanup

Removes conditional return.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin-push.c cleanup
David Rientjes [Mon, 14 Aug 2006 20:26:58 +0000 (13:26 -0700)]
builtin-push.c cleanup

Removes conditional return in builtin-push.c

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin-grep.c cleanup
David Rientjes [Mon, 14 Aug 2006 20:22:15 +0000 (13:22 -0700)]
builtin-grep.c cleanup

Removes conditional return.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoblame.c return cleanup
David Rientjes [Mon, 14 Aug 2006 20:18:11 +0000 (13:18 -0700)]
blame.c return cleanup

Removes conditional from return

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: configurable home link string
Yasushi SHOJI [Mon, 14 Aug 2006 22:50:49 +0000 (07:50 +0900)]
gitweb: configurable home link string

I've always found difficult to figure out git URL for clone from
gitweb URL because git:// and http:// are different on many site
including kernel.org.

I've found this enhancement at http://dev.laptop.org/git when I was on
git channel, and thought that it'd be nice if all public gitweb site
show it's git URL on its page.

This patch allow us to change the home link string.  The current
default is "projects" as we all see on gitweb now.

ie. kernel.org might set this variable to "git://git.kernel.org/pub/scm/"

Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Separate printing difftree in git_commit into git_difftree_body
Jakub Narebski [Mon, 14 Aug 2006 00:18:33 +0000 (02:18 +0200)]
gitweb: Separate printing difftree in git_commit into git_difftree_body

Separate printing difftree in git_commit into separate
git_difftree_body subroutine. Add support for "C" (copied) status. For
"M" and "C" add parameter 'fp' (filename parent) to the "diff" link;
currently not supported by git_blobdiff ("blobdiff" action).

Reindented, realigned, added comments.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: True fix: Support for the standard mime.types map in gitweb
Jakub Narebski [Mon, 14 Aug 2006 00:16:33 +0000 (02:16 +0200)]
gitweb: True fix: Support for the standard mime.types map in gitweb

True fix for error in mimetype_guess, error introduced in original commit
2d00737489b8c61ed616b261c7c9bd314e2b0b41 and later fixed temporarily
by commenting out the line that caused error in commit
57bd4d3523efecf60197040cad34154aff4ddf80.

Gitweb now supports mime.types map $mimetypes_file relative to project.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Skip comments in mime.types like file
Jakub Narebski [Mon, 14 Aug 2006 00:15:22 +0000 (02:15 +0200)]
gitweb: Skip comments in mime.types like file

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Change appereance of marker of refs pointing to given object
Jakub Narebski [Mon, 14 Aug 2006 00:14:20 +0000 (02:14 +0200)]
gitweb: Change appereance of marker of refs pointing to given object

Change git_get_references to include type of ref in the %refs value, which
means putting everything after 'refs/' as a ref name, not only last
part of the name.  Instead of separating refs pointing to the same
object by " / " separator, use anonymous array reference to store all
refs pointing to given object.

Use 'git-ls-remote .' if $projectroot/$project/info/refs does not
exist.  (Perhaps it should be used always.)

Refs are now in separate span elements.  Class is dependent on the ref
type: currently known classes are 'tag', 'head', 'remote', and 'ref'
(last one for HEAD and other refs in the main directory).  There is
encompassing span element of class refs, just in case of unknown ref
type.

This might be considered cleaner separating of git_get_references into
filling %refs hash only, and not taking part in formatting ref marker.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Separate finding project owner into git_get_project_owner
Jakub Narebski [Mon, 14 Aug 2006 00:10:06 +0000 (02:10 +0200)]
gitweb: Separate finding project owner into git_get_project_owner

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Separate main part of git_history into git_history_body
Jakub Narebski [Mon, 14 Aug 2006 00:09:08 +0000 (02:09 +0200)]
gitweb: Separate main part of git_history into git_history_body

Separates main part of git_history into git_history_body subroutine,
and makes output more similar to git_shortlog.  Adds "diff to current"
link only for history of regular file (blob).

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Refactor printing shortened title in git_shortlog_body and git_tags_body
Jakub Narebski [Mon, 14 Aug 2006 00:08:27 +0000 (02:08 +0200)]
gitweb: Refactor printing shortened title in git_shortlog_body and git_tags_body

Separate printing of perhaps shortened title (subject) in
git_shortlog_body and git_tags_body into format_subject_html.

While at it, remove presentation element <b>...</b> used to format
title (subject) and move formatting to CSS.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Separate ref parsing in git_get_refs_list into parse_ref
Jakub Narebski [Mon, 14 Aug 2006 00:07:00 +0000 (02:07 +0200)]
gitweb: Separate ref parsing in git_get_refs_list into parse_ref

Note that for each ref there are usually two calls to git subroutines:
first to get the type of ref, second to parse ref if ref is of commit
or tag type.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Great subroutines renaming
Jakub Narebski [Mon, 14 Aug 2006 00:05:47 +0000 (02:05 +0200)]
gitweb: Great subroutines renaming

Rename some of subroutines to better reflect what they do.
Some renames were not performed because subroutine name
reflects hash key.

Subroutines name guideline:
* git_ prefix for subroutines related to git commands,
  git repository, or to gitweb actions
* git_get_ prefix for inner subroutines calling git command
  or reading some file in the repository and returning some output
* parse_ prefix for subroutines parsing some text (or reading and
  parsing some text) into hash or list
* format_ prefix for subroutines formatting, post-processing
  or generating some HTML/text fragment
* _get_ infix for subroutines which return result
* _print_ infix for subroutines which print fragment of output
* _body suffix for subroutines which outputs main part (body)
  of related action (usually table)
* _nav suffix for subroutines related to navigation bars
* _div suffix for subroutines returning or printing div element
* subroutine names should not be based on how the result is obtained,
  as this might change easily

Renames performed:
- git_get_referencing => format_ref_marker
- git_get_paging_nav => format_paging_nav
- git_read_head => git_get_head_hash
- git_read_hash => git_get_hash_by_ref
- git_read_description => git_get_project_description
- git_read_projects => git_get_projects_list
- read_info_ref => git_get_references
- git_read_refs => git_get_refs_list
- date_str => parse_date
- git_read_tag => parse_tag
- git_read_commit => parse_commit
- git_blob_plain_mimetype => blob_mimetype
- git_page_nav => git_print_page_nav
- git_header_div => git_print_header_div

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd a newline before appending "Signed-off-by: " line
Franck Bui-Huu [Sun, 13 Aug 2006 18:30:27 +0000 (11:30 -0700)]
Add a newline before appending "Signed-off-by: " line

Whef the last line of the commit log message does not end with
"^[-A-Za-z]+: [^@]+@", append a newline after it to separate
the body of the commit log message from the run of sign-off and
ack lines. e.g. "Signed-off-by: A U Thor <au.thor@example.com>" or
"Acked-by: Me <myself@example.org>".

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'maint'
Junio C Hamano [Mon, 14 Aug 2006 05:58:23 +0000 (22:58 -0700)]
Merge branch 'maint'

* maint:
  sample commit-msg hook: no silent exit on duplicate Signed-off-by lines
  Fix regex pattern in commit-msg

18 years agoFix type of combine-diff.c::show_patch_diff()
Junio C Hamano [Mon, 14 Aug 2006 02:19:34 +0000 (19:19 -0700)]
Fix type of combine-diff.c::show_patch_diff()

The other function, show_raw_diff() is void and no callers use
return value from neither.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosample commit-msg hook: no silent exit on duplicate Signed-off-by lines
Luben Tuikov [Sun, 13 Aug 2006 08:41:22 +0000 (01:41 -0700)]
sample commit-msg hook: no silent exit on duplicate Signed-off-by lines

git-commit would silently exit if duplicate Signed-off-by
lines were found.  Users of git-commit would not know it,
unless they checked '$?'.  This patch makes git-commit
actually print out a message that nothing was commited
since duplicate Signed-off-lines were found.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix regex pattern in commit-msg
Luben Tuikov [Sun, 13 Aug 2006 07:34:37 +0000 (00:34 -0700)]
Fix regex pattern in commit-msg

Between the count and the line output, some
uniq(1) versions put a TAB character, not a space.
Make sure both are handled.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/upload-pack'
Junio C Hamano [Sun, 13 Aug 2006 05:16:51 +0000 (22:16 -0700)]
Merge branch 'jc/upload-pack'

18 years agoMerge branch 'jc/racy-delay'
Junio C Hamano [Sun, 13 Aug 2006 02:41:44 +0000 (19:41 -0700)]
Merge branch 'jc/racy-delay'

18 years agoMerge branch 'th/diff-extra'
Junio C Hamano [Sun, 13 Aug 2006 02:34:41 +0000 (19:34 -0700)]
Merge branch 'th/diff-extra'

18 years agoMerge branch 'jc/pack-objects'
Junio C Hamano [Sun, 13 Aug 2006 02:33:16 +0000 (19:33 -0700)]
Merge branch 'jc/pack-objects'

18 years agoMerge branch 'js/read-tree'
Junio C Hamano [Sun, 13 Aug 2006 02:29:11 +0000 (19:29 -0700)]
Merge branch 'js/read-tree'

18 years agoMerge branch 'js/http-mb'
Junio C Hamano [Sun, 13 Aug 2006 02:24:51 +0000 (19:24 -0700)]
Merge branch 'js/http-mb'

18 years agoMerge branch 'js/color-diff'
Junio C Hamano [Sun, 13 Aug 2006 02:24:47 +0000 (19:24 -0700)]
Merge branch 'js/color-diff'

18 years agoMerge branch 'jn/web'
Junio C Hamano [Sun, 13 Aug 2006 02:24:15 +0000 (19:24 -0700)]
Merge branch 'jn/web'

18 years agoMerge branch 'lt/web'
Junio C Hamano [Sun, 13 Aug 2006 02:24:09 +0000 (19:24 -0700)]
Merge branch 'lt/web'

18 years agoMerge branch 'jn/conf'
Junio C Hamano [Sun, 13 Aug 2006 02:23:09 +0000 (19:23 -0700)]
Merge branch 'jn/conf'

18 years agoMerge branch 'jc/grep'
Junio C Hamano [Sun, 13 Aug 2006 02:16:33 +0000 (19:16 -0700)]
Merge branch 'jc/grep'

18 years agoMerge branch 'mk/rename'
Junio C Hamano [Sun, 13 Aug 2006 02:13:31 +0000 (19:13 -0700)]
Merge branch 'mk/rename'

18 years agoMerge branch 'ml/pager'
Junio C Hamano [Sun, 13 Aug 2006 02:13:25 +0000 (19:13 -0700)]
Merge branch 'ml/pager'

18 years agoGIT 1.4.2 v1.4.2
Junio C Hamano [Sun, 13 Aug 2006 01:32:31 +0000 (18:32 -0700)]
GIT 1.4.2

18 years agoMerge git://git.kernel.org/pub/scm/gitk/gitk
Junio C Hamano [Sun, 13 Aug 2006 01:32:17 +0000 (18:32 -0700)]
Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Show the currently checked-out head in bold font
  gitk: Allow the user to set some colors

18 years agot/t4013: fix futzing with the version string.
Junio C Hamano [Sun, 13 Aug 2006 01:04:07 +0000 (18:04 -0700)]
t/t4013: fix futzing with the version string.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoBetter error message when we are unable to lock the index file
Junio C Hamano [Sat, 12 Aug 2006 08:03:47 +0000 (01:03 -0700)]
Better error message when we are unable to lock the index file

Most of the callers except the one in refs.c use the function to
update the index file.  Among the index writers, everybody
except write-tree dies if they cannot open it for writing.

This gives the function an extra argument, to tell it to die
when it cannot create a new file as the lockfile.

The only caller that does not have to die is write-tree, because
updating the index for the cache-tree part is optional and not
being able to do so does not affect the correctness.  I think we
do not have to be so careful and make the failure into die() the
same way as other callers, but that would be a different patch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-am: give better diagnostics when the patch does not apply during --3way
Junio C Hamano [Sat, 12 Aug 2006 23:16:47 +0000 (16:16 -0700)]
git-am: give better diagnostics when the patch does not apply during --3way

If the user tries to apply a patch that was hand-edited in such
a way that it does not apply to the original file recorded on
its "index" line anymore, we did detect the situation but did
not issue an error message that is specific enough.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'rj/header'
Junio C Hamano [Sat, 12 Aug 2006 23:09:19 +0000 (16:09 -0700)]
Merge branch 'rj/header'

* rj/header:
  Fix header breakage with _XOPEN_SOURCE.

18 years agogit-svn: split the path from the url correctly with limited perms
Eric Wong [Sat, 12 Aug 2006 06:21:41 +0000 (23:21 -0700)]
git-svn: split the path from the url correctly with limited perms

This version of the splitter (that only affects SVN:: library
users) works when one only has limited read-permissions to
the repository they're fetching from.

Updated from the original patch to workaround some SVN bug
somewhere, which only seems to happen against file://
repositories...  Here's the diff against the original patch I
submitted:

@@ -1159,8 +1159,8 @@ sub repo_path_split {
  }

  if ($_use_lib) {
- $SVN = libsvn_connect($full_url);
- my $url = $SVN->get_repos_root;
+ my $tmp = libsvn_connect($full_url);
+ my $url = $tmp->get_repos_root;
  $full_url =~ s#^\Q$url\E/*##;
  push @repo_path_split_cache, qr/^(\Q$url\E)/;
  return ($url, $full_url);

Somehow connecting to a repository with the full url makes the
returned SVN::Ra object act strangely and break things, so now
we just drop the SVN::Ra object that we made our initial
connection with.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-grep: show pathnames relative to the current directory
Junio C Hamano [Fri, 11 Aug 2006 07:44:42 +0000 (00:44 -0700)]
git-grep: show pathnames relative to the current directory

By default, the command shows pathnames relative to the current
directory.  Use --full-name (the same flag to do so in ls-files)
if you want to see the full pathname relative to the project root.

This makes it very pleasant to run in Emacs compilation (or
"grep-find") buffer.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-sh-setup: do not use repo-config to test the git directory
Junio C Hamano [Sat, 12 Aug 2006 01:47:50 +0000 (18:47 -0700)]
git-sh-setup: do not use repo-config to test the git directory

Since repo-config does not fail in non-git directory, it is not
a good command to use to test the git-ness nor validate the
repository revision of $GIT_DIR.

Original patch by Robert Shearman but with minor fixes.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: bugfix: allow SVN:: lib users to track the root of the repository
Eric Wong [Fri, 11 Aug 2006 18:11:29 +0000 (11:11 -0700)]
git-svn: bugfix: allow SVN:: lib users to track the root of the repository

I'm not sure if anybody has hit this (besides me), but this
fixes the problem where I ran into while attempting to import a
small repo at the root level:  I ended up with all the commits, but
with no file/tree changes at all throughout the entire history.

Also, fix a warning if the commit message is not defined for revision 0.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: correctly kill keyword expansion without munging EOLs
Eric Wong [Fri, 11 Aug 2006 11:34:07 +0000 (04:34 -0700)]
git-svn: correctly kill keyword expansion without munging EOLs

This bugfix applies to users of the svn command-line client only.

We no longer muck with newlines when killing keyword expansion.
This tended to generate unintended diffs in commits because svn
revert -R would destroy the manual EOL changes we were doing. Of
course, we didn't need the EOL munging in the first place, as
svn seems to do it for us even in the text-base files.

Now we set the mtime and atime the files changed by keyword
expansion killing to avoid triggering a change on svn revert,
which svn still seems to want to do.

Thanks to Seth Falcon for reporting this bug.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodrop length argument of has_extension
Rene Scharfe [Fri, 11 Aug 2006 12:01:45 +0000 (14:01 +0200)]
drop length argument of has_extension

As Fredrik points out the current interface of has_extension() is
potentially confusing.  Its parameters include both a nul-terminated
string and a length-limited string.

This patch drops the length argument, requiring two nul-terminated
strings; all callsites are updated.  I checked that all of them indeed
provide nul-terminated strings.  Filenames need to be nul-terminated
anyway if they are to be passed to open() etc.  The performance penalty
of the additional strlen() is negligible compared to the system calls
which inevitably surround has_extension() calls.

Additionally, change has_extension() to use size_t inside instead of
int, as that is the exact type strlen() returns and memcmp() expects.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'rn/push-dav'
Junio C Hamano [Fri, 11 Aug 2006 06:13:50 +0000 (23:13 -0700)]
Merge branch 'rn/push-dav'

* rn/push-dav:
  http-push: Make WebDAV work with (broken?) default apache2 WebDAV module

18 years agoAdd the --color-words option to the diff options family
Johannes Schindelin [Fri, 28 Jul 2006 21:56:15 +0000 (23:56 +0200)]
Add the --color-words option to the diff options family

With this option, the changed words are shown inline. For example,
if a file containing "This is foo" is changed to "This is bar", the diff
will now show "This is " in plain text, "foo" in red, and "bar" in green.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd Documentation/howto/setup-git-server-over-http.txt
Rutger Nijlunsing [Thu, 10 Aug 2006 20:00:26 +0000 (22:00 +0200)]
Add Documentation/howto/setup-git-server-over-http.txt

A small howto on how to setup GIT over HTTP transport protocol by
setting up WebDAV access on apache2.

[jc: minimum ispell fixes applied]

Signed-off-by: Rutger Nijlunsing <git@tux.tmfweb.nl>
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Whitespace cleanup - tabs are for indent, spaces are for align
Jakub Narebski [Thu, 10 Aug 2006 10:38:47 +0000 (12:38 +0200)]
gitweb: Whitespace cleanup - tabs are for indent, spaces are for align

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-verify-pack: make builtin
Rene Scharfe [Thu, 10 Aug 2006 15:02:38 +0000 (17:02 +0200)]
git-verify-pack: make builtin

Convert git-verify-pack to a builtin command.  Also rename ac to argc
and av to argv for consistancy.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'master' into mk/rename
Junio C Hamano [Thu, 10 Aug 2006 21:17:49 +0000 (14:17 -0700)]
Merge branch 'master' into mk/rename

* master:
  git-verify-pack: no need to count errors
  git-verify-pack: buffer overrun paranoia
  git-verify-pack: free pack after use and a cleanup
  git-verify-pack: get rid of while loop
  git-verify-pack: insist on .idx extension
  git-verify-pack: more careful path handling
  git-verify-pack: show usage when no pack was specified
  Add has_extension()
  builtin-apply: remove unused increment
  Fix git-diff A...B
  combine-diff: use color
  git-apply: applying a patch to make a symlink shorter.
  allow diff.renamelimit to be set regardless of -M/-C
  make --find-copies-harder imply -C
  find_unique_abbrev() with len=0 should not abbreviate
  check return value from diff_setup_done()
  Fix tutorial-2.html
  Documentation: git-status takes the same options as git-commit
  Update git-init-db(1) and documentation of core.sharedRepository

18 years agogit-verify-pack: no need to count errors
Rene Scharfe [Thu, 10 Aug 2006 15:02:37 +0000 (17:02 +0200)]
git-verify-pack: no need to count errors

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-verify-pack: buffer overrun paranoia
Rene Scharfe [Thu, 10 Aug 2006 15:02:36 +0000 (17:02 +0200)]
git-verify-pack: buffer overrun paranoia

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-verify-pack: free pack after use and a cleanup
Rene Scharfe [Thu, 10 Aug 2006 15:02:35 +0000 (17:02 +0200)]
git-verify-pack: free pack after use and a cleanup

Plug memory leak in verify_one_pack() by freeing the struct packed_git
we got from add_packed_git().  Also rename g to pack and pull an
assignment out of an if statement while we're at it.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-verify-pack: get rid of while loop
Rene Scharfe [Thu, 10 Aug 2006 15:02:34 +0000 (17:02 +0200)]
git-verify-pack: get rid of while loop

Get rid of that while loop which was apparently used as a way to avoid
goto's (why?).  It's easy now because there is only one break left at
the end of it.  Also make the comment clearer.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-verify-pack: insist on .idx extension
Rene Scharfe [Thu, 10 Aug 2006 15:02:33 +0000 (17:02 +0200)]
git-verify-pack: insist on .idx extension

git-verify-pack can be called with a filename without .idx extension.
add_packed_git() on the other hand depends on its presence.  So
instead of trying to call it with whatever the user gave us check for
that extension and add it if it's missing.

That means that you can't name your index file "blah" and your pack
file ".pack" anymore ("git-verify-pack blah" currently works in that
case).  I think this regression is a good change. ;-)

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-verify-pack: more careful path handling
Rene Scharfe [Thu, 10 Aug 2006 15:02:32 +0000 (17:02 +0200)]
git-verify-pack: more careful path handling

Use strlcpy() to copy the filename into a buffer and complain if it
doesn't fit.  Also move the path buffer into verify_one_pack(); it is
used only there.  Now we can const'ify the first argument of this
function.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-verify-pack: show usage when no pack was specified
Rene Scharfe [Thu, 10 Aug 2006 15:02:31 +0000 (17:02 +0200)]
git-verify-pack: show usage when no pack was specified

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>