gitweb.git
gitweb: Add an option to href() to return full URLJakub Narebski Sun, 19 Nov 2006 14:05:21 +0000 (15:05 +0100)

gitweb: Add an option to href() to return full URL

href subroutine by default generates absolute URL (generated using
CGI::url(-absolute=>1), and saved in $my_uri) using $my_uri as base;
add an option to generate full URL using $my_url as base.

New feature usage: href(..., -full=>1)

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitweb: New improved formatting of chunk header in... Jakub Narebski Sat, 18 Nov 2006 22:35:40 +0000 (23:35 +0100)

gitweb: New improved formatting of chunk header in diff

If we have provided enough info, and diff is not combined diff,
and if provided diff line is chunk header, then:
* split chunk header into .chunk_info and .section span elements,
first containing proper chunk header, second section heading
(aka. which function), for separate styling: the proper chunk
header is on non-white background, section heading part uses
slightly lighter color.
* hyperlink from-file-range to starting line of from-file, if file
was not created.
* hyperlink to-file-range to starting line of to-file, if file
was not deleted.
Links are of invisible variety (and "list" class).

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitweb: Default to $hash_base or HEAD for $hash in... Jakub Narebski Sat, 18 Nov 2006 22:35:41 +0000 (23:35 +0100)

gitweb: Default to $hash_base or HEAD for $hash in "commit" and "commitdiff"

Set $hash parameter to $hash_base || "HEAD" if it is not set (if it is
not true to be more exact). This allows [hand-edited] URLs with 'action'
"commit" or "commitdiff" but without 'hash' parameter.

If there is 'h' (hash) parameter provided, then gitweb tries
to use this. HEAD is used _only_ if nether hash, nor hash_base
are provided, i.e. for URL like below
URL?p=project.git;a=commit
i.e. without neither 'h' nor 'hb'.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitweb: Buffer diff header to deal with split patches... Jakub Narebski Sat, 18 Nov 2006 22:35:39 +0000 (23:35 +0100)

gitweb: Buffer diff header to deal with split patches + git_patchset_body refactoring

There are some cases when one line from "raw" git-diff output (raw format)
corresponds to more than one patch in the patchset git-diff output. To deal
with this buffer git diff header and extended diff header (everything up to
actual patch) to check from information from "index <hash>..<hash>" extended
header line if the patch corresponds to the same or next difftree raw line.

This could also be used to gather information needed for hyperlinking, and
used for printing gitweb quoted filenames, from extended diff header instead
of raw git-diff output.

While at it, refactor git_patchset_body subroutine from the event-driven,
AWK-like state-machine parsing to sequential parsing: for each patch
parse (and output) git diff header, parse extended diff header, parse two-line
from-file/to-file diff header, parse patch itself; patch ends with the end
of input [file] or the line matching m/^diff /.

For better understanding the code, there were added assertions in the
comments a la Carp::Assert module. Just in case there is commented out code
dealing with unexpected end of input (should not happen, hence commented
out).

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitweb: Protect against possible warning in git_commitdiffJakub Narebski Sat, 18 Nov 2006 22:35:38 +0000 (23:35 +0100)

gitweb: Protect against possible warning in git_commitdiff

We may read an undef from <$fd> and unconditionally chomping it
would result in a warning.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Teach SubmittingPatches about git-commit -sPaolo Ciarrocchi Tue, 21 Nov 2006 18:55:20 +0000 (19:55 +0100)

Teach SubmittingPatches about git-commit -s

As discussed on git mailing list let's teach the reader about
the possiblity to have automatically signed off the commit running
the git-commit -s command

Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

do_for_each_ref: perform the same sanity check for... Junio C Hamano Sun, 19 Nov 2006 06:13:33 +0000 (22:13 -0800)

do_for_each_ref: perform the same sanity check for leftovers.

An earlier commit b37a562a added a check to see if the ref
points at a valid object (as a part of 'negative ref' support
which we currently do not use), but did so only while iterating
over both packed and loose refs, and forgot to apply the same
check while iterating over the remaining ones.

We might want to replace the "if null then omit it" check with
"eh --- what business does a 0{40} value have here?" complaint
later since we currently do not use negative refs, but that is
a separate issue.

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

git-fetch: follow lightweit tags as well.Junio C Hamano Sun, 19 Nov 2006 05:39:17 +0000 (21:39 -0800)

git-fetch: follow lightweit tags as well.

This side-ports commit fd19f620 from Cogito, in which I fixed
exactly the same bug. Somehow nobody noticed this for a long
time in git.

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

Documentation: Correct alternates documentation, docume... Petr Baudis Sat, 18 Nov 2006 23:30:15 +0000 (00:30 +0100)

Documentation: Correct alternates documentation, document http-alternates

For one, the documentation invalidly claimed that the paths have to be
absolute when that's not the case and in fact there is a very valid reason
not to use absolute paths (documented the reason as well).

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Documentation: Define symref and update HEAD descriptionPetr Baudis Sat, 18 Nov 2006 19:44:08 +0000 (20:44 +0100)

Documentation: Define symref and update HEAD description

HEAD was still described as a symlink instead of a symref.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Document git-runstatusRene Scharfe Sat, 18 Nov 2006 14:15:49 +0000 (15:15 +0100)

Document git-runstatus

I copied most of the text from git-status.txt.

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

git-apply: slightly clean up bitfield usageRene Scharfe Sat, 18 Nov 2006 12:07:09 +0000 (13:07 +0100)

git-apply: slightly clean up bitfield usage

This patch fixes a sparse warning about inaccurate_eof being a
"dubious one-bit signed bitfield", makes three more binary
variables members of this (now unsigned) bitfield and adds a
short comment to indicate the nature of two ternary variables.

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

sparse fix: Using plain integer as NULL pointerRene Scharfe Sat, 18 Nov 2006 12:06:56 +0000 (13:06 +0100)

sparse fix: Using plain integer as NULL pointer

Z_NULL is defined as 0, use a proper NULL pointer in its stead.

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

sparse fix: non-ANSI function declarationRene Scharfe Sat, 18 Nov 2006 12:07:06 +0000 (13:07 +0100)

sparse fix: non-ANSI function declaration

The declaration of discard_cache() in cache.h already has its "void".

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

git-apply: Documentation typo fixPetr Baudis Sat, 18 Nov 2006 05:05:11 +0000 (06:05 +0100)

git-apply: Documentation typo fix

inacurate -> inaccurate, sorry if it was a pun. ;-)

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix git-for-each-refs broken for tagsPetr Baudis Sat, 18 Nov 2006 02:56:52 +0000 (03:56 +0100)

Fix git-for-each-refs broken for tags

Unfortunately, git-for-each-refs is currently unusable for peeking into tag
comments, since it uses freed pointers, so it just prints out all sort of
garbage.

This makes it strdup() contents and body values.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

"git fmt-merge-msg" SIGSEGVLinus Torvalds Fri, 17 Nov 2006 06:57:20 +0000 (22:57 -0800)

"git fmt-merge-msg" SIGSEGV

Ok, this is a _really_ stupid case, and I don't think it matters, but hey,
we should never SIGSEGV.

Steps to reproduce:

mkdir duh
cd duh
git init-db
git-fmt-merge-msg < /dev/null

will cause a SIGSEGV in cmd_fmt_merge_msg(), because we're doing a
strncmp() with a NULL current_branch.

And yeah, it's an insane schenario, and no, it doesn't really matter. The
only reason I noticed was that a broken version of my "git pull" into an
empty directory would cause this.

This silly patch just replaces the SIGSEGV with a controlled exit with an
error message.

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

git-pull: allow pulling into an empty repositoryLinus Torvalds Thu, 16 Nov 2006 19:47:22 +0000 (11:47 -0800)

git-pull: allow pulling into an empty repository

We used to complain that we cannot merge anything we fetched
with a local branch that does not exist yet. Just treat the
case as a natural extension of fast forwarding and make the
local branch'es tip point at the same commit we just fetched.
After all an empty repository without an initial commit is an
ancestor of any commit.

[jc: I added a trivial test. We've become sloppy but we should
stick to the discipline of covering new behaviour with new
tests. ]

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

convert-objects: set _XOPEN_SOURCE to 600Junio C Hamano Wed, 15 Nov 2006 22:57:47 +0000 (14:57 -0800)

convert-objects: set _XOPEN_SOURCE to 600

Otherwise OpenBSD header files drop S_ISLNK() definition which is used in
an inline defined in cache.h

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

Run "git repack -a -d" once more at end, if there's... Jim Meyering Wed, 15 Nov 2006 20:15:44 +0000 (21:15 +0100)

Run "git repack -a -d" once more at end, if there's 1MB or more of not-packed data.

Although I converted upstream coreutils to git last month, I just
reconverted coreutils once again, as a test, and ended up with a
git repository of about 130MB (contrast with my packed git repo of
size 52MB). That was because there were a lot of commits (but < 1024)
after the final automatic "git-repack -a -d".

Running a final
git-repack -a -d && git-prune-packed
cut the final repository size down to the expected size.

So this looks like an easy way to improve git-cvsimport.
Just run "git repack ..." at the end if there's more than
some reasonable amount of not-packed data.

My choice of 1MB is a little arbitrarily. I wouldn't mind missing
the minimal repo size by 1MB. At the other end of the spectrum,
it's probably not worthwhile to pack everything when the total
repository size is less than 1MB.

Here's the patch:

Signed-off-by: Jim Meyering <jim@meyering.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitweb: Put back shortlog instead of graphiclog in... Alexandre Julliard Wed, 15 Nov 2006 20:37:50 +0000 (21:37 +0100)

gitweb: Put back shortlog instead of graphiclog in the project list.

Looks like a repo.or.cz-specific change slipped in.

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

git-checkout: allow pathspec to recover lost working... Junio C Hamano Wed, 15 Nov 2006 18:54:10 +0000 (10:54 -0800)

git-checkout: allow pathspec to recover lost working tree directory

It is often wanted on the #git channel that this were to work to
recover removed directory:

rm -fr Documentation
git checkout -- Documentation
git checkout HEAD -- Documentation ;# alternatively

Now it does.

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

git-checkout: do not allow -f and -m at the same time.Junio C Hamano Wed, 15 Nov 2006 18:46:10 +0000 (10:46 -0800)

git-checkout: do not allow -f and -m at the same time.

Instead of silently ignoring one over the other, complain on
this incompatible combination.

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

Seek back to current filepos when mmap()ing with NO_MMAPJohannes Schindelin Wed, 15 Nov 2006 16:27:54 +0000 (17:27 +0100)

Seek back to current filepos when mmap()ing with NO_MMAP

"git-index-pack --fix-thin" relies on mmap() not changing the current
file position (otherwise the pack will be corrupted when writing the
final SHA1). Meet that expectation.

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

GIT 1.4.4 v1.4.4Junio C Hamano Wed, 15 Nov 2006 06:11:26 +0000 (22:11 -0800)

GIT 1.4.4

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

Merge branch 'maint'Junio C Hamano Mon, 13 Nov 2006 22:30:39 +0000 (14:30 -0800)

Merge branch 'maint'

* maint:
Rework cvsexportcommit to handle binary files for all cases.
Catch errors when writing an index that contains invalid objects.
test-lib.sh: A command dying due to a signal is an unexpected failure.
git-update-index(1): fix use of quoting in section title

Rework cvsexportcommit to handle binary files for all... Robin Rosenberg Sun, 12 Nov 2006 15:29:42 +0000 (16:29 +0100)

Rework cvsexportcommit to handle binary files for all cases.

Also adds test cases for adding removing and deleting
binary and text files plus two tests for the checks on
binary files.

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Catch errors when writing an index that contains invali... Johannes Sixt Mon, 13 Nov 2006 13:50:00 +0000 (13:50 +0000)

Catch errors when writing an index that contains invalid objects.

If git-write-index is called without --missing-ok, it reports invalid
objects that it finds in the index. But without this patch it dies
right away or may run into an infinite loop.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>

test-lib.sh: A command dying due to a signal is an... Johannes Sixt Mon, 13 Nov 2006 13:50:04 +0000 (13:50 +0000)

test-lib.sh: A command dying due to a signal is an unexpected failure.

When test_expect_failure detects that a command failed, it still has to
treat a program that crashed from a signal as unexpected failure.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-update-index(1): fix use of quoting in section... Jonas Fonseca Sun, 12 Nov 2006 21:28:43 +0000 (22:28 +0100)

git-update-index(1): fix use of quoting in section title

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

GIT 1.4.4-rc2 v1.4.4-rc2Junio C Hamano Sun, 12 Nov 2006 02:22:31 +0000 (18:22 -0800)

GIT 1.4.4-rc2

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

Merge branch 'maint'Junio C Hamano Sun, 12 Nov 2006 02:30:31 +0000 (18:30 -0800)

Merge branch 'maint'

* maint:
git-cvsserver: read from git with -z to get non-ASCII pathnames.

git-cvsserver: read from git with -z to get non-ASCII... v1.4.3.5Junio C Hamano Fri, 10 Nov 2006 19:53:41 +0000 (11:53 -0800)

git-cvsserver: read from git with -z to get non-ASCII pathnames.

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

Merge branch 'maint'Junio C Hamano Sat, 11 Nov 2006 22:49:25 +0000 (14:49 -0800)

Merge branch 'maint'

* maint:
path-list: fix path-list-insert return value

path-list: fix path-list-insert return valueJunio C Hamano Sat, 11 Nov 2006 22:45:35 +0000 (14:45 -0800)

path-list: fix path-list-insert return value

When path-list-insert is called on an existing path, it returned an
unrelated element in the list. Luckily most of the callers are
ignoring the return value, but merge-recursive uses it at three places
and this would have resulted in a bogus rename detection.

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

git-annotate: fix -S on graft file with comments.Junio C Hamano Fri, 10 Nov 2006 21:39:01 +0000 (13:39 -0800)

git-annotate: fix -S on graft file with comments.

The graft file can contain comment lines and read_graft_line can
return NULL for such an input, which should be skipped by the
reader.

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

git-annotate: no need to exec blame; it is built-in... Junio C Hamano Fri, 10 Nov 2006 21:36:44 +0000 (13:36 -0800)

git-annotate: no need to exec blame; it is built-in now.

Merge branch 'maint'Junio C Hamano Thu, 9 Nov 2006 23:08:19 +0000 (15:08 -0800)

Merge branch 'maint'

* maint:
git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
git-svn: fix dcommit losing changes when out-of-date from svn
git-svn: don't die on rebuild when --upgrade is specified
git-svn: avoid printing filenames of files we're not tracking

git-rebase: Use --ignore-if-in-upstream option when... Robert Shearman Tue, 3 Oct 2006 16:29:26 +0000 (17:29 +0100)

git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.

This reduces the number of conflicts when rebasing after a series of
patches to the same piece of code is committed upstream.

Signed-off-by: Robert Shearman <rob@codeweavers.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Documentation: move blame examplesJunio C Hamano Thu, 9 Nov 2006 18:44:56 +0000 (10:44 -0800)

Documentation: move blame examples

This moves the example to specify a line range with regexps to
a later part of the manual page that has similar examples.

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

Merge branch 'maint'Junio C Hamano Thu, 9 Nov 2006 17:40:59 +0000 (09:40 -0800)

Merge branch 'maint'

* maint:
Nicer error messages in case saving an object to db goes wrong

git-svn: fix dcommit losing changes when out-of-date... Eric Wong Thu, 9 Nov 2006 09:19:37 +0000 (01:19 -0800)

git-svn: fix dcommit losing changes when out-of-date from svn

There was a bug in dcommit (and commit-diff) which caused deltas
to be generated against the latest version of the changed file
in a repository, and not the revision we are diffing (the tree)
against locally.

This bug can cause recent changes to the svn repository to be
silently clobbered by git-svn if our repository is out-of-date.

Thanks to Steven Grimm for noticing the bug.

The (few) people using the commit-diff command are now required
to use the -r/--revision argument. dcommit usage is unchanged.

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

git-svn: don't die on rebuild when --upgrade is specifiedEric Wong Sun, 5 Nov 2006 05:51:11 +0000 (21:51 -0800)

git-svn: don't die on rebuild when --upgrade is specified

--copy-remote and --upgrade are rarely (never?) used together,
so if --copy-remote is specified, that means the user really
wanted to copy the remote ref, and we should fail if that fails.

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

git-svn: avoid printing filenames of files we're not... Eric Wong Sun, 5 Nov 2006 05:51:10 +0000 (21:51 -0800)

git-svn: avoid printing filenames of files we're not tracking

This is purely an aesthetic change, we already skip importing of
files that don't affect the subdirectory we import.

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

Nicer error messages in case saving an object to db... Petr Baudis Thu, 9 Nov 2006 12:52:05 +0000 (13:52 +0100)

Nicer error messages in case saving an object to db goes wrong

Currently the error e.g. when pushing to a read-only repository is quite
confusing, this attempts to clean it up, unifies error reporting between
various object writers and uses error() on couple more places.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitweb: fix unmatched div in commitdiffJunio C Hamano Thu, 9 Nov 2006 10:33:35 +0000 (02:33 -0800)

gitweb: fix unmatched div in commitdiff

When the last filepair changed only metainfo we failed to close the
extended header <div>.

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

gitweb: protect commit messages from controls.Junio C Hamano Thu, 9 Nov 2006 08:57:13 +0000 (00:57 -0800)

gitweb: protect commit messages from controls.

The same change as the previous. It is rather sad that commit log
message parser gives list of chomped lines while tag message parser
gives unchomped ones.

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

gitweb: protect blob and diff output lines from controls.Junio C Hamano Wed, 8 Nov 2006 23:11:10 +0000 (15:11 -0800)

gitweb: protect blob and diff output lines from controls.

This revealed that the output from blame and tag was not chomped
properly and was relying on HTML output not noticing that extra
whitespace that resulted from the newline, which was also fixed.

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

git-pickaxe: retire pickaxeJunio C Hamano Thu, 9 Nov 2006 02:47:54 +0000 (18:47 -0800)

git-pickaxe: retire pickaxe

Just make it take over blame's place. Documentation and command
have all stopped mentioning "git-pickaxe". The built-in synonym
is left in the command table, so you can still say "git pickaxe",
but it probably is a good idea to retire it as well.

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

Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano Wed, 8 Nov 2006 21:43:08 +0000 (13:43 -0800)

Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
[PATCH] gitk: Fix nextfile() and add prevfile()

git-status: quote LF in its outputJunio C Hamano Wed, 8 Nov 2006 21:20:46 +0000 (13:20 -0800)

git-status: quote LF in its output

Otherwise, commit log template would get the remainder of the
filename start on a new line unquoted and the log gets messed
up.

I initially considered using the full quote_c_style(), but the
output from the command is primarily for human consumption so
chose to leave other control characters and bytes with high-bits
unmolested.

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

gitweb: do not give blame link unconditionally in diff... Junio C Hamano Wed, 8 Nov 2006 20:22:04 +0000 (12:22 -0800)

gitweb: do not give blame link unconditionally in diff-tree view

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

gitweb: New improved patchset viewJakub Narebski Wed, 8 Nov 2006 16:59:41 +0000 (17:59 +0100)

gitweb: New improved patchset view

Replace "gitweb diff header" with its full sha1 of blobs and replace
it by "git diff" header and extended diff header. Change also somewhat
highlighting of diffs.

Added `file_type_long' subroutine to convert file mode in octal to
file type description (only for file modes which used by git).

Changes:
* "gitweb diff header" which looked for example like below:
file:_<sha1 before>_ -> file:_<sha1 after>_
where 'file' is file type and '<sha1>' is full sha1 of blob is
changed to
diff --git _a/<file before>_ _b/<file after>_
In both cases links are visible and use default link style. If file
is added, a/<file> is not hyperlinked. If file is deleted, b/<file>
is not hyperlinked.
* there is added "extended diff header", with <path> and <hash>
hyperlinked (and <hash> shortened to 7 characters), and <mode>
explained: '<mode>' is extended to '<mode> (<file type description>)',
where added text is slightly lighter to easy distinguish that it
was added (and it is difference from git-diff output).
* from-file/to-file two-line header lines have slightly darker color
than removed/added lines.
* chunk header has now delicate line above for easier finding chunk
boundary, and top margin of 2px, both barely visible.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitweb: Use character or octal escape codes (and add... Jakub Narebski Wed, 8 Nov 2006 10:50:07 +0000 (11:50 +0100)

gitweb: Use character or octal escape codes (and add span.cntrl) in esc_path

Instead of simply hiding control characters in esc_path by replacing
them with '?', use Character Escape Codes (CEC) i.e. alphabetic
backslash sequences like those found in C programming language and
many other languages influenced by it, such as Java and Perl. If
control characted doesn't have corresponding character escape code,
use octal char sequence to escape it.

Alternatively, controls can be replaced with Unicode Control
Pictures U+2400 - U+243F (9216 - 9279), the Unicode characters
reserved for representing control characters when it is
necessary to print or display them.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitweb: Better git-unquoting and gitweb-quoting of... Jakub Narebski Wed, 8 Nov 2006 10:48:56 +0000 (11:48 +0100)

gitweb: Better git-unquoting and gitweb-quoting of pathnames

Extend unquote subroutine, which unquotes quoted and escaped filenames
which git may return, to deal not only with octal char sequence
quoting, but also quoting ordinary characters including '\"' and '\\'
which are respectively quoted '"' and '\', and to deal also with
C escape sequences including '\t' for TAB and '\n' for LF.

Add esc_path subroutine for gitweb quoting and HTML escaping filenames
(currently it does equivalent of ls' --hide-control-chars, which means
showing undisplayable characters (including '\n' and '\t') as '?'
(question mark) character, and use 'span' element with cntrl CSS class
to help rendering them differently.

Convert gitweb to use esc_path correctly to print pathnames.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitweb: minimally fix "fork" support.Junio C Hamano Wed, 8 Nov 2006 06:37:17 +0000 (22:37 -0800)

gitweb: minimally fix "fork" support.

A forked project is defined to be $projname/$forkname.git for
$projname.git; the code did not check this correctly and mistook
$projname/.git to be a fork of itself. This minimally fixes the
breakage.

Also forks were not checked when index.aux file was in use.
Listing the forked ones in index.aux would show them also on the
toplevel index which may go against the hierarchical nature of
forks, but again this is a minimal fix to whip it in a better
shape suitable to be in the 'master' branch.

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

gitweb: fix disabling of "forks"Junio C Hamano Wed, 8 Nov 2006 06:00:45 +0000 (22:00 -0800)

gitweb: fix disabling of "forks"

Apparently this code was never tested without "forks". check-feature
returns a one-element list (0) when disabled, and assigning that to a
scalar variable made it to be called in a scalar context, which meant
my $check_forks = gitweb_check_feature("forks") were always 1!

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

GIT 1.4.3-rc1 v1.4.4-rc1Junio C Hamano Wed, 8 Nov 2006 00:36:11 +0000 (16:36 -0800)

GIT 1.4.3-rc1

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

Merge branch 'maint'Junio C Hamano Wed, 8 Nov 2006 00:34:30 +0000 (16:34 -0800)

Merge branch 'maint'

* maint:
remove an unneeded test

Merge branch 'jc/pickaxe'Junio C Hamano Wed, 8 Nov 2006 00:33:59 +0000 (16:33 -0800)

Merge branch 'jc/pickaxe'

git-pickaxe: allow "-L <something>,+N"Junio C Hamano Wed, 8 Nov 2006 00:20:02 +0000 (16:20 -0800)

git-pickaxe: allow "-L <something>,+N"

With this,

git pickaxe -L '/--progress/,+20' v1.4.0 -- pack-objects.c

gives you 20 lines starting from the first occurrence of
'--progress' in pack-objects, digging from v1.4.0 version.

You can also say

git pickaxe -L '/--progress/,-5' v1.4.0 -- pack-objects.c

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

git-pack-objects progress flag documentation and cleanupNicolas Pitre Tue, 7 Nov 2006 15:51:23 +0000 (10:51 -0500)

git-pack-objects progress flag documentation and cleanup

This adds documentation for --progress and --all-progress, remove a
duplicate --progress handling and make usage string more readable.

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

remove an unneeded testTero Roponen Tue, 7 Nov 2006 10:44:33 +0000 (12:44 +0200)

remove an unneeded test

In wt-status.c there is a test which does nothing.
This patch removes it.

Signed-off-by: Tero Roponen <teanropo@jyu.fi>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'jc/read-tree'Junio C Hamano Tue, 7 Nov 2006 23:41:34 +0000 (15:41 -0800)

Merge branch 'jc/read-tree'

* jc/read-tree:
t6022: ignoring untracked files by merge-recursive when they do not matter
merge-recursive: adjust to loosened "working file clobbered" check
merge-recursive: make a few functions static.
merge-recursive: use abbreviated commit object name.
merge: loosen overcautious "working file will be lost" check.

Merge branch 'np/index-pack'Junio C Hamano Tue, 7 Nov 2006 23:39:56 +0000 (15:39 -0800)

Merge branch 'np/index-pack'

* np/index-pack:
remove .keep pack lock files when done with refs update
have index-pack create .keep file more carefully
improve fetch-pack's handling of kept packs
git-fetch can use both --thin and --keep with fetch-pack now
Teach receive-pack how to keep pack files based on object count.
Allow pack header preprocessing before unpack-objects/index-pack.
Remove unused variable in receive-pack.
Revert "send-pack --keep: do not explode into loose objects on the receiving end."
missing small substitution
Teach git-index-pack how to keep a pack file.
Only repack active packs by skipping over kept packs.
Allow short pack names to git-pack-objects --unpacked=.
send-pack --keep: do not explode into loose objects on the receiving end.
index-pack: minor fixes to comment and function name
enhance clone and fetch -k experience
mimic unpack-objects when --stdin is used with index-pack
add progress status to index-pack
make index-pack able to complete thin packs.
enable index-pack streaming capability

Merge branch 'maint'Junio C Hamano Tue, 7 Nov 2006 06:56:07 +0000 (22:56 -0800)

Merge branch 'maint'

* maint:
Documentation: Transplanting branch with git-rebase --onto
merge-recursive implicitely depends on trust_executable_bit
adjust_shared_perm: chmod() only when needed.
Fix git-runstatus for repositories containing a file named HEAD

git-pickaxe: -L /regexp/,/regexp/Junio C Hamano Tue, 7 Nov 2006 01:08:32 +0000 (17:08 -0800)

git-pickaxe: -L /regexp/,/regexp/

With this change, you can specify the beginning and the ending
line of the range you wish to inspect with pattern matching.

For example, these are equivalent with the git.git sources:

git pickaxe -L 7,21 v1.4.0 -- commit.c
git pickaxe -L '/^struct sort_node/,/^}/' v1.4.0 -- commit.c
git pickaxe -L '7,/^}/' v1.4.0 -- commit.c
git pickaxe -L '/^struct sort_node/,21' v1.4.0 -- commit.c

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

Documentation: Transplanting branch with git-rebase... Jakub Narebski Mon, 6 Nov 2006 18:12:45 +0000 (19:12 +0100)

Documentation: Transplanting branch with git-rebase --onto

Added example of transplantig feature branch from one development
branch (for example "next") into the other development branch (for
example "master").

[jc: talking Carl's advice this contains both examples sent to
the list by Jakub in his original message.]

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Document git-pack-refs and link it to git(7).Junio C Hamano Mon, 6 Nov 2006 08:28:52 +0000 (00:28 -0800)

Document git-pack-refs and link it to git(7).

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

merge-recursive implicitely depends on trust_executable_bitAlex Riesen Mon, 6 Nov 2006 10:38:52 +0000 (11:38 +0100)

merge-recursive implicitely depends on trust_executable_bit

Read the configuration in to get core.filemode value for this
particular repository.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

adjust_shared_perm: chmod() only when needed.Junio C Hamano Sat, 4 Nov 2006 20:24:05 +0000 (12:24 -0800)

adjust_shared_perm: chmod() only when needed.

When widening permission for files and directories in a 'shared'
repository for a user with inappropriate umask() setting for
shared work, make sure we call chmod() only when we actually
need to.

The primary idea owes credit to Johannes.

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

Fix git-runstatus for repositories containing a file... Jeff King Sun, 5 Nov 2006 22:22:15 +0000 (17:22 -0500)

Fix git-runstatus for repositories containing a file named HEAD

The wt_status_print_updated() and wt_status_print_untracked() routines
call setup_revisions() with 'HEAD' being the reference to the tip of the
current branch. However, setup_revisions() gets confused if the branch
also contains a file named 'HEAD' resulting in a fatal error.

Instead, don't pass an argv to setup_revisions() at all; simply give it no
arguments, and make 'HEAD' the default revision.

Bug noticed by Rocco Rutte <pdmef@gmx.net>.

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

Remove more sed invocations from within bash completion.Shawn O. Pearce Sun, 5 Nov 2006 11:25:25 +0000 (06:25 -0500)

Remove more sed invocations from within bash completion.

This change removes between 1 and 4 sed invocations per completion
entered by the user. In the case of cat-file the 4 invocations per
completion can take a while on Cygwin; running these replacements
directly within bash saves some time for the end user.

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

Support bash completion on symmetric difference operator.Shawn O. Pearce Sun, 5 Nov 2006 11:24:56 +0000 (06:24 -0500)

Support bash completion on symmetric difference operator.

Now that log, whatchanged, rev-list, etc. support the symmetric
difference operator '...' we should provide bash completion for it
just like we do for '..'.

While we are at it we can remove two sed invocations during the
interactive prompt and replace them with internal bash operations.

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

Take --git-dir into consideration during bash completion.Shawn O. Pearce Sun, 5 Nov 2006 11:21:57 +0000 (06:21 -0500)

Take --git-dir into consideration during bash completion.

If the user has setup a command line of "git --git-dir=baz" then
anything we complete must be performed within the scope of "baz"
and not the current working directory.

This is useful with commands such as "git --git-dir=git.git log m"
to complete out "master" and view the log for the master branch of
the git.git repository. As a nice side effect this also works for
aliases within the target repository, just as git would honor them.

Unfortunately because we still examine arguments by absolute position
in most of the more complex commands (e.g. git push) using --git-dir
with those commands will probably still cause completion to fail.

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

Bash completion support for remotes in .git/config.Shawn O. Pearce Sun, 5 Nov 2006 11:21:03 +0000 (06:21 -0500)

Bash completion support for remotes in .git/config.

Now that Git natively supports remote specifications within the
config file such as:

[remote "origin"]
url = ...

we should provide bash completion support "out of the box" for
these remotes, just like we do for the .git/remotes directory.

Also cleaned up the __git_aliases expansion to use the same form
of querying and filtering repo-config as this saves two fork/execs
in the middle of a user prompted completion. Finally also forced
the variable 'word' to be local within __git_aliased_command.

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

Only load .exe suffix'd completions on Cygwin.Shawn O. Pearce Sun, 5 Nov 2006 11:20:25 +0000 (06:20 -0500)

Only load .exe suffix'd completions on Cygwin.

The only platform which actually needs to define .exe suffixes as
part of its completion set is Cygwin. So don't define them on any
other platform.

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

Added missing completions for show-branch and merge... Shawn O. Pearce Sun, 5 Nov 2006 11:20:02 +0000 (06:20 -0500)

Added missing completions for show-branch and merge-base.

The show-branch and merge-base commands were partially supported
when it came to bash completions as they were only specified in
one form another. Now we specify them in both forms.

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

git-pickaxe: optimize by avoiding repeated read_sha1_fi... Junio C Hamano Sun, 5 Nov 2006 19:51:41 +0000 (11:51 -0800)

git-pickaxe: optimize by avoiding repeated read_sha1_file().

It turns out that pickaxe reads the same blob repeatedly while
blame can reuse the blob already read for the parent when
handling a child commit when it's parent's turn to pass its
blame to the grandparent. Have a cache in the origin structure
to keep the blob there, which will be garbage collected when the
origin loses the last reference to it.

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

git-blame: add internal statistics to count read blobs.Junio C Hamano Sun, 5 Nov 2006 19:47:53 +0000 (11:47 -0800)

git-blame: add internal statistics to count read blobs.

cherry is built-in, do not ship git-cherry.shJunio C Hamano Sun, 5 Nov 2006 19:26:21 +0000 (11:26 -0800)

cherry is built-in, do not ship git-cherry.sh

Noticed by Rene; Makefile now has another maintainer's check
target to catch this kind of mistakes.

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

Merge branch 'maint'Junio C Hamano Sun, 5 Nov 2006 07:52:32 +0000 (23:52 -0800)

Merge branch 'maint'

* maint:
Remove unsupported C99 style struct initializers in git-archive.
Remove SIMPLE_PROGRAMS and make git-daemon a normal program.
Use ULONG_MAX rather than implicit cast of -1.

Remove unsupported C99 style struct initializers in... v1.4.3.4Shawn O. Pearce Sun, 5 Nov 2006 05:37:23 +0000 (00:37 -0500)

Remove unsupported C99 style struct initializers in git-archive.

At least one older version of the Solaris C compiler doesn't support
the newer C99 style struct initializers. To allow Git to compile
on those systems use an archive description struct which is easier
to initialize without the C99 struct initializer syntax.

Also since the archives array is not used by anyone other than
archive.c we can make it static.

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

Remove SIMPLE_PROGRAMS and make git-daemon a normal... Shawn O. Pearce Sun, 5 Nov 2006 07:28:25 +0000 (02:28 -0500)

Remove SIMPLE_PROGRAMS and make git-daemon a normal program.

Some platforms (Solaris in particular) appear to require -lz as
part of the link line for git-daemon, due to it linking against
sha1_file.o and that module requiring inflate/deflate support.

So its time to retire SIMPLE_PROGRAMS and move its last remaining
member into the standard PROGRAMS list, allowing it to link against
all libraries used by the rest of Git.

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

Use ULONG_MAX rather than implicit cast of -1.Shawn O. Pearce Sun, 5 Nov 2006 07:27:07 +0000 (02:27 -0500)

Use ULONG_MAX rather than implicit cast of -1.

At least one (older) version of the Solaris C compiler won't allow
'unsigned long x = -1' without explicitly casting -1 to a type of
unsigned long. So instead use ULONG_MAX, which is really the
correct constant anyway.

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

git-svn: don't die on rebuild when --upgrade is specifiedEric Wong Sun, 5 Nov 2006 05:51:11 +0000 (21:51 -0800)

git-svn: don't die on rebuild when --upgrade is specified

--copy-remote and --upgrade are rarely (never?) used together,
so if --copy-remote is specified, that means the user really
wanted to copy the remote ref, and we should fail if that fails.

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

git-svn: avoid printing filenames of files we're not... Eric Wong Sun, 5 Nov 2006 05:51:10 +0000 (21:51 -0800)

git-svn: avoid printing filenames of files we're not tracking

This is purely an aesthetic change, we already skip importing of
files that don't affect the subdirectory we import.

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

git-pickaxe: fix origin refcountingJunio C Hamano Sun, 5 Nov 2006 03:18:50 +0000 (19:18 -0800)

git-pickaxe: fix origin refcounting

When we introduced the cached origin per commit, we gave up proper
garbage collecting because it meant that commits hold onto their
cached copy. There is no need to do so.

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

Merge branch 'np/verbose-push'Junio C Hamano Sun, 5 Nov 2006 01:22:14 +0000 (17:22 -0800)

Merge branch 'np/verbose-push'

* np/verbose-push:
make git-push a bit more verbose

Merge branch 'lt/push-config'Junio C Hamano Sun, 5 Nov 2006 01:18:29 +0000 (17:18 -0800)

Merge branch 'lt/push-config'

* lt/push-config:
git push: add verbose flag and allow overriding of default target repository
Allow '-' in config variable names

Added bash completion support for git-reset.Shawn O. Pearce Sat, 4 Nov 2006 18:57:44 +0000 (13:57 -0500)

Added bash completion support for git-reset.

Completion for the --hard/--soft/--mixed modes of operation as
well as a ref name for <commit-ish> can be very useful and save
some fingers.

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

Added completion support for git-branch.exe.Shawn O. Pearce Sat, 4 Nov 2006 18:57:18 +0000 (13:57 -0500)

Added completion support for git-branch.exe.

On Cygwin a user might complete the new git-branch builtin as
git-branch.exe, at which point bash requires a new completion
registration for the command.

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

Merge branch 'pb/web'Junio C Hamano Sun, 5 Nov 2006 01:13:38 +0000 (17:13 -0800)

Merge branch 'pb/web'

* pb/web:
gitweb: Support for 'forks'

git-pickaxe: re-scan the blob after making progress... Junio C Hamano Sun, 5 Nov 2006 00:39:03 +0000 (16:39 -0800)

git-pickaxe: re-scan the blob after making progress with -C

The reason to do this is the same as in the previous change for
line copy detection within the same file (-M).

Also this fixes -C and -C -C (aka find-copies-harder) logic; in
this application we are not interested in the similarity
matching diffcore-rename makes, because we are only interested
in scanning files that were modified, or in the case of -C -C,
scanning all files in the parent and we want to do that
ourselves.

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

git-pickaxe: re-scan the blob after making progress... Junio C Hamano Sat, 4 Nov 2006 20:37:02 +0000 (12:37 -0800)

git-pickaxe: re-scan the blob after making progress with -M

Otherwise we would miss copied lines that are contained in the
parts before or after the part that we find after splitting the
blame_entry (i.e. split[0] and split[2]).

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

git-pickaxe: simplify Octopus merges furtherJunio C Hamano Sat, 4 Nov 2006 20:20:09 +0000 (12:20 -0800)

git-pickaxe: simplify Octopus merges further

If more than one parents in an Octopus merge have the same
origin, ignore later ones because it would not make any
difference in the outcome.

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

git-pickaxe: rename detection optimizationJunio C Hamano Thu, 2 Nov 2006 08:02:11 +0000 (00:02 -0800)

git-pickaxe: rename detection optimization

The idea is that we are interested in renaming into only one path, so
we do not care about renames that happen elsewhere.

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

Merge branch 'maint'Junio C Hamano Sat, 4 Nov 2006 11:54:20 +0000 (03:54 -0800)

Merge branch 'maint'

* maint:
apply: handle "traditional" creation/deletion diff correctly.

apply: handle "traditional" creation/deletion diff... Junio C Hamano Sat, 4 Nov 2006 10:28:53 +0000 (02:28 -0800)

apply: handle "traditional" creation/deletion diff correctly.

We deduced a GNU diff output that does not use /dev/null convention
as creation (deletion) diff correctly by looking at the lack of context
and deleted lines (added lines), but forgot to reset the new (old) name
field properly.

This was a regression when we added a workaround for --unified=0 insanity.

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

gitweb: Remove extra "/" in path names for git_get_proj... Aneesh Kumar K.V Fri, 3 Nov 2006 05:11:45 +0000 (10:41 +0530)

gitweb: Remove extra "/" in path names for git_get_project_list

Without this change we get a wrong $pfxlen value and the check_export_ok()
checks with with a wrong directory name. Without this patch the below
$projects_list fails with gitweb

$projects_list = "/tmp/a/b/";

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>