Code

git.git
18 years agoMake cvsexportcommit remove files.
Robin Rosenberg [Thu, 28 Sep 2006 23:28:55 +0000 (01:28 +0200)]
Make cvsexportcommit remove files.

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agohttp/ftp: optionally ask curl to not use EPSV command
Sasha Khapyorsky [Fri, 29 Sep 2006 00:10:44 +0000 (03:10 +0300)]
http/ftp: optionally ask curl to not use EPSV command

If http.noEPSV config variable is defined and true, or if
GIT_CURL_FTP_NO_EPSV environment variable is defined, disable using
of EPSV ftp command (PASV will be used instead). This is helpful with
some "poor" ftp servers which does not support EPSV mode.

Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-format-patch: fix bug using -o in subdirectories
Matthias Lederhofer [Thu, 28 Sep 2006 19:55:35 +0000 (21:55 +0200)]
git-format-patch: fix bug using -o in subdirectories

This was introduced by me in commit v1.4.2.1-gc08e524.

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodo not discard constness in interp_set_entry value argument
Alex Riesen [Thu, 28 Sep 2006 19:12:55 +0000 (21:12 +0200)]
do not discard constness in interp_set_entry value argument

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix approxidate() to understand more extended numbers
Linus Torvalds [Thu, 28 Sep 2006 19:14:27 +0000 (12:14 -0700)]
Fix approxidate() to understand more extended numbers

You can now say "5:35 PM yesterday", and approxidate() gets the right answer.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoClean up approxidate() in preparation for fixes
Linus Torvalds [Thu, 28 Sep 2006 19:12:28 +0000 (12:12 -0700)]
Clean up approxidate() in preparation for fixes

Our approxidate cannot handle simple times like "5 PM yesterday", and to
fix that, we will need to add some logic for number handling.  This just
splits that out into a function of its own (the same way the _real_ date
parsing works).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofix daemon.c compilation for NO_IPV6=1
Alex Riesen [Thu, 28 Sep 2006 18:48:14 +0000 (20:48 +0200)]
fix daemon.c compilation for NO_IPV6=1

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodaemon: default to 256 for HOST_NAME_MAX if it is not defined
Johannes Schindelin [Thu, 28 Sep 2006 10:00:35 +0000 (12:00 +0200)]
daemon: default to 256 for HOST_NAME_MAX if it is not defined

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoformat-patch: use cwd as default output directory
Matthias Lederhofer [Fri, 22 Sep 2006 11:12:01 +0000 (13:12 +0200)]
format-patch: use cwd as default output directory

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosvnimport: add support for parsing From: lines for author
Andy Whitcroft [Mon, 25 Sep 2006 11:08:13 +0000 (12:08 +0100)]
svnimport: add support for parsing From: lines for author

When commiting a non-signed off contribution you cannot just add
a Signed-off-by: from the author as they did not sign it off.
But if you then commit it, and necessarily sign it off yourself,
the change appears to be yours.  In this case it is common to use
the following form:

Commentry

From: originator <email>
Signed-of-by: me <my email>
Now that we have support for parsing Signed-off-by: for author
information it makes sense to handle From: as well.  This patch
adds a new -F which will handle From: lines in the comments.  It
may be used in combination with -S.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoContributed bash completion support for core Git tools.
Junio C Hamano [Thu, 28 Sep 2006 09:31:25 +0000 (02:31 -0700)]
Contributed bash completion support for core Git tools.

This is a set of bash completion routines for many of the
popular core Git tools.  I wrote these routines from scratch
after reading the git-compl and git-compl-lib routines available
from the gitcompletion package at http://gitweb.hawaga.org.uk/
and found those to be lacking in functionality for some commands.
Consequently there may be some similarities but many differences.

Since these are completion routines only for tools shipped with
core Git and since bash is a popular shell on many of the native
core Git platforms (Linux, Mac OS X, Solaris, BSD) including these
routines as part of the stock package would probably be convienent
for many users.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jl/virtual'
Junio C Hamano [Thu, 28 Sep 2006 06:56:55 +0000 (23:56 -0700)]
Merge branch 'jl/virtual'

* jl/virtual:
  Removed memory leaks from interpolation table uses.
  Cleaned up git-daemon virtual hosting support.

18 years agoMerge branch 'cc/branch-test'
Junio C Hamano [Thu, 28 Sep 2006 05:17:01 +0000 (22:17 -0700)]
Merge branch 'cc/branch-test'

* cc/branch-test:
  Remove empty ref directories that prevent creating a ref.

18 years agoMerge branch 'sp/void'
Junio C Hamano [Thu, 28 Sep 2006 04:51:29 +0000 (21:51 -0700)]
Merge branch 'sp/void'

* sp/void:
  Allow git-checkout when on a non-existant branch.

18 years agoMerge branch 'jc/whitespace'
Junio C Hamano [Thu, 28 Sep 2006 04:50:42 +0000 (21:50 -0700)]
Merge branch 'jc/whitespace'

* jc/whitespace:
  git-apply: second war on whitespace.
  diff.c: second war on whitespace.

18 years agoMerge branch 'jc/repack'
Junio C Hamano [Thu, 28 Sep 2006 04:46:07 +0000 (21:46 -0700)]
Merge branch 'jc/repack'

* jc/repack:
  git-repack: allow git-repack to run in subdirectory
  repack: use only pack-objects, not rev-list.

18 years agoMerge branch 'jc/deprecate-recursive'
Junio C Hamano [Thu, 28 Sep 2006 04:41:24 +0000 (21:41 -0700)]
Merge branch 'jc/deprecate-recursive'

* jc/deprecate-recursive:
  Deprecate merge-recursive.py

18 years agorunstatus: do not recurse into subdirectories if not needed
Johannes Schindelin [Thu, 28 Sep 2006 00:44:30 +0000 (02:44 +0200)]
runstatus: do not recurse into subdirectories if not needed

This speeds up the case when you run git-status, having an untracked
subdirectory containing huge amounts of files.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRemoved memory leaks from interpolation table uses.
Jon Loeliger [Wed, 27 Sep 2006 16:16:10 +0000 (11:16 -0500)]
Removed memory leaks from interpolation table uses.

Clarified that parse_extra_args()s results in interpolation
table entries.  Removed a few trailing whitespace occurrences.

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoCleaned up git-daemon virtual hosting support.
Jon Loeliger [Tue, 26 Sep 2006 14:47:43 +0000 (09:47 -0500)]
Cleaned up git-daemon virtual hosting support.

Standardized on lowercase hostnames from client.

Added interpolation values for the IP address, port and
canonical hostname of the server as it is contacted and
named by the client and passed in via the extended args.

Added --listen=host_or_ipaddr option suport.  Renamed port
variable as "listen_port" correspondingly as well.

Documented mutual exclusivity of --inetd option with
    --user, --group, --listen and --port options.

Added compat/inet_pton.c from Paul Vixie as needed.

Small memory leaks need to be cleaned up still.

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogrep: fix --fixed-strings combined with expression.
Junio C Hamano [Wed, 27 Sep 2006 23:42:53 +0000 (16:42 -0700)]
grep: fix --fixed-strings combined with expression.

"git grep --fixed-strings -e GIT --and -e VERSION .gitignore"
misbehaved because we did not notice this needs to grab lines
that have the given two fixed strings at the same time.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogrep: free expressions and patterns when done.
Junio C Hamano [Wed, 27 Sep 2006 23:27:10 +0000 (16:27 -0700)]
grep: free expressions and patterns when done.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoCorrected copy-and-paste thinko in ignore executable bit test case.
Shawn Pearce [Wed, 27 Sep 2006 15:18:49 +0000 (11:18 -0400)]
Corrected copy-and-paste thinko in ignore executable bit test case.

This test should be testing update-index --add, not git-add as the
latter is implemented in terms of the former.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAn illustration of rev-list --parents --pretty=raw
Junio C Hamano [Wed, 27 Sep 2006 19:34:37 +0000 (12:34 -0700)]
An illustration of rev-list --parents --pretty=raw

This script creates two separate histories, A and B, each of
which does:

      (A0, B0): create fileA and subdir/fileB
      (A1, B1): modify fileA
      (A2, B2): modify subdir/fileB

and then grafts them together to make B0 a child of A2.  So
the final history looks like (time flows from top to bottom):

true parent touches subdir?

A0 none yes (creates it)
        A1      A0 no
        A2 A1 yes
        B0 none yes (different from what's in A2)
        B1 B0 no
        B2 B1 yes

"git rev-list --parents --pretty=raw B2" would give "fake"
parents on the "commit " header lines while "parent " header
lines show the parent as recorded in the commit object (i.e. B0
appears to have A2 as its parent on "commit " header but there
is no "parent A2" header line in it).

When you have path limiters, we simplify history to omit
commits that do not affect the specified paths.

So "git rev-list --parents --pretty=raw B2 subdir" would return
"B2 B0 A2 A0" (because B1 and A1 do not touch the path).  When
it does so, the "commit " header lines have "fake" parents
(i.e. B2 appears to have B0 as its parent on "commit " header),
but you can still get the true parents by looking at "parent "
header.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAllow git-checkout when on a non-existant branch.
Shawn Pearce [Mon, 25 Sep 2006 05:24:38 +0000 (01:24 -0400)]
Allow git-checkout when on a non-existant branch.

I've seen some users get into situtations where their HEAD
symbolic-ref is pointing at a non-existant ref.  (Sometimes this
happens during clone when the remote repository lacks a 'master'
branch.)  If this happens the user is unable to use git-checkout
to switch branches as there is no prior commit to merge from.

So instead of giving the user low-level errors about how HEAD
can't be resolved and how not a single revision was given change
the type of checkout to be a force and go through with the user's
request anyway.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Decode long title for link tooltips
Yasushi SHOJI [Wed, 27 Sep 2006 03:04:10 +0000 (12:04 +0900)]
gitweb: Decode long title for link tooltips

This is a simple one liner to decode long title string in perl's
internal form to utf-8 for link tooltips.

This is not crucial if the commit message is all in ASCII, however, if
you decide to use other encoding, such as UTF-8, tooltips ain't
readable any more.

Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1
Sergey Vlasov [Tue, 26 Sep 2006 09:42:55 +0000 (13:42 +0400)]
git-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1

When using Subversion 1.3.1 without Perl bindings (GIT_SVN_NO_LIB=1),
"git-svn fetch --no-ignore-externals" fails with errors like:

  Tree (.../.git/svn/git-svn/tree) is not clean:
  X      directory_with_external

In this case the 'X' lines in the "svn status" output are not a sign
of unclean tree, and therefore should be ignored.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoIgnore executable bit when adding files if filemode=0.
Shawn Pearce [Wed, 27 Sep 2006 05:21:19 +0000 (01:21 -0400)]
Ignore executable bit when adding files if filemode=0.

If the user has configured core.filemode=0 then we shouldn't set
the execute bit in the index when adding a new file as the user
has indicated that the local filesystem can't be trusted.

This means that when adding files that should be marked executable
in a repository with core.filemode=0 the user must perform a
'git update-index --chmod=+x' on the file before committing the
addition.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRemove empty ref directories that prevent creating a ref.
Christian Couder [Tue, 26 Sep 2006 05:23:37 +0000 (07:23 +0200)]
Remove empty ref directories that prevent creating a ref.

This patch also adds test cases from Linus and Junio.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoUse const for interpolate arguments
Alex Riesen [Mon, 25 Sep 2006 21:19:00 +0000 (23:19 +0200)]
Use const for interpolate arguments

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-archive: update documentation
Franck Bui-Huu [Mon, 25 Sep 2006 10:31:52 +0000 (12:31 +0200)]
git-archive: update documentation

This patch documents zip backend options.

It also adds git-archive command into the main git manual
page.

Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDeprecate merge-recursive.py
Junio C Hamano [Mon, 25 Sep 2006 02:49:47 +0000 (19:49 -0700)]
Deprecate merge-recursive.py

This renames merge-recursive written in Python to merge-recursive-old,
and makes merge-recur as a synonym to merge-recursive.  We do not remove
merge-recur yet, but we will remove merge-recur and merge-recursive-old
in a few releases down the road.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: fix over-eager application of esc_html().
Petr Baudis [Sun, 24 Sep 2006 21:57:40 +0000 (14:57 -0700)]
gitweb: fix over-eager application of esc_html().

Contents of %diffinfo hash should be quoted upon output but kept
unquoted internally.  Later users of this hash expect filenames
to be filenames, not HTML gibberish.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAllow '(no author)' in git-svn's authors file.
Shawn Pearce [Mon, 25 Sep 2006 03:04:55 +0000 (23:04 -0400)]
Allow '(no author)' in git-svn's authors file.

When trying to import an SVN revision which has no author the Git
user may desire to relabel '(no author)' to another name and email
address with their svn.authorsfile.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAllow 'svn fetch' on '(no date)' revisions in Subversion.
Shawn Pearce [Mon, 25 Sep 2006 02:50:15 +0000 (22:50 -0400)]
Allow 'svn fetch' on '(no date)' revisions in Subversion.

Added --ignore-nodate to allow 'git svn fetch' to import revisions
from Subversion which have '(no date)' listed as the date of the
revision.  By default 'git svn fetch' will crash with an error
when encountering such a revision.  The user may restart the fetch
operation by adding --ignore-nodate if they want to continue tracking
that repository.

I'm not entirely sure why a centralized version control system such
as Subversion permits revisions to be created with absolutely no
date/time associated with it but it apparently is possible as one
of the Subversion repositories that I'm tracking with 'git svn'
created such a revision on '(no date)' and by '(no user)'.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-repack: allow git-repack to run in subdirectory
Jeff King [Mon, 25 Sep 2006 02:31:11 +0000 (22:31 -0400)]
git-repack: allow git-repack to run in subdirectory

Now that we explicitly create all tmpfiles below $GIT_DIR, there's no reason
to care about which directory we're in.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'sk/svnimport'
Junio C Hamano [Mon, 25 Sep 2006 03:00:59 +0000 (20:00 -0700)]
Merge branch 'sk/svnimport'

* sk/svnimport:
  git-svnimport: Parse log message for Signed-off-by: lines

18 years agoMerge early parts of branch 'np/pack'
Junio C Hamano [Mon, 25 Sep 2006 02:58:30 +0000 (19:58 -0700)]
Merge early parts of branch 'np/pack'

18 years agoRemove upload-tar and make git-tar-tree a thin wrapper to git-archive
Junio C Hamano [Sun, 24 Sep 2006 21:42:01 +0000 (14:42 -0700)]
Remove upload-tar and make git-tar-tree a thin wrapper to git-archive

The command now issues a big deprecation warning message and runs
git-archive command with appropriate arguments.

git-tar-tree $tree_ish $base always forces $base to be the leading
directory name, so the --prefix parameter passed internally to
git-archive is a slash appended to it, i.e. "--prefix=$base/".

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-tar-tree: Move code for git-archive --format=tar to archive-tar.c
Rene Scharfe [Sun, 24 Sep 2006 15:31:10 +0000 (17:31 +0200)]
git-tar-tree: Move code for git-archive --format=tar to archive-tar.c

This patch doesn't change any functionality, it only moves code around.  It
makes seeing the few remaining lines of git-tar-tree code easier. ;-)

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-tar-tree: Remove duplicate git_config() call
Rene Scharfe [Sun, 24 Sep 2006 15:30:44 +0000 (17:30 +0200)]
git-tar-tree: Remove duplicate git_config() call

generate_tar() eventually calls write_tar_archive() which does all the
"real" work and which also calls git_config(git_tar_config).  We only
need to do this once.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/filter-commit'
Junio C Hamano [Mon, 25 Sep 2006 02:53:52 +0000 (19:53 -0700)]
Merge branch 'jc/filter-commit'

* jc/filter-commit:
  git log: Unify header_filter and message_filter into one.
  Update grep internal for grepping only in head/body
  git-log --author and --committer are not left-anchored by default
  rev-list: fix segfault with --{author,committer,grep}
  revision traversal: --author, --committer, and --grep.
  revision traversal: prepare for commit log match.
  builtin-grep: make pieces of it available as library.

18 years agoMerge branch 'sb/branch-attributes'
Junio C Hamano [Mon, 25 Sep 2006 02:20:26 +0000 (19:20 -0700)]
Merge branch 'sb/branch-attributes'

* sb/branch-attributes:
  Add test for the default merges in fetch.
  fetch: get the remote branches to merge from the branch properties
  Add t5510 to test per branch configuration affecting git-fetch.
  Fetch: default remote repository from branch properties

18 years agoMerge branch 'jl/daemon'
Junio C Hamano [Sun, 24 Sep 2006 23:58:34 +0000 (16:58 -0700)]
Merge branch 'jl/daemon'

* jl/daemon:
  Add virtualization support to git-daemon

18 years agoAdd test for the default merges in fetch.
Santi Béjar [Sat, 23 Sep 2006 20:55:35 +0000 (22:55 +0200)]
Add test for the default merges in fetch.

[jc: with minor fix-ups]

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofetch: get the remote branches to merge from the branch properties
Santi Béjar [Sat, 23 Sep 2006 20:53:04 +0000 (22:53 +0200)]
fetch: get the remote branches to merge from the branch properties

If in branch "foo" and this in config:

[branch "foo"]
      merge=bar

"git fetch": fetch from the default repository and program the "bar"
             branch to be merged with pull.

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd t5510 to test per branch configuration affecting git-fetch.
Junio C Hamano [Sat, 23 Sep 2006 10:40:17 +0000 (03:40 -0700)]
Add t5510 to test per branch configuration affecting git-fetch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFetch: default remote repository from branch properties
Santi Béjar [Sat, 23 Sep 2006 10:05:43 +0000 (12:05 +0200)]
Fetch: default remote repository from branch properties

If in branch "foo" and this in config:

[branch "foo"]
       remote=bar

"git fetch" = "git fetch bar"
"git  pull" = "git pull  bar"

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-apply: second war on whitespace.
Junio C Hamano [Sat, 23 Sep 2006 07:37:19 +0000 (00:37 -0700)]
git-apply: second war on whitespace.

This makes --whitespace={warn,error,strip} option to also notice
the leading whitespace errors in addition to the trailing
whitespace errors.  Spaces that are followed by a tab in indent
are detected as errors, and --whitespace=strip option fixes them.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodiff.c: second war on whitespace.
Junio C Hamano [Sat, 23 Sep 2006 05:48:39 +0000 (22:48 -0700)]
diff.c: second war on whitespace.

This adds DIFF_WHITESPACE color class (default = reverse red) to
colored diff output to let you catch common whitespace errors.

 - trailing whitespaces at the end of line
 - a space followed by a tab in the indent

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin-upload-archive.c broken on openbsd
Randal L. Schwartz [Sun, 24 Sep 2006 00:20:45 +0000 (17:20 -0700)]
builtin-upload-archive.c broken on openbsd

Looks like ctype again. Gotta be careful with that on BSD releases:

    $ gmake prefix=/opt/git all
    GIT_VERSION = 1.4.2.GIT
    gcc -o builtin-upload-archive.o -c -g -O2 -Wall -I/usr/local/include -DSHA1_HEADER='<openssl/sha.h>' -DNO_STRCASESTR builtin-upload-archive.c
    In file included from /usr/include/sys/poll.h:54,
                     from builtin-upload-archive.c:11:
    /usr/include/ctype.h:68: error: syntax error before ']' token
    /usr/include/ctype.h:69: error: syntax error before ']' token
    ...
    /usr/include/sys/poll.h:53:1: unterminated #ifndef
    /usr/include/sys/poll.h:28:1: unterminated #ifndef
    gmake: *** [builtin-upload-archive.o] Error 1

This fixes it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Consolidate escaping/validation of query string
Petr Baudis [Sat, 23 Sep 2006 22:18:41 +0000 (00:18 +0200)]
gitweb: Consolidate escaping/validation of query string

Consider:

http://repo.or.cz/?p=glibc-cvs.git;a=tree;h=2609cb0411389325f4ee2854cc7159756eb0671e;hb=2609cb0411389325f4ee2854cc7159756eb0671e

(click on the funny =__ify file)

We ought to handle anything in filenames and I actually see no reason why
we don't, modulo very little missing escaping that this patch hopefully
also fixes.

I have also made esc_param() escape [?=&;]. Not escaping [&;] was downright
buggy and [?=] just feels better escaped. ;-) YMMV.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDeprecate git-resolve.sh
Petr Baudis [Sat, 23 Sep 2006 22:25:19 +0000 (00:25 +0200)]
Deprecate git-resolve.sh

Seriously, is anyone still using this thing? It's collecting dust and
blocking the name for something potentially useful like a tool for
user-friendly marking of resolved conflicts or resolving index conflicts.

We've loved you when Git was young, now thank you and please go away. ;-)

This makes git-resolve.sh print a big deprecation warning and sleep a bit
for extra annoyance. It should be removed completely after the next release.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRename builtin-zip-tree.c to archive-zip.c
Rene Scharfe [Sat, 23 Sep 2006 15:06:35 +0000 (17:06 +0200)]
Rename builtin-zip-tree.c to archive-zip.c

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRemove git-zip-tree
Rene Scharfe [Sat, 23 Sep 2006 15:06:11 +0000 (17:06 +0200)]
Remove git-zip-tree

git-zip-tree can be safely removed because it was never part of a formal
release.  This patch makes 'git-archive --format=zip' the one and only git
ZIP file creation command.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomany cleanups to sha1_file.c
Nicolas Pitre [Thu, 21 Sep 2006 04:05:37 +0000 (00:05 -0400)]
many cleanups to sha1_file.c

Those cleanups are mainly to set the table for the support of deltas
with base objects referenced by offsets instead of sha1.  This means
that many pack lookup functions are converted to take a pack/offset
tuple instead of a sha1.

This eliminates many struct pack_entry usages since this structure
carried redundent information in many cases, and it increased stack
footprint needlessly for a couple recursively called functions that used
to declare a local copy of it for every recursion loop.

In the process, packed_object_info_detail() has been reorganized as well
so to look much saner and more amenable to deltas with offset support.

Finally the appropriate adjustments have been made to functions that
depend on the above changes.  But there is no functionality changes yet
simply some code refactoring at this point.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomove pack creation to version 3
Nicolas Pitre [Thu, 21 Sep 2006 04:11:59 +0000 (00:11 -0400)]
move pack creation to version 3

It's been quite a while now that GIT is able to read version 3 packs.
Let's create them at last.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svnimport: Parse log message for Signed-off-by: lines
Sasha Khapyorsky [Tue, 5 Sep 2006 18:46:11 +0000 (21:46 +0300)]
git-svnimport: Parse log message for Signed-off-by: lines

This add '-S' option. When specified svn-import will try to parse
commit message for 'Signed-off-by: ...' line, and if found will use
the name and email address extracted at first occurrence as this commit
author name and author email address. Committer name and email are
extracted in usual way.

Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoQuote arguments to tr in test-lib
Robin Rosenberg [Fri, 22 Sep 2006 22:35:20 +0000 (00:35 +0200)]
Quote arguments to tr in test-lib

When there are single-character filenames in the test directory,
the shell tries to expand regexps meant for tr.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix snapshot link in tree view
Petr Baudis [Fri, 22 Sep 2006 23:21:20 +0000 (01:21 +0200)]
Fix snapshot link in tree view

It would just give HEAD snapshot instead of one of the particular tree.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Fix @git_base_url_list usage
Petr Baudis [Fri, 22 Sep 2006 23:15:18 +0000 (01:15 +0200)]
gitweb: Fix @git_base_url_list usage

As it is now, that array was never used because the customurl accessor was
broken and ''unless @url_list'' never happenned.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Fix tree link associated with each commit log entry.
Petr Baudis [Fri, 22 Sep 2006 23:56:43 +0000 (16:56 -0700)]
gitweb: Fix tree link associated with each commit log entry.

The link forgot to have hb parameter and the resulting tree view
failed to show the navbar for that commit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake path in tree view look nicer
Petr Baudis [Fri, 22 Sep 2006 23:00:12 +0000 (01:00 +0200)]
Make path in tree view look nicer

Based on talk on the IRC with Junio some evenings ago, I've updated the
path showing in tree view to look better and sent updated patches
privately, but it seems the old version ended up being used, so here's
the new one again.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Relabel "head" as "HEAD"
Petr Baudis [Fri, 22 Sep 2006 01:19:53 +0000 (03:19 +0200)]
gitweb: Relabel "head" as "HEAD"

"head" is a reference in refs/heads/, while those labels mean HEAD,
the latest revision of the default branch.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Rename "plain" labels to "raw"
Petr Baudis [Fri, 22 Sep 2006 01:19:50 +0000 (03:19 +0200)]
gitweb: Rename "plain" labels to "raw"

I don't have much preference either way and as far as I'm concerned, it may
go the other way as well. Consistency is what is important.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Link to associated tree from a particular log item in full log view
Petr Baudis [Fri, 22 Sep 2006 01:19:48 +0000 (03:19 +0200)]
gitweb: Link to associated tree from a particular log item in full log view

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Link to latest tree from the head line in heads list
Petr Baudis [Fri, 22 Sep 2006 01:19:46 +0000 (03:19 +0200)]
gitweb: Link to latest tree from the head line in heads list

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Link to tree instead of snapshot in shortlog
Petr Baudis [Fri, 22 Sep 2006 01:19:44 +0000 (03:19 +0200)]
gitweb: Link to tree instead of snapshot in shortlog

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: More per-view navigation bar links
Petr Baudis [Fri, 22 Sep 2006 01:19:41 +0000 (03:19 +0200)]
gitweb: More per-view navigation bar links

Navigation bars in various views were empty or missed important items that
should have been there, e.g. getting a snapshot in tree view or log of
ancestry in commit view...

This feeble patch attempts to consolidate that.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Link (HEAD) tree for each project from projects list
Petr Baudis [Thu, 21 Sep 2006 23:58:40 +0000 (01:58 +0200)]
gitweb: Link (HEAD) tree for each project from projects list

Current projects list is oriented on easily getting "what's new"
information. But when already using gitweb as an interface to something,
I personally find myself to _much_ more frequently wanting to rather
see "what's in" (or "what's new in") and it's quite annoying to have to
go through the summary page (which is also rather expensive to generate)
just to get there.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Make git_get_hash_by_path check type if provided
Jakub Narebski [Thu, 21 Sep 2006 16:09:12 +0000 (18:09 +0200)]
gitweb: Make git_get_hash_by_path check type if provided

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix showing of path in tree view
Petr Baudis [Thu, 21 Sep 2006 00:05:50 +0000 (02:05 +0200)]
Fix showing of path in tree view

This patch fixes two things - links to all path elements except the last
one were broken since gitweb does not like the trailing slash in them, and
the root tree was not reachable from the subdirectory view.

To compensate for the one more slash in the front, the trailing slash is
not there anymore. ;-) I don't care if it stays there though.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: fix display of trees via PATH_INFO.
Martin Waitz [Thu, 21 Sep 2006 07:48:21 +0000 (09:48 +0200)]
gitweb: fix display of trees via PATH_INFO.

When adding a / to the URL, git should display the corresponding
tree object, but it has to remove the / first.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocument receive.denyNonFastforwards
Johannes Schindelin [Thu, 21 Sep 2006 00:10:30 +0000 (02:10 +0200)]
Document receive.denyNonFastforwards

[jc: with a fix to config handling in t5400 test, which took
 annoyingly long to diagnose.]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoreceive-pack: plug memory leak in fast-forward checking code.
Johannes Schindelin [Thu, 21 Sep 2006 00:07:19 +0000 (02:07 +0200)]
receive-pack: plug memory leak in fast-forward checking code.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoadd receive.denyNonFastforwards config variable
Johannes Schindelin [Wed, 20 Sep 2006 23:07:54 +0000 (01:07 +0200)]
add receive.denyNonFastforwards config variable

If receive.denyNonFastforwards is set to true, git-receive-pack will deny
non fast-forwards, i.e. forced updates. Most notably, a push to a repository
which has that flag set will fail.

As a first user, 'git-init-db --shared' sets this flag, since in a shared
setup, you are most unlikely to want forced pushes to succeed.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosha1_name.c: understand "describe" output as a valid object name
Junio C Hamano [Wed, 20 Sep 2006 23:11:08 +0000 (16:11 -0700)]
sha1_name.c: understand "describe" output as a valid object name

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake hexval() available to others.
Junio C Hamano [Wed, 20 Sep 2006 23:04:46 +0000 (16:04 -0700)]
Make hexval() available to others.

builtin-mailinfo.c has its own hexval implementaiton but it can
share the table-lookup one recently implemented in sha1_file.c

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit log: Unify header_filter and message_filter into one.
Junio C Hamano [Wed, 20 Sep 2006 20:21:56 +0000 (13:21 -0700)]
git log: Unify header_filter and message_filter into one.

Now we can tell the built-in grep to grep only in head or in
body, use that to update --author, --committer, and --grep.

Unfortunately, to make --and, --not and other grep boolean
expressions useful, as in:

# Things written by Junio committed and by Linus and log
# does not talk about diff.

git log --author=Junio --and --committer=Linus \
--grep-not --grep=diff

we will need to do another round of built-in grep core
enhancement, because grep boolean expressions are designed to
work on one line at a time.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoUpdate grep internal for grepping only in head/body
Junio C Hamano [Wed, 20 Sep 2006 19:39:46 +0000 (12:39 -0700)]
Update grep internal for grepping only in head/body

This further updates the built-in grep engine so that we can say
something like "this pattern should match only in head".  This
can be used to simplify grepping in the log messages.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd virtualization support to git-daemon
Jon Loeliger [Wed, 20 Sep 2006 01:31:51 +0000 (20:31 -0500)]
Add virtualization support to git-daemon

Signed-off-by: Jon Loeliger
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorepack: use only pack-objects, not rev-list.
Junio C Hamano [Mon, 18 Sep 2006 09:29:01 +0000 (02:29 -0700)]
repack: use only pack-objects, not rev-list.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-log --author and --committer are not left-anchored by default
Linus Torvalds [Mon, 18 Sep 2006 17:07:51 +0000 (10:07 -0700)]
git-log --author and --committer are not left-anchored by default

I know that I'd prefer a rule where

"--author=^Junio"

would result in the grep-pattern being "^author Junio", but without the
initial '^' it would be "^author .*Junio".

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorev-list: fix segfault with --{author,committer,grep}
Jeff King [Mon, 18 Sep 2006 06:52:42 +0000 (02:52 -0400)]
rev-list: fix segfault with --{author,committer,grep}

We need to save the commit buffer if we're going to match against it.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorevision traversal: --author, --committer, and --grep.
Junio C Hamano [Mon, 18 Sep 2006 00:23:20 +0000 (17:23 -0700)]
revision traversal: --author, --committer, and --grep.

This adds three options to setup_revisions(), which lets you
filter resulting commits by the author name, the committer name
and the log message with regexp.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorevision traversal: prepare for commit log match.
Junio C Hamano [Sun, 17 Sep 2006 22:43:40 +0000 (15:43 -0700)]
revision traversal: prepare for commit log match.

This is from a suggestion by Linus, just to mark the locations where we
need to modify to actually implement the filtering.

We do not have any actual filtering code yet.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin-grep: make pieces of it available as library.
Junio C Hamano [Sun, 17 Sep 2006 23:02:52 +0000 (16:02 -0700)]
builtin-grep: make pieces of it available as library.

This makes three functions and associated option structures from
builtin-grep available from other parts of the system.

 * options to drive built-in grep engine is stored in struct
   grep_opt;

 * pattern strings and extended grep expressions are added to
   struct grep_opt with append_grep_pattern();

 * when finished calling append_grep_pattern(), call
   compile_grep_patterns() to prepare for execution;

 * call grep_buffer() to find matches in the in-core buffer.

This also adds an internal option "status_only" to grep_opt,
which suppresses any output from grep_buffer().  Callers of the
function as library can use it to check if there is a match
without producing any output.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Fix thinko in git_tags and git_heads
Jakub Narebski [Tue, 19 Sep 2006 18:47:27 +0000 (20:47 +0200)]
gitweb: Fix thinko in git_tags and git_heads

git_get_refs_list always return reference to list (and reference to
hash which we ignore), so $taglist (in git_tags) and $headlist (in
git_heads) are always defined, but @$taglist / @$headlist might be
empty. Replaced incorrect "if (defined @$taglist)" with
"if (@$taglist)" in git_tags and respectively in git_heads.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Make git_get_refs_list do work of git_get_references
Jakub Narebski [Tue, 19 Sep 2006 12:33:22 +0000 (14:33 +0200)]
gitweb: Make git_get_refs_list do work of git_get_references

Make git_get_refs_list do also work of git_get_references, to avoid
calling git-peek-remote twice.  Change meaning of git_get_refs_list
meaning: it is now type, and not a full path, e.g. we now use
git_get_refs_list("heads") instead of former
git_get_refs_list("refs/heads").

Modify git_summary to use only one call to git_get_refs_list instead
of one call to git_get_references and two to git_get_refs_list.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Always use git-peek-remote in git_get_references
Jakub Narebski [Tue, 19 Sep 2006 12:31:49 +0000 (14:31 +0200)]
gitweb: Always use git-peek-remote in git_get_references

Instead of trying to read info/refs file, which might not be present
(we did fallback to git-ls-remote), always use git-peek-remote in
git_get_references.

It is preparation for git_get_refs_info to also return references
info.  We should not use info/refs for git_get_refs_info as the
repository is not served for http-fetch clients.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Require project for almost all actions
Jakub Narebski [Tue, 19 Sep 2006 19:53:22 +0000 (21:53 +0200)]
gitweb: Require project for almost all actions

Require that project (repository) is given for all actions except
project_list, project_index and opml.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Even more support for PATH_INFO based URLs
Jakub Narebski [Tue, 19 Sep 2006 22:49:51 +0000 (00:49 +0200)]
gitweb: Even more support for PATH_INFO based URLs

Now the following types of path based URLs are supported:

* project              overview (summary) page of project
* project/branch       shortlog of branch
* project/branch:file  file in branch, blob_plain view
* project/branch:dir/  directory listing of dir in branch, tree view

The following shortcuts works (see explanation below):

* project/branch:      directory listing of branch, main tree view
* project/:file        file in HEAD (raw)
* project/:dir/        directory listing of dir in HEAD
* project/:            directory listing of project's HEAD

We use ':' as separator between branch (ref) name and file name
(pathname) because valid branch (ref) name cannot have ':' inside.
This limit applies to branch name only. This allow for hierarchical
branches e.g. topic branch 'topic/subtopic', separate remotes
tracking branches e.g. 'refs/remotes/origin/HEAD', and discriminate
between head (branch) and tag with the same name.

Empty branch should be interpreted as HEAD.

If pathname (the part after ':') ends with '/', we assume that pathname
is name of directory, and we want to show contents of said directory
using "tree" view. If pathname is empty, it is equivalent to '/' (top
directory).

If pathname (the part after ':') does not end with '/', we assume that
pathname is name of file, and we show contents of said file using
"blob_plain" view.

Pathname is stripped of leading '/', so we can use ':/' to separate
branch from pathname. The rationale behind support for PATH_INFO based
URLs was to support project web pages for small projects: just create
an html branch and then use an URL like
  http://nowhere.com/gitweb.cgi/project.git/html:/index.html
The ':/' syntax allow for working links between .html files served
in such way, e.g. <a href="main.html"> link inside "index.html"
would get
  http://nowhere.com/gitweb.cgi/project.git/html:/main.html.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitk(1): mention --all
Jonas Fonseca [Wed, 20 Sep 2006 10:23:41 +0000 (12:23 +0200)]
gitk(1): mention --all

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix trivial typos and inconsistencies in hooks documentation
Jonas Fonseca [Wed, 20 Sep 2006 10:15:39 +0000 (12:15 +0200)]
Fix trivial typos and inconsistencies in hooks documentation

Pointed out by Alan Chandler.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Fix mimetype_guess_file for files with multiple extensions
Jakub Narebski [Tue, 19 Sep 2006 11:57:03 +0000 (13:57 +0200)]
gitweb: Fix mimetype_guess_file for files with multiple extensions

Fix getting correct mimetype for "blob_plain" view for files which have
multiple extensions, e.g. foo.1.html; now only the last extension
is used to find mimetype.

Noticed by Martin Waitz.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoPatch for http-fetch.c and older curl releases
Art Haas [Tue, 19 Sep 2006 12:20:19 +0000 (07:20 -0500)]
Patch for http-fetch.c and older curl releases

Older curl releases do not define CURLE_HTTP_RETURNED_ERROR, they
use CURLE_HTTP_NOT_FOUND instead. Newer curl releases keep the
CURLE_HTTP_NOT_FOUND definition but using a -DCURL_NO_OLDIES
preprocessor flag the old name will not be present in the 'curl.h'
header.

This patch makes our code written for newer releases of the curl
library but allow compiling against an older curl (older than
0x070a03) by defining the missing CURLE_HTTP_RETURNED_ERROR as a
synonym for CURLE_HTTP_NOT_FOUND.

Signed-off-by: Art Haas <ahaas@airmail.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'sk/ftp'
Junio C Hamano [Mon, 18 Sep 2006 01:43:36 +0000 (18:43 -0700)]
Merge branch 'sk/ftp'

* sk/ftp:
  Add ftp:// protocol support for git-http-fetch
  http-fetch.c: consolidate code to detect missing fetch target

18 years agoMerge part of branch 'jc/upload-pack'
Junio C Hamano [Mon, 18 Sep 2006 01:42:33 +0000 (18:42 -0700)]
Merge part of branch 'jc/upload-pack'

18 years agoMerge branch 'jc/pack'
Junio C Hamano [Mon, 18 Sep 2006 01:32:03 +0000 (18:32 -0700)]
Merge branch 'jc/pack'

* jc/pack:
  pack-objects: document --revs, --unpacked and --all.
  pack-objects --unpacked=<existing pack> option.
  pack-objects: further work on internal rev-list logic.
  pack-objects: run rev-list equivalent internally.
  Separate object listing routines out of rev-list

18 years agoMerge branch 'jc/am'
Junio C Hamano [Mon, 18 Sep 2006 01:20:02 +0000 (18:20 -0700)]
Merge branch 'jc/am'

* jc/am:
  Fix git-am safety checks