git/git.git
14 years agoUpdate the gitweb/README file to include setting the GITWEB_CONFIG environment
Alan Chandler [Tue, 3 Oct 2006 21:48:46 +0000 (22:48 +0100)]
Update the gitweb/README file to include setting the GITWEB_CONFIG environment

Signed-off-by: Alan Chandler <alan@chandlerfamily.org.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: document webserver configuration for common gitweb/repo URLs.
Martin Waitz [Tue, 3 Oct 2006 08:03:28 +0000 (10:03 +0200)]
gitweb: document webserver configuration for common gitweb/repo URLs.

Add a small apache configuration which shows how to use apache
to put gitweb and GIT repositories at the same URL.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Escape ESCAPE (\e) character
Luben Tuikov [Mon, 2 Oct 2006 21:54:53 +0000 (14:54 -0700)]
gitweb: Escape ESCAPE (\e) character

Take a look at commit 20a3847d8a5032ce41f90dcc68abfb36e6fee9b1
using gitweb before this patch.  This patch fixes this.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoescape tilde in Documentation/git-rev-parse.txt
Junio C Hamano [Tue, 3 Oct 2006 05:52:57 +0000 (22:52 -0700)]
escape tilde in Documentation/git-rev-parse.txt

Fixes a failure to build the git-rev-parse manpage, seen with
asciidoc 8.0.0

We would love to use nicer quoting $$~$$ but alas asciidoc 7
does not know about it.  So use asciidoc.conf and define {tilde}
to be &#126;.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Acked-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
14 years agoError in test description of t1200-tutorial
Robin Rosenberg [Tue, 3 Oct 2006 00:02:15 +0000 (02:02 +0200)]
Error in test description of t1200-tutorial

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agolock_ref_sha1_basic does not remove empty directories on BSD
Dennis Stosberg [Mon, 2 Oct 2006 17:23:53 +0000 (19:23 +0200)]
lock_ref_sha1_basic does not remove empty directories on BSD

lock_ref_sha1_basic relies on errno beeing set to EISDIR by the
call to read() in resolve_ref() to detect directories.  But calling
read() on a directory under NetBSD returns EPERM, and even succeeds
for local filesystems on FreeBSD.

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'maint'
Junio C Hamano [Mon, 2 Oct 2006 07:47:32 +0000 (00:47 -0700)]
Merge branch 'maint'

* maint:
  git-push: .git/remotes/ file does not require SP after colon
  git-mv: invalidate the removed path properly in cache-tree

14 years agogit-push: .git/remotes/ file does not require SP after colon v1.4.2.3
Junio C Hamano [Mon, 2 Oct 2006 07:43:52 +0000 (00:43 -0700)]
git-push: .git/remotes/ file does not require SP after colon

Although most people would have one after colon if only for
readability, we never required it in git-parse-remote, so let's
not require one only in git-push.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-mv: invalidate the removed path properly in cache-tree
Junio C Hamano [Mon, 2 Oct 2006 05:22:07 +0000 (22:22 -0700)]
git-mv: invalidate the removed path properly in cache-tree

The command updated the cache without invalidating the cache
tree entries while removing an existing entry.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMakefile: install and clean merge-recur, still.
Junio C Hamano [Mon, 2 Oct 2006 04:41:46 +0000 (21:41 -0700)]
Makefile: install and clean merge-recur, still.

We advertised git-merge-recur for some time, and we planned to
support it for one release after we made it the 'recursive'.

However we forgot to install it nor have "make clean" clean it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoGIT 1.4.3-rc1 v1.4.3-rc1
Junio C Hamano [Sun, 1 Oct 2006 10:08:55 +0000 (03:08 -0700)]
GIT 1.4.3-rc1

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'maint'
Junio C Hamano [Sun, 1 Oct 2006 08:10:03 +0000 (01:10 -0700)]
Merge branch 'maint'

* maint:
  git-diff -B output fix.
  Fix git-am safety checks
  Fix duplicate xmalloc in builtin-add

14 years agoMerge branch 'jc/gitpm'
Junio C Hamano [Sun, 1 Oct 2006 06:38:24 +0000 (23:38 -0700)]
Merge branch 'jc/gitpm'

* jc/gitpm: (52 commits)
  Remove -fPIC which was only needed for Git.xs
  Git.pm: Kill Git.xs for now
  Revert "Make it possible to set up libgit directly (instead of from the environment)"
  Revert "Git.pm: Introduce fast get_object() method"
  Revert "Convert git-annotate to use Git.pm"
  Fix compilation with Sun CC
  pass DESTDIR to the generated perl/Makefile
  Eliminate Scalar::Util usage from private-Error.pm
  Convert git-annotate to use Git.pm
  Git.pm: Introduce fast get_object() method
  Make it possible to set up libgit directly (instead of from the environment)
  Work around sed and make interactions on the backslash at the end of line.
  Git.pm: Introduce ident() and ident_person() methods
  Convert git-send-email to use Git.pm
  Git.pm: Add config() method
  Use $GITPERLLIB instead of $RUNNING_GIT_TESTS and centralize @INC munging
  INSTALL: a tip for running after building but without installing.
  Perly Git: make sure we do test the freshly built one.
  Git.pm: Don't #define around die
  Git.xs: older perl do not know const char *
  ...

14 years agoMerge branch 'jc/diff-stat'
Junio C Hamano [Sun, 1 Oct 2006 04:29:18 +0000 (21:29 -0700)]
Merge branch 'jc/diff-stat'

* jc/diff-stat:
  diff --stat: ensure at least one '-' for deletions, and one '+' for additions
  diff --stat=width[,name-width]: allow custom diffstat output width.
  diff --stat: color output.
  diff --stat: allow custom diffstat output width.

14 years agoMerge branch 'lt/web'
Junio C Hamano [Sun, 1 Oct 2006 04:27:51 +0000 (21:27 -0700)]
Merge branch 'lt/web'

* lt/web:
  gitweb: tree view: hash_base and hash are now context sensitive
  gitweb: History: blob and tree are first, then commitdiff, etc
  gitweb: Remove redundant "commit" from history
  gitweb: Don't use quotemeta on internally generated strings
  gitweb: Add snapshot to shortlog
  gitweb: Factor out gitweb_have_snapshot()
  gitweb: Remove redundant "commit" link from shortlog
  gitweb: "alternate" starts with shade (i.e. 1)
  gitweb: Add history and blame to git_difftree_body()
  gitweb: Remove excessively redundant entries from git_difftree_body
  Revert "gitweb: extend blame to show links to diff and previous"
  gitweb: Quote filename in HTTP Content-Disposition: header
  gitweb: Add git_url subroutine, and use it to quote full URLs
  gitweb: Split validate_input into validate_pathname and validate_refname
  gitweb: Use "return" instead of "return undef" for some subs
  gitweb: Strip trailing slashes from $path in git_get_hash_by_path
  gitweb: extend blame to show links to diff and previous
  gitweb: Remove redundant "tree" link
  gitweb: tree view: eliminate redundant "blob"

14 years agogitweb: tree view: hash_base and hash are now context sensitive
Luben Tuikov [Fri, 29 Sep 2006 16:57:43 +0000 (09:57 -0700)]
gitweb: tree view: hash_base and hash are now context sensitive

In tree view, by default, hash_base is HEAD and hash is the
entry equivalent.  Else the user had selected a hash_base or
hash, say by clicking on a revision or commit, in which case
those values are used.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-diff -B output fix. v1.4.2.2
Junio C Hamano [Fri, 29 Sep 2006 09:06:24 +0000 (02:06 -0700)]
git-diff -B output fix.

Geert noticed that complete rewrite diff missed the usual a/ and b/
leading paths.  Pickaxe says it never worked, ever.

Embarrassing.

Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from bc1a5807575b2f34538d4158834da6524a4fc1f7 commit)

14 years agofetch: Reset remote refs list each time fetch_main is called
Santi Béjar [Fri, 29 Sep 2006 18:05:40 +0000 (20:05 +0200)]
fetch: Reset remote refs list each time fetch_main is called

This prevents the fetch of the heads again in the second call of fetch_main.

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoRemove -fPIC which was only needed for Git.xs
Junio C Hamano [Fri, 29 Sep 2006 07:34:51 +0000 (00:34 -0700)]
Remove -fPIC which was only needed for Git.xs

The distinction between BASIC_ vs ALL_ is still kept, since it
is not Git.xs specific -- we could face the same issue when we
do other language bindings (e.g. Python).

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoFix approxidate() to understand 12:34 AM/PM are 00:34 and 12:34
Linus Torvalds [Fri, 29 Sep 2006 19:36:13 +0000 (12:36 -0700)]
Fix approxidate() to understand 12:34 AM/PM are 00:34 and 12:34

It just simplifies the whole thing to say

"hour = (hour % 12) + X"

where X is 12 for PM and 0 for AM.

It also fixes the "exact date" parsing, which didn't parse AM at all, and
as such would do the same "12:30 AM" means "12:30 24-hour-format" bug. Of
course, I hope that no exact dates use AM/PM anyway, but since we support
the PM format, let's just get it right.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-diff -B output fix.
Junio C Hamano [Fri, 29 Sep 2006 09:06:24 +0000 (02:06 -0700)]
git-diff -B output fix.

Geert noticed that complete rewrite diff missed the usual a/ and b/
leading paths.  Pickaxe says it never worked, ever.

Embarrassing.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 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>
14 years agodiff --stat: ensure at least one '-' for deletions, and one '+' for additions
Johannes Schindelin [Thu, 28 Sep 2006 15:37:39 +0000 (17:37 +0200)]
diff --stat: ensure at least one '-' for deletions, and one '+' for additions

The number of '-' and '+' is still linear. The idea is that
scaled-length := floor(a * length + b) with the following constraints: if
length == 1, scaled-length == 1, and the combined length of plusses
and minusses should not be larger than the width by a small margin. Thus,

a + b == 1

and
a * max_plusses + b + a * max_minusses + b = width + 1

The solution is

a * x + b = ((width - 1) * (x - 1) + max_change - 1)
 / (max_change - 1)

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agodiff --stat=width[,name-width]: allow custom diffstat output width.
Linus Torvalds [Thu, 28 Sep 2006 22:07:16 +0000 (15:07 -0700)]
diff --stat=width[,name-width]: allow custom diffstat output width.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: History: blob and tree are first, then commitdiff, etc
Luben Tuikov [Fri, 29 Sep 2006 00:21:07 +0000 (17:21 -0700)]
gitweb: History: blob and tree are first, then commitdiff, etc

Reorder link display in history to be consistent with other
list displays: log, shortlog, etc.  We now display:

blob | commitdiff
blob | commitdiff | diff_to_current

and

tree | commitdiff

Instead of the old history format where "blob" and "tree"
are between "commitdiff" and "diff_to_current" if present/
applicable.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Remove redundant "commit" from history
Luben Tuikov [Fri, 29 Sep 2006 00:20:23 +0000 (17:20 -0700)]
gitweb: Remove redundant "commit" from history

Remove redundant "commit" from history -- it can be had
by clicking on the title of the commit.  This commit
makes visualization consistent with shortlog, log, etc.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 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>
14 years agogitweb: Don't use quotemeta on internally generated strings
Luben Tuikov [Thu, 28 Sep 2006 23:51:43 +0000 (16:51 -0700)]
gitweb: Don't use quotemeta on internally generated strings

Do not use quotemeta on internally generated strings
such as filenames of snapshot, blobs, etc.
quotemeta quotes any characters not matching /A-Za-z_0-9/.
Which means that we get strings like this:

before: linux\-2\.6\.git\-5c2d97cb31fb77981797fec46230ca005b865799\.tar\.gz
after:  linux-2.6.git-5c2d97cb31fb77981797fec46230ca005b865799.tar.gz

This patch fixes this.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Add snapshot to shortlog
Luben Tuikov [Thu, 28 Sep 2006 23:50:09 +0000 (16:50 -0700)]
gitweb: Add snapshot to shortlog

Add snapshot to each commit-row of shortlog.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Factor out gitweb_have_snapshot()
Luben Tuikov [Thu, 28 Sep 2006 23:49:21 +0000 (16:49 -0700)]
gitweb: Factor out gitweb_have_snapshot()

Create gitweb_have_snapshot() which returns true
of snapshot is available and enabled, else false.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Remove redundant "commit" link from shortlog
Luben Tuikov [Thu, 28 Sep 2006 23:48:40 +0000 (16:48 -0700)]
gitweb: Remove redundant "commit" link from shortlog

Remove the redundant "commit" link from shortlog.
It can be had by simply clicking on the entry title
of the row.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: "alternate" starts with shade (i.e. 1)
Luben Tuikov [Thu, 28 Sep 2006 23:47:50 +0000 (16:47 -0700)]
gitweb: "alternate" starts with shade (i.e. 1)

When displaying a list of rows (difftree, shortlog, etc),
the first entry is now printed shaded, i.e. alternate is
initialized to 1, as opposed to non-shaded (alternate
initialized to 0).

This solves the problem when there is only one row to
display -- it is displayed shaded to visually indicate that
it is "active", part of a "list", etc.

(Compare this to the trivial case of more than one entry,
where the rows have alternating shade, thus suggesting
being part of a "list" of "active" entries, etc.)

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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.

14 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.

14 years agogitweb: Add history and blame to git_difftree_body()
Luben Tuikov [Thu, 28 Sep 2006 00:24:49 +0000 (17:24 -0700)]
gitweb: Add history and blame to git_difftree_body()

Add blame and history to Deleted files.
Add blame and history to Modified or Type changed files.
Add blame and history to Renamed or Copied files.

This allows us to do
blame->commit->blame->commit->blame->...
instead of
blame->commit->file->blame->commit->file->blame->...
which is longer and easier to get wrong.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 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.

14 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.

14 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.

14 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

14 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>
14 years agogitweb: Remove excessively redundant entries from git_difftree_body
Luben Tuikov [Thu, 28 Sep 2006 00:23:25 +0000 (17:23 -0700)]
gitweb: Remove excessively redundant entries from git_difftree_body

1) All entries on the left are blobs and clicking on them
leads to blobs.  No more diff or blob depending on what
happened (modified or mode changed) to the file -- this goes
to the right, in the "link" column.

2) Remove redundant "blob" from the link column on the right.
This can now be had by clicking on the entry itself.

This reduces and simplifies the code.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoRevert "gitweb: extend blame to show links to diff and previous"
Luben Tuikov [Thu, 28 Sep 2006 00:22:03 +0000 (17:22 -0700)]
Revert "gitweb: extend blame to show links to diff and previous"

This concept is very fine, but it makes blame slow
across renames and across branches, so revert it.
There is a better way to do this.

This reverts commit 03d06a8e26f4fbd37800d1e1125c6ecf4c104466.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 years agodiff --stat: color output.
Junio C Hamano [Wed, 27 Sep 2006 01:59:41 +0000 (18:59 -0700)]
diff --stat: color output.

Under --color option, diffstat shows '+' and '-' in the graph
the same color as added and deleted lines.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agodiff --stat: allow custom diffstat output width.
Junio C Hamano [Wed, 27 Sep 2006 01:53:02 +0000 (18:53 -0700)]
diff --stat: allow custom diffstat output width.

This adds two parameters to "diff --stat".

 . --stat-width=72 tells that the page should fit on 72-column output.

 . --stat-name-width=30 tells that the filename part is limited
   to 30 columns.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 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>
14 years agogitweb: Quote filename in HTTP Content-Disposition: header
Jakub Narebski [Mon, 25 Sep 2006 23:59:43 +0000 (01:59 +0200)]
gitweb: Quote filename in HTTP Content-Disposition: header

Finish work started by commit a2f3db2 (although not documented
in commit message) of quoting using quotemeta the filename in
HTTP -content_disposition header.

Just in case filename contains end of line character.

Also use consistent coding style to compute -content_disposition
parameter.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Add git_url subroutine, and use it to quote full URLs
Jakub Narebski [Mon, 25 Sep 2006 23:58:41 +0000 (01:58 +0200)]
gitweb: Add git_url subroutine, and use it to quote full URLs

Add git_url subroutine, which does what git_param did before commit
a2f3db2f5de2a3667b0e038aa65e3e097e642e7d, and is used to quote full
URLs, currently only $home_link.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Split validate_input into validate_pathname and validate_refname
Jakub Narebski [Mon, 25 Sep 2006 23:57:02 +0000 (01:57 +0200)]
gitweb: Split validate_input into validate_pathname and validate_refname

Split validate_input subroutine into validate_pathname which is used
for $project, $file_name and $file_parent parameters, and
validate_refname which is used for $hash, $hash_base, $hash_parent and
$hash_parent_base parameters.  Reintroduce validation of $file_name
and $file_parent parameters, removed in a2f3db2f

validate_pathname in addition to what validate_input did checks also
for doubled slashes and NUL character. It does not check if input is
textual hash, and does not check if all characters are from the
following set: [a-zA-Z0-9_\x80-\xff\ \t\.\/\-\+\#\~\%].

validate_refname first check if the input is textual hash, then checks
if it is valid pathname, then checks for invalid characters (according
to git-check-ref-format manpage). It does not check if all charactes
are from the [a-zA-Z0-9_\x80-\xff\ \t\.\/\-\+\#\~\%] set.

We do not have to validate pathnames we got from git.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Use "return" instead of "return undef" for some subs
Jakub Narebski [Mon, 25 Sep 2006 23:56:17 +0000 (01:56 +0200)]
gitweb: Use "return" instead of "return undef" for some subs

Use "return" instead of "return undef" when subroutine can return, or
always return, non-scalar (list) value.

Other places are left as is.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Strip trailing slashes from $path in git_get_hash_by_path
Jakub Narebski [Mon, 25 Sep 2006 23:54:24 +0000 (01:54 +0200)]
gitweb: Strip trailing slashes from $path in git_get_hash_by_path

It also removes unused local variable $tree

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: extend blame to show links to diff and previous
Luben Tuikov [Tue, 26 Sep 2006 23:45:31 +0000 (16:45 -0700)]
gitweb: extend blame to show links to diff and previous

git_blame2() now has two more columns, "Prev" and "Diff",
before the "Commit" column, as follows:

Prev Diff Commit Line Data
SHA     Diff    SHA        N    ...
...

The "Prev" column shows the SHA of the parent commit,
between which this line changed.  Clicking on it shows the
blame of the file as of the parent commit, for that line.

So clicking repeatedly on "Prev" would show you the blame
of that file, from the point of view of the changes
of that particular line whose "Prev" you're clicking on.

The "Diff" column shows "Diff" which is a link to blobdiff
between "Prev" and "Commit" commits _for that line_.

So clicking on "Diff" would show you the blobdiff (HTML)
between the parent commit and this commit which changed
that particular line.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 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>
14 years agogitweb: Remove redundant "tree" link
Luben Tuikov [Tue, 26 Sep 2006 19:45:37 +0000 (12:45 -0700)]
gitweb: Remove redundant "tree" link

In "tree" view, remove redundant "tree" link in the tree
listing.  It is identical to simply clicking on the tree
entry itself.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 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>
14 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>
14 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>
14 years agogitweb: tree view: eliminate redundant "blob"
Luben Tuikov [Tue, 26 Sep 2006 05:38:16 +0000 (22:38 -0700)]
gitweb: tree view: eliminate redundant "blob"

Binary and non-binary blobs:

The "list" table element of tree view is identical
to the "blob" link part of the link table element.
I.e. clicking on "blob" is identical to clicking on
the entry itself.

Thus, eliminate "blob" from being shown -- the user
can get identical result by simply clicking on the
entry itself.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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

14 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'

14 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>
14 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>
14 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>
14 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.

14 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

14 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

14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 years agoGit.pm: Kill Git.xs for now
Petr Baudis [Sat, 23 Sep 2006 18:20:47 +0000 (20:20 +0200)]
Git.pm: Kill Git.xs for now

This patch removes Git.xs from the repository for the time being. This
should hopefully enable Git.pm to finally make its way to master.

Git.xs is not going away forever. When the Git libification makes some
progress, it will hopefully return (but most likely as an optional
component, due to the portability woes) since the performance boosts are
really important for applications like Gitweb or Cogito. It needs to go
away now since it is not really reliable in case you use it for several
repositories in the scope of a single process, and that is not possible
to fix without some either very ugly or very intrusive core changes.

Rest in peace. (While you can.)

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 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>
14 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>
14 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>