gitweb.git
Fix multi-paragraph list items in OPTIONS sectionFrancis Daly Mon, 20 Mar 2006 10:41:18 +0000 (10:41 +0000)

Fix multi-paragraph list items in OPTIONS section

This patch makes the html docs right, makes the asciidoc docs a bit odd
but consistent with what is there already, and makes the manpages look
OK using docbook-xsl 1.68, but miss a paragraph separator when using 1.69.

For the manpages, current is like

-A <author_file>
Read a file with lines on the form

username = User's Full Name <email@addr.es>

and use "User's Full Name <email@addr.es>" as the GIT

With this patch, docbook-xsl v1.68 looks like

-A <author_file>
Read a file with lines on the form

username = User's Full Name <email@addr.es>

and use "User's Full Name <email@addr.es>" as the GIT author and

while docbook-xsl v1.69 becomes

-A <author_file>
Read a file with lines on the form

username = User's Full Name <email@addr.es>
and use "User's Full Name <email@addr.es>" as the GIT author and

The extra indentation is to keep the v1.69 manpage looking sane.

http-fetch: nicer warning for a server with unreliable... Junio C Hamano Mon, 20 Mar 2006 22:07:59 +0000 (14:07 -0800)

http-fetch: nicer warning for a server with unreliable 404 status

When a repository otherwise properly prepared is served by a
dumb HTTP server that sends "No such page" output with 200
status for human consumption to a request for a page that does
not exist, the users will get an alarming "File X corrupt" error
message. Hint that they might be dealing with such a server at
the end and suggest running fsck-objects to check if the result
is OK (the pack-fallback code does the right thing in this case
so unless a loose object file was actually corrupt the result
should check OK).

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

generate-cmdlist: style cleanups.Junio C Hamano Mon, 20 Mar 2006 07:54:45 +0000 (23:54 -0800)

generate-cmdlist: style cleanups.

Instead of giving multiple commands concatenated with semicolon
to sed, write them on separate lines.

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

Add missing semicolon to sed command.Shawn Pearce Mon, 20 Mar 2006 00:18:08 +0000 (19:18 -0500)

Add missing semicolon to sed command.

generate-cmdlist.sh is giving errors messages from sed on Mac OS
10.4 due to a missing semicolon.

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

unpack_delta_entry(): reduce memory footprint.Junio C Hamano Sun, 19 Mar 2006 21:43:42 +0000 (13:43 -0800)

unpack_delta_entry(): reduce memory footprint.

Currently we unpack the delta data from the pack and then unpack
the base object to apply that delta data to it. When getting an
object that is deeply deltified, we can reduce memory footprint
by unpacking the base object first and then unpacking the delta
data, because we will need to keep at most one delta data in
memory that way.

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

git.el: Added a function to diff against the other... Alexandre Julliard Sun, 19 Mar 2006 09:06:10 +0000 (10:06 +0100)

git.el: Added a function to diff against the other heads in a merge.

git-diff-file-merge-head generates a diff against the first merge
head, or with a prefix argument against the nth head. Bound to `d h'
by default.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git.el: Get the default user name and email from the... Alexandre Julliard Sun, 19 Mar 2006 09:05:48 +0000 (10:05 +0100)

git.el: Get the default user name and email from the repository config.

If user name or email are not set explicitly, get them from the
user.name and user.email configuration values before falling back to
the Emacs defaults.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git.el: More robust handling of subprocess errors when... Alexandre Julliard Sun, 19 Mar 2006 09:05:22 +0000 (10:05 +0100)

git.el: More robust handling of subprocess errors when returning strings.

Make sure that functions that call a git process and return a string
always return nil when the subprocess failed.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Makefile: Add TAGS and tags targetsFredrik Kuivinen Sat, 18 Mar 2006 10:07:12 +0000 (11:07 +0100)

Makefile: Add TAGS and tags targets

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

ls-files: Don't require exclude files to end with a... Alexandre Julliard Sat, 18 Mar 2006 10:27:45 +0000 (11:27 +0100)

ls-files: Don't require exclude files to end with a newline.

Without this patch, the last line of an exclude file is silently
ignored if it doesn't end with a newline.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-pull: run repo-config with dash form.Junio C Hamano Sat, 18 Mar 2006 10:07:59 +0000 (02:07 -0800)

git-pull: run repo-config with dash form.

... as discussed on the list for consistency.

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

Merge branch 'jc/empty'Junio C Hamano Sat, 18 Mar 2006 08:43:47 +0000 (00:43 -0800)

Merge branch 'jc/empty'

* jc/empty:
revision traversal: --remove-empty fix (take #2).
revision traversal: --remove-empty fix.

Conflicts:

revision.c (adjust for the updates by Fredrik)

3% tighter packs for freeNicolas Pitre Sat, 18 Mar 2006 03:45:07 +0000 (22:45 -0500)

3% tighter packs for free

This patch makes for 3.4% smaller pack with the git repository, and
a bit more than 3% smaller pack with the kernel repository.

And so with _no_ measurable CPU difference.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Rewrite synopsis to clarify the two primary uses of... Jon Loeliger Sat, 18 Mar 2006 00:26:01 +0000 (18:26 -0600)

Rewrite synopsis to clarify the two primary uses of git-checkout.

Fix a few typo/grammar problems.

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix minor typo.Jon Loeliger Sat, 18 Mar 2006 00:25:46 +0000 (18:25 -0600)

Fix minor typo.

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Reference git-commit-tree for env vars.Jon Loeliger Sat, 18 Mar 2006 00:25:09 +0000 (18:25 -0600)

Reference git-commit-tree for env vars.

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Clarify git-rebase example commands.Jon Loeliger Sat, 18 Mar 2006 00:25:30 +0000 (18:25 -0600)

Clarify git-rebase example commands.

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Document the default source of template files.Jon Loeliger Sat, 18 Mar 2006 00:24:49 +0000 (18:24 -0600)

Document the default source of template files.

Also explain a bit more about how the template option works.

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Call out the two different uses of git-branch and fix... Jon Loeliger Sat, 18 Mar 2006 00:24:37 +0000 (18:24 -0600)

Call out the two different uses of git-branch and fix a typo.

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Add git-show referenceJon Loeliger Sat, 18 Mar 2006 00:21:39 +0000 (18:21 -0600)

Add git-show reference

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

blame: Fix git-blame <directory>Fredrik Kuivinen Fri, 17 Mar 2006 21:49:31 +0000 (22:49 +0100)

blame: Fix git-blame <directory>

Before this patch git-blame <directory> gave non-sensible output. (It
assigned blame to some random file in <directory>) Abort with an error
message instead.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

blame: Nicer outputFredrik Kuivinen Fri, 17 Mar 2006 21:49:28 +0000 (22:49 +0100)

blame: Nicer output

As pointed out by Junio, it may be dangerous to cut off people's names
after 15 bytes. If the name is encoded in an encoding which uses more
than one byte per code point we may end up with outputting garbage.
Instead of trying to do something smart, just output the entire name.
We don't gain much screen space by chopping it off anyway.

Furthermore, only output the file name if we actually found any
renames.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

fix imap-send for OSXRandal L. Schwartz Wed, 15 Mar 2006 23:35:06 +0000 (15:35 -0800)

fix imap-send for OSX

This patch works... I've been using it to stay current.

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

Let merge set the default strategy.Mark Hollomon Wed, 15 Mar 2006 22:51:41 +0000 (22:51 +0000)

Let merge set the default strategy.

If the user does not set a merge strategy for git-pull,
let git-merge calculate a default strategy.

[jc: with minor stylistic tweaks]

Signed-off-by: Mark Hollomon <markhollomon@comcast.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix broken slot reuse when fetching alternatesNick Hengeveld Wed, 15 Mar 2006 16:59:52 +0000 (08:59 -0800)

Fix broken slot reuse when fetching alternates

When fetching alternates, http-fetch may reuse the slot to fetch non-http
alternates if http-alternates does not exist. When doing so, it now needs
to update the slot's finished status so run_active_slot waits for the
non-http alternates request to finish.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'jc/pack'Junio C Hamano Mon, 13 Mar 2006 08:04:10 +0000 (00:04 -0800)

Merge branch 'jc/pack'

* jc/pack:
pack-objects: simplify "thin" pack.
verify-pack -v: show delta-chain histogram.

Merge branch 'jc/fsck'Junio C Hamano Mon, 13 Mar 2006 08:04:05 +0000 (00:04 -0800)

Merge branch 'jc/fsck'

* jc/fsck:
fsck-objects: Remove --standalone

Merge branch 'nh/http'Junio C Hamano Mon, 13 Mar 2006 08:01:57 +0000 (00:01 -0800)

Merge branch 'nh/http'

* nh/http:
http-push: cleanup
http-push: support for updating remote info/refs
http-push: improve remote lock management
http-push: refactor remote file/directory processing
HTTP slot reuse fixes
http-push: fix revision walk

Merge branch 'fk/blame'Junio C Hamano Mon, 13 Mar 2006 08:01:52 +0000 (00:01 -0800)

Merge branch 'fk/blame'

* fk/blame:
blame: Rename detection (take 2)
rev-lib: Make it easy to do rename tracking (take 2)
Make it possible to not clobber object.util in sort_in_topological_order (take 2)

revision traversal: --remove-empty fix (take #2).Junio C Hamano Sun, 12 Mar 2006 21:39:31 +0000 (13:39 -0800)

revision traversal: --remove-empty fix (take #2).

Marco Costalba reports that --remove-empty omits the commit that
created paths we are interested in. try_to_simplify_commit()
logic was dropping a parent we introduced those paths against,
which I think is not what we meant. Instead, this makes such
parent parentless.

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

revision traversal: --remove-empty fix.Junio C Hamano Sun, 12 Mar 2006 21:39:31 +0000 (13:39 -0800)

revision traversal: --remove-empty fix.

Marco Costalba reports that --remove-empty omits the commit that
created paths we are interested in. try_to_simplify_commit()
logic was dropping a parent we introduced those paths against,
which I think is not what we meant. Instead, this marks such
parent uninteresting. The traversal does not go beyond that
parent as advertised, but we still say that the current commit
changed things from that parent.

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

annotate-tests: override VISUAL when running tests.Mark Wooding Sun, 12 Mar 2006 14:00:30 +0000 (14:00 +0000)

annotate-tests: override VISUAL when running tests.

The tests hang for me waiting for Emacs with its output directed
somewhere strage, because I hedged my bets and set both EDITOR and
VISUAL to run Emacs.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>

imap-send: Add missing #include for macosxJohannes Schindelin Sun, 12 Mar 2006 10:55:53 +0000 (11:55 +0100)

imap-send: Add missing #include for macosx

There is a compile error without that.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-diff: -p disables rename detection.Junio C Hamano Sun, 12 Mar 2006 01:44:10 +0000 (17:44 -0800)

git-diff: -p disables rename detection.

imap-send: cleanup execl() call to use NULL sentinel... Marco Roeland Sat, 11 Mar 2006 08:55:50 +0000 (09:55 +0100)

imap-send: cleanup execl() call to use NULL sentinel instead of 0

Some versions of gcc check that calls to the exec() family have the proper
sentinel for variadic calls. This should be (char *) NULL according to the
man page. Although for all other purposes the 0 is equivalent, gcc
nevertheless does emit a warning for 0 and not for NULL. This also makes the
usage consistent throughout git.

The whitespace in function calls throughout imap-send.c has its own style,
so I left it that way.

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

annotate.perl triggers rpm bugsean Sat, 11 Mar 2006 07:39:28 +0000 (02:39 -0500)

annotate.perl triggers rpm bug

RPM, at least on Fedora boxes, automatically creates a
dependency for any perl "use" lines, and one of the help text
lines unfortunately begins like this:

-S, --rev-file revs-file
use revs from revs-file instead of calling git-rev-list

RPM gets confused and creates a false dependecy for the
nonexistent perl package "revs". Obviously this creates a
problem when someone goes to install the git-core rpm.

Since other help sentences all start with capital letter, make
this one match them by upcasing "Use". As a side effect, RPM
stops getting confused.

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

http-push: cleanupNick Hengeveld Sat, 11 Mar 2006 04:18:33 +0000 (20:18 -0800)

http-push: cleanup

More consistent usage string, condense push output, remove extra slashes
in URLs, fix unused variables, include HTTP method name in failure
messages.

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

http-push: support for updating remote info/refsNick Hengeveld Sat, 11 Mar 2006 04:18:18 +0000 (20:18 -0800)

http-push: support for updating remote info/refs

If info/refs exists on the remote, get a lock on info/refs, make sure that
there is a local copy of the object referenced in each remote ref (in case
someone else added a tag we don't have locally), do all the refspec updates,
and generate and send an updated info/refs file.

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

http-push: improve remote lock managementNick Hengeveld Sat, 11 Mar 2006 04:18:12 +0000 (20:18 -0800)

http-push: improve remote lock management

Associate the remote locks with the remote repo, add a function to check
and refresh all current locks.

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

http-push: refactor remote file/directory processingNick Hengeveld Sat, 11 Mar 2006 04:18:08 +0000 (20:18 -0800)

http-push: refactor remote file/directory processing

Replace single-use functions with one that can get a list of remote
collections and pass file/directory information to user-defined functions
for processing.

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

HTTP slot reuse fixesNick Hengeveld Sat, 11 Mar 2006 04:18:01 +0000 (20:18 -0800)

HTTP slot reuse fixes

Incorporate into http-push a fix related to accessing slot results after
the slot was reused, and fix a case in run_active_slot where a
finished slot wasn't detected if the slot was reused.

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

http-push: fix revision walkNick Hengeveld Sat, 11 Mar 2006 04:17:55 +0000 (20:17 -0800)

http-push: fix revision walk

The revision walk was not including tags because setup_revisions zeroes out
the revs flags. Pass --objects so it picks up all the necessary bits.

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

blame: Rename detection (take 2)Fredrik Kuivinen Fri, 10 Mar 2006 09:21:41 +0000 (10:21 +0100)

blame: Rename detection (take 2)

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

rev-lib: Make it easy to do rename tracking (take 2)Fredrik Kuivinen Fri, 10 Mar 2006 09:21:39 +0000 (10:21 +0100)

rev-lib: Make it easy to do rename tracking (take 2)

prune_fn in the rev_info structure is called in place of
try_to_simplify_commit. This makes it possible to do rename tracking
with a custom try_to_simplify_commit-like function.

This commit also introduces init_revisions which initialises the rev_info
structure with default values.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Make it possible to not clobber object.util in sort_in_... Fredrik Kuivinen Fri, 10 Mar 2006 09:21:37 +0000 (10:21 +0100)

Make it possible to not clobber object.util in sort_in_topological_order (take 2)

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Add git-imap-send, derived from isync 1.0.1.Mike McCormack Fri, 10 Mar 2006 05:32:50 +0000 (14:32 +0900)

Add git-imap-send, derived from isync 1.0.1.

git-imap-send drops a patch series generated by git-format-patch into an
IMAP folder. This allows patch submitters to send patches through their
own mail program.

git-imap-send uses the following values from the GIT repository
configuration:

The target IMAP folder:

[imap]
Folder = "INBOX.Drafts"

A command to open an ssh tunnel to the imap mail server.

[imap]
Tunnel = "ssh -q user@imap.server.com /usr/bin/imapd ./Maildir
2> /dev/null"

[imap]
Host = imap.server.com
User = bob
Password = pwd
Port = 143

repack: prune loose objects when -d is givenJunio C Hamano Sat, 11 Mar 2006 06:05:47 +0000 (22:05 -0800)

repack: prune loose objects when -d is given

[jc: the request originally came from Martin Atukunda, which was
improved further by Alex Riesen]

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

try_to_simplify_commit(): do not skip inspecting tree... Junio C Hamano Sat, 11 Mar 2006 05:59:37 +0000 (21:59 -0800)

try_to_simplify_commit(): do not skip inspecting tree change at boundary.

When git-rev-list (and git-log) collapsed ancestry chain to
commits that touch specified paths, we failed to inspect and
notice tree changes when we are about to hit uninteresting
parent. This resulted in "git rev-list since.. -- file" to
always show the child commit after the lower bound, even if it
does not touch the file. This commit fixes it.

Thanks for Catalin for reporting this.

See also:
461cf59f8924f174d7a0dcc3d77f576d93ed29a4

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

Fix t1200 test for breakage caused by removal of full... Junio C Hamano Fri, 10 Mar 2006 06:51:21 +0000 (22:51 -0800)

Fix t1200 test for breakage caused by removal of full-stop at the end of fast-forward message.

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

Describe how to add extra mail header lines in mail... Mike McCormack Fri, 10 Mar 2006 04:47:59 +0000 (13:47 +0900)

Describe how to add extra mail header lines in mail generated by git-format-patch.

Document the --attach flag.Mike McCormack Fri, 10 Mar 2006 04:47:24 +0000 (13:47 +0900)

Document the --attach flag.

allow double click on current HEAD id after git-pullOlaf Hering Sat, 11 Feb 2006 11:26:30 +0000 (12:26 +0100)

allow double click on current HEAD id after git-pull

Double click on to current HEAD commit id is not possible,
the dot has to go.

[jc: by popular requests.]

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

fsck-objects: Remove --standaloneJunio C Hamano Thu, 9 Mar 2006 09:44:19 +0000 (01:44 -0800)

fsck-objects: Remove --standalone

The fsck-objects command (back then it was called fsck-cache)
used to complain if objects referred to by files in .git/refs/
or objects stored in files under .git/objects/??/ were not found
as stand-alone SHA1 files (i.e. found in alternate object pools
or packed archives stored under .git/objects/pack). Back then,
packs and alternates were new curiosity and having everything as
loose objects were the norm.

When we adjusted the behaviour of fsck-cache to consider objects
found in packs are OK, we introduced the --standalone flag as a
backward compatibility measure.

It still correctly checks if your repository is complete and
consists only of loose objects, so in that sense it is doing the
"right" thing, but checking that is pointless these days. This
commit removes --standalone flag.

See also:

23676d407c63a6f67f8ce3ff192199bda03e6a03
8a498a05c3c6b2f53db669b24f36257ab213eb4c

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

refs.c::do_for_each_ref(): Finish error message lines... Junio C Hamano Thu, 9 Mar 2006 20:59:16 +0000 (12:59 -0800)

refs.c::do_for_each_ref(): Finish error message lines with "\n"

We used fprintf() to show an error message without terminating
it with LF; use error() for that.

cf. c401cb48e77459a4ccad76888ad31bef252facc5

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

Nicer output from 'git'Fredrik Kuivinen Thu, 9 Mar 2006 16:24:19 +0000 (17:24 +0100)

Nicer output from 'git'

[jc: with suggestions by Jan-Benedict Glaw]

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Use #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))Junio C Hamano Thu, 9 Mar 2006 19:58:05 +0000 (11:58 -0800)

Use #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))

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

Remove trailing dot after short descriptionFredrik Kuivinen Thu, 9 Mar 2006 16:24:50 +0000 (17:24 +0100)

Remove trailing dot after short description

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix some inconsistencies in the docsFredrik Kuivinen Thu, 9 Mar 2006 16:24:37 +0000 (17:24 +0100)

Fix some inconsistencies in the docs

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

contrib/git-svn: fix a harmless warning on rebuild... Eric Wong Thu, 9 Mar 2006 11:52:48 +0000 (03:52 -0800)

contrib/git-svn: fix a harmless warning on rebuild (with old repos)

It's only for repositories that were imported with very early
versions of git-svn. Unfortunately, some of those repos are out
in the wild already, so fix this warning.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

contrib/git-svn: remove the --no-stop-on-copy flagEric Wong Thu, 9 Mar 2006 11:50:34 +0000 (03:50 -0800)

contrib/git-svn: remove the --no-stop-on-copy flag

Output a big warning if somebody actually has a pre-1.0 version
of svn that doesn't support it.

Thanks to Yann Dirson for reminding me it still existed
and attempting to re-enable it :)

I think I subconciously removed support for it earlier...

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

contrib/git-svn: fix svn compat and fetch argsEric Wong Thu, 9 Mar 2006 11:48:47 +0000 (03:48 -0800)

contrib/git-svn: fix svn compat and fetch args

'svn info' doesn't work with URLs in svn <= 1.1. Now we
only run svn info in local directories.

As a side effect, this should also work better for 'init' off
directories that are no longer in the latest revision of the
repository.

svn checkout -r<revision> arguments are fixed.
Newer versions of svn (1.2.x) seem to need URL@REV as well as
-rREV to checkout a particular revision...

Add an example in the manpage of how to track directory that has
been moved since its initial revision.

A huge thanks to Yann Dirson for the bug reporting and testing
my original patch. Thanks also to Junio C Hamano for suggesting
a safer way to use git-rev-parse.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Don't recurse into parents marked uninteresting.Matthias Urlichs Thu, 9 Mar 2006 04:04:36 +0000 (05:04 +0100)

Don't recurse into parents marked uninteresting.

revision.c:make_parents_uninteresting() is exponential with the number
of merges in the tree. That's fine -- unless some other part of git
already has pulled the whole commit tree into memory ...

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

diff-delta: bound hash list length to avoid O(m*n)... Nicolas Pitre Wed, 8 Mar 2006 19:32:50 +0000 (14:32 -0500)

diff-delta: bound hash list length to avoid O(m*n) behavior

The diff-delta code can exhibit O(m*n) behavior with some patological
data set where most hash entries end up in the same hash bucket.

To prevent this, a limit is imposed to the number of entries that can
exist in the same hash bucket.

Because of the above the code is a tiny bit more expensive on average,
even if some small optimizations were added as well to atenuate the
overhead. But the problematic samples used to diagnoze the issue are now
orders of magnitude less expensive to process with only a slight loss in
compression.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

test-delta needs zlib to compileNicolas Pitre Wed, 8 Mar 2006 18:19:19 +0000 (13:19 -0500)

test-delta needs zlib to compile

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-fmt-merge-msg cleanupLinus Torvalds Thu, 9 Mar 2006 01:56:07 +0000 (17:56 -0800)

git-fmt-merge-msg cleanup

Since I've started using the "merge.summary" flag in my repo, my merge
messages look nicer, but I dislike how I get notifications of merges
within merges.

So I'd suggest this trivial change..

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

repo-config: give value_ a sane default so regexec... Jonas Fonseca Mon, 6 Mar 2006 05:23:30 +0000 (06:23 +0100)

repo-config: give value_ a sane default so regexec won't segfault

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Update http-push functionalityNick Hengeveld Wed, 8 Mar 2006 00:13:20 +0000 (16:13 -0800)

Update http-push functionality

This brings http-push functionality more in line with the ssh/git version,
by borrowing bits from send-pack and rev-list to process refspecs and
revision history in more standard ways. Also, the status of remote objects
is determined using PROPFIND requests for the object directory rather than
HEAD requests for each object - while it may be less efficient for small
numbers of objects, this approach is able to get the status of all remote
loose objects in a maximum of 256 requests.

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

cvsimport: Remove master-updating codeMatthias Urlichs Tue, 7 Mar 2006 09:08:34 +0000 (10:08 +0100)

cvsimport: Remove master-updating code

The code which tried to update the master branch was somewhat broken.
=> People should do that manually, with "git merge".

Signed-off-by: Matthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'sp/checkout'Junio C Hamano Tue, 7 Mar 2006 04:58:17 +0000 (20:58 -0800)

Merge branch 'sp/checkout'

* sp/checkout:
Add --temp and --stage=all options to checkout-index.

Merge branch 'fd/asciidoc'Junio C Hamano Tue, 7 Mar 2006 04:51:23 +0000 (20:51 -0800)

Merge branch 'fd/asciidoc'

* fd/asciidoc:
Tweak asciidoc output to work with broken docbook-xsl

Allow format-patch to attach patchesMike McCormack Mon, 6 Mar 2006 13:12:12 +0000 (22:12 +0900)

Allow format-patch to attach patches

The --attach patch to git-format-patch to attach patches instead of
inlining them. Some mailers linewrap inlined patches (eg. Mozilla).

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

Allow adding arbitary lines in the mail header generate... Mike McCormack Mon, 6 Mar 2006 13:10:21 +0000 (22:10 +0900)

Allow adding arbitary lines in the mail header generated by format-patch.

Entries may be added to the config file as follows:

[format]
headers = "Organization: CodeWeavers\nTo: wine-patches
<wine-patches@winehq.org>\n"

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

pack-objects: simplify "thin" pack.Junio C Hamano Sun, 5 Mar 2006 19:22:57 +0000 (11:22 -0800)

pack-objects: simplify "thin" pack.

There was a misguided logic to overly prefer using objects that
we are not going to pack as the base object. This was
unnecessary. It does not matter to the unpacking side where the
base object is -- it matters more to make the resulting delta
smaller.

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

annotate-blame: tests incomplete lines.Junio C Hamano Mon, 6 Mar 2006 08:41:17 +0000 (00:41 -0800)

annotate-blame: tests incomplete lines.

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

blame: unbreak "diff -U 0".Junio C Hamano Mon, 6 Mar 2006 08:32:50 +0000 (00:32 -0800)

blame: unbreak "diff -U 0".

The commit 604c86d15bb319a1e93ba218fca48ce1c500ae52 changed the
original "diff -u0" to "diff -u -U 0" for portability.

A big mistake without proper testing.

The form "diff -u -U 0" shows the default 3-line contexts,
because -u and -U 0 contradicts with each other; "diff -U 0" (or
its longhand "diff --unified=0") is what we meant.

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

Tweak asciidoc output to work with broken docbook-xslFrancis Daly Sun, 5 Mar 2006 23:13:36 +0000 (23:13 +0000)

Tweak asciidoc output to work with broken docbook-xsl

docbook-xsl v1.68 incorrectly converts "<screen>" from docbook to
manpage by not rendering it verbatim. v1.69 handles it correctly, but
not many current popular distributions ship with it.

asciidoc by default converts "listingblock" to "<screen>". This change
causes asciidoc in git to convert "listingblock" to "<literallayout>", which
both old and new docbook-xsl handle correctly.

The difference can be seen in any manpage which includes a multi-line
example, such as git-branch.

[jc: the original patch was an disaster for html backends, so I made
it apply only to docbook backends. ]

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

annotate-blame test: add evil merge.Junio C Hamano Mon, 6 Mar 2006 06:37:15 +0000 (22:37 -0800)

annotate-blame test: add evil merge.

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

annotate-blame test: don't "source", but say "."Junio C Hamano Mon, 6 Mar 2006 06:10:26 +0000 (22:10 -0800)

annotate-blame test: don't "source", but say "."

Just I am old fashioned. Source inclusion in bourne shell is
"." (dot), not "source" -- that's csh.

[jc: yes I know bash groks it, but I am old fashioned.]

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

annotate/blame tests updates.Junio C Hamano Mon, 6 Mar 2006 06:07:37 +0000 (22:07 -0800)

annotate/blame tests updates.

This rewrites the result check code a bit. The earlier one
using awk was splitting columns at any whitespace, which
confused lines attributed incorrectly to the merge made by the
default author "A U Thor <author@example.com>" with lines
attributed to author "A".

The latest test by Ryan to add the "starting from older commit"
test is also included, with another older commit test.

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

annotate: Support annotation of files on other revisions.Ryan Anderson Mon, 6 Mar 2006 02:43:53 +0000 (21:43 -0500)

annotate: Support annotation of files on other revisions.

This is a bug fix, and cleans up one or two other things spotted during the
course of tracking down the main bug here.

[jc: the part that updates test-suite is split out to the next
one. Also I dropped "use Data::Dumper;" which seemed leftover
from debugging session.]

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git/Documentation: fix SYNOPSIS style bugsDmitry V. Levin Mon, 6 Mar 2006 00:00:48 +0000 (03:00 +0300)

git/Documentation: fix SYNOPSIS style bugs

This trivial patch fixes SYNOPSIS style bugs.

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

blame: avoid "diff -u0".Junio C Hamano Sun, 5 Mar 2006 22:43:56 +0000 (14:43 -0800)

blame: avoid "diff -u0".

As Linus suggests, use "diff -u -U 0" instead.

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

git-blame: Use the same tests for git-blame as for... Fredrik Kuivinen Sun, 5 Mar 2006 11:13:34 +0000 (12:13 +0100)

git-blame: Use the same tests for git-blame as for git-annotate

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

blame and annotate: show localtime with timezone.Junio C Hamano Sun, 5 Mar 2006 22:48:01 +0000 (14:48 -0800)

blame and annotate: show localtime with timezone.

Earlier they showed gmtime and timezone, which was inconsistent
with the way our commits and tags are pretty-printed.

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

blame: avoid -lm by not using log().Junio C Hamano Sun, 5 Mar 2006 22:46:36 +0000 (14:46 -0800)

blame: avoid -lm by not using log().

... as suggested on the list.

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

git-blame: Make the output human readableFredrik Kuivinen Sun, 5 Mar 2006 11:03:51 +0000 (12:03 +0100)

git-blame: Make the output human readable

The default output mode is slightly different from git-annotate's.
However, git-annotate's output mode can be obtained by using the
'-c' flag.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

get_revision(): do not dig deeper when we know we are... Linus Torvalds Sun, 5 Mar 2006 17:53:52 +0000 (09:53 -0800)

get_revision(): do not dig deeper when we know we are at the end.

This resurrects the special casing for "rev-list -n 1" which
avoided reading parents unnecessarily.

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

documentation: add 'see also' sections to git-rm and... Jeff Muizelaar Sun, 5 Mar 2006 21:18:19 +0000 (16:18 -0500)

documentation: add 'see also' sections to git-rm and git-add

Pair up git-add and git-rm by adding a 'see also' section that
references the opposite command to each of their documentation files.

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

contrib/emacs/Makefile: Provide tool for byte-compiling... Mark Wooding Sun, 5 Mar 2006 16:14:31 +0000 (16:14 +0000)

contrib/emacs/Makefile: Provide tool for byte-compiling files.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitignore: Ignore some more boring things.Mark Wooding Sun, 5 Mar 2006 12:25:43 +0000 (12:25 +0000)

gitignore: Ignore some more boring things.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>

verify-pack -v: show delta-chain histogram.Junio C Hamano Sun, 5 Mar 2006 19:20:12 +0000 (11:20 -0800)

verify-pack -v: show delta-chain histogram.

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

Const tightening.Junio C Hamano Sun, 5 Mar 2006 10:47:29 +0000 (02:47 -0800)

Const tightening.

Mark Wooding noticed there was a type mismatch warning in git.c; this
patch does things slightly differently (mostly tightening const) and
was what I was holding onto, waiting for the setup-revisions change
to be merged into the master branch.

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

Documentation/Makefile: Some `git-*.txt' files aren... Mark Wooding Sun, 5 Mar 2006 09:36:33 +0000 (09:36 +0000)

Documentation/Makefile: Some `git-*.txt' files aren't manpages.

In particular, git-tools.txt isn't a manpage, and my Asciidoc gets upset
by it. The simplest fix is to Remove articles from the list of manpages
the Makefile.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>

cvsserver: updated documentationMartin Langhoff Sun, 5 Mar 2006 10:11:00 +0000 (23:11 +1300)

cvsserver: updated documentation

... and stripped trailing whitespace to appease the Gods...

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Add --temp and --stage=all options to checkout-index.Shawn Pearce Sun, 5 Mar 2006 08:24:15 +0000 (03:24 -0500)

Add --temp and --stage=all options to checkout-index.

Sometimes it is convient for a Porcelain to be able to checkout all
unmerged files in all stages so that an external merge tool can be
executed by the Porcelain or the end-user. Using git-unpack-file
on each stage individually incurs a rather high penalty due to the
need to fork for each file version obtained. git-checkout-index -a
--stage=all will now do the same thing, but faster.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

cosmetics: change from 'See-Also' to 'See Also'Jeff Muizelaar Sun, 5 Mar 2006 06:20:07 +0000 (01:20 -0500)

cosmetics: change from 'See-Also' to 'See Also'

Changes the documentation that uses 'See-Also' to the more common
'See Also' form.

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

git-commit --amend: allow empty commit.Junio C Hamano Sun, 5 Mar 2006 04:36:28 +0000 (20:36 -0800)

git-commit --amend: allow empty commit.

When amending a commit only to update the commit log message, git-status
would rightly say "Nothing to commit." Do not let this prevent commit to
be made.

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

Cauterize dropped or duplicate bits from next.Junio C Hamano Sun, 5 Mar 2006 00:18:43 +0000 (16:18 -0800)

Cauterize dropped or duplicate bits from next.

I am very sorry to do this, but without this funky octopus, "git
log --no-merges master..next" will show commits already merged
into "master" forever.

There are some commits on the next branch (which is never to be
rewound) that are reverts of other commits on the next branch.
They are to revert the finer grained delta experiments that
turned out to have undesirable performance effects. Also there
are some other commits that were first done as a merge into
"next" (a pull request based on next) and then cherry picked
into master. Since they are not going to be merged into
"master" ever, they will stay forever in "log master..next".

Yuck.

So this commit records the fact that the commits currently shown
by "git log --no-merges master..next" to be merged into "master"
are already in the master, either because they really are (in
the case of git-cvsserver bits, which needed cherry-picking into
"master"), or because they are fully reverted in "next" (in the
case of finer-grained delta bits).

Here is the way I made this commit:

(1) Inspect "gitk --no-merges --parents master..next"

This shows what git thinks are missing from master. It
shows chain of commits that are already merged and chain of
commits whose net effect should amount to a no-op.

Look at each commits and make sure they are either unwanted
or already merged by cherry-picking.

(2) Record the tip of branches that I do not want. In this
case, the following were unwanted:

cfcbd3427e67056a00ec832645b057eaf33888d9 cvsserver
c436eb8cf1efa3fe2c70100ae0cbc48f0feaf5af diff-delta
38fd0721d0a2a1a723bc28fc0817e3571987b1ef diff-delta
f0bcd511ee3a00b7fd3975a386aa1165c07a0721 cvsserver
2b8d9347aa1a11f1ac13591f89ca9f984d467c77 diff-delta

(3) Shorten the list by finding independent ones from the
above.

$ git show-branch --independent $the $above $tips

cfcbd3427e67056a00ec832645b057eaf33888d9
c436eb8cf1efa3fe2c70100ae0cbc48f0feaf5af

(4) Checkout "master" and cauterize them with "ours" strategy:

$ git merge -s ours "`cat $this-file`" HEAD cfcbd3 c436eb

Merge part of 'sp/checkout'Junio C Hamano Sat, 4 Mar 2006 22:58:11 +0000 (14:58 -0800)

Merge part of 'sp/checkout'

AsciiDoc fix for tutorialFrancis Daly Sat, 4 Mar 2006 16:35:27 +0000 (16:35 +0000)

AsciiDoc fix for tutorial

RE \^.+\^ becomes <sup>. Not wanted here

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