gitweb.git
Merge branch 'maint'Junio C Hamano Wed, 2 May 2007 18:27:31 +0000 (11:27 -0700)

Merge branch 'maint'

* maint:
cvsserver: Handle re-added files correctly
Fix compilation of test-delta

Merge branch 'maint' of git://repo.or.cz/git/fastimport... Junio C Hamano Wed, 2 May 2007 18:00:16 +0000 (11:00 -0700)

Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint

* 'maint' of git://repo.or.cz/git/fastimport:
Teach import-tars about GNU tar's @LongLink extension.

cvsserver: Handle re-added files correctlyFrank Lichtenheld Wed, 2 May 2007 00:43:14 +0000 (02:43 +0200)

cvsserver: Handle re-added files correctly

We can't unconditionally assign revision 1.1 to
newly added files. In case the file did exist in the
past and was deleted we need to honor the old
revision number.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Don't use seq in tests, not everyone has itShawn O. Pearce Wed, 2 May 2007 16:59:55 +0000 (12:59 -0400)

Don't use seq in tests, not everyone has it

For example Mac OS X lacks the seq command. So we cannot use it
there. A good old while loop works just as good.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Reuse fixup_pack_header_footer in index-packShawn O. Pearce Wed, 2 May 2007 16:14:15 +0000 (12:14 -0400)

Reuse fixup_pack_header_footer in index-pack

Now that fast-import is using a "library function" to handle
correcting its packfile's object count and trailing SHA-1 we
should reuse the same function in index-pack, to reduce the
size of the code we must maintain.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Create pack-write.c for common pack writing codeDana L. How Wed, 2 May 2007 16:13:14 +0000 (12:13 -0400)

Create pack-write.c for common pack writing code

Include a generalized fixup_pack_header_footer() in this new file.
Needed by git-repack --max-pack-size feature in a later patchset.

[sp: Moved close(pack_fd) to callers, to support index-pack, and
changed name to better indicate it is for packfiles.]

Signed-off-by: Dana L. How <danahow@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Merge branch 'gfi-maint' into gfi-masterShawn O. Pearce Wed, 2 May 2007 17:24:10 +0000 (13:24 -0400)

Merge branch 'gfi-maint' into gfi-master

* gfi-maint:
Teach import-tars about GNU tar's @LongLink extension.

Teach import-tars about GNU tar's @LongLink extension.Johannes Schindelin Tue, 1 May 2007 21:42:44 +0000 (23:42 +0200)

Teach import-tars about GNU tar's @LongLink extension.

This extension allows GNU tar to process file names in excess of the 100
characters defined by the original tar standard. It does this by faking a
file, named '././@LongLink' containing the true file name, and then adding
the file with a truncated name. The idea is that tar without this
extension will write out a file with the long file name, and write the
contents into a file with truncated name.

Unfortunately, GNU tar does a lousy job at times. When truncating results
in a _directory_ name, it will happily use _that_ as a truncated name for
the file.

An example where this actually happens is gcc-4.1.2, where the full path
of the file WeThrowThisExceptionHelper.java truncates _exactly_ before the
basename. So, we have to support that ad-hoc extension.

This bug was noticed by Chris Riddoch on IRC.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Fix compilation of test-deltaMartin Koegler Tue, 1 May 2007 09:47:55 +0000 (11:47 +0200)

Fix compilation of test-delta

The code used write_in_full() without pulling its declarations from the
header file. When header is included, usage[] collides with usage()
function.

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>

GIT v1.5.2-rc1 v1.5.2-rc1Junio C Hamano Tue, 1 May 2007 00:30:02 +0000 (17:30 -0700)

GIT v1.5.2-rc1

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

Merge branch 'maint'Junio C Hamano Tue, 1 May 2007 00:16:19 +0000 (17:16 -0700)

Merge branch 'maint'

* maint:
GIT v1.5.1.3
send-email documentation: clarify --smtp-server
git.7: Mention preformatted html doc location
Clarify SubmittingPatches Checklist
git-svn: Add 'find-rev' command
Fix symlink handling in git-svn, related to PerlIO

GIT v1.5.1.3 v1.5.1.3Junio C Hamano Tue, 1 May 2007 00:09:48 +0000 (17:09 -0700)

GIT v1.5.1.3

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

Include mailmap.h in mailmap.c to catch mailmap interfa... Alex Riesen Mon, 30 Apr 2007 22:31:52 +0000 (00:31 +0200)

Include mailmap.h in mailmap.c to catch mailmap interface changes

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

Remove pointless calls to access(2) when checking for... Alex Riesen Mon, 30 Apr 2007 22:27:05 +0000 (00:27 +0200)

Remove pointless calls to access(2) when checking for .mailmap

read_mailmap already returns not 0 in case of error, and nothing
seem to be interested in it. It also is silent about the fact
(read_mailmap being to chatty would justify the call to access,
but there is no point for it to be and it isn't).

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

Fix read_mailmap to handle a caller uninterested in... Alex Riesen Mon, 30 Apr 2007 22:26:36 +0000 (00:26 +0200)

Fix read_mailmap to handle a caller uninterested in repo abbreviation

The only such a caller builtin-blame.c would pass NULL as the place
where to store the abbreviation.

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

Use strlcpy instead of strncpy in mailmap.cAlex Riesen Mon, 30 Apr 2007 22:22:53 +0000 (00:22 +0200)

Use strlcpy instead of strncpy in mailmap.c

strncpy does not NUL-terminate output in case of output buffer too short,
and map_email prototype (and usage) does not allow for figuring out
what the length of the name is.

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

send-email documentation: clarify --smtp-serverJari Aalto Mon, 30 Apr 2007 12:37:28 +0000 (15:37 +0300)

send-email documentation: clarify --smtp-server

It can be either hostname/address, or a full path to a
local executable.

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git.7: Mention preformatted html doc locationJari Aalto Mon, 30 Apr 2007 11:21:38 +0000 (14:21 +0300)

git.7: Mention preformatted html doc location

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Clarify SubmittingPatches ChecklistJari Aalto Mon, 30 Apr 2007 16:04:25 +0000 (19:04 +0300)

Clarify SubmittingPatches Checklist

Separate things to be checked when making commits, and things
to be checked when sending patches.

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-svn: Add 'find-rev' commandAdam Roben Sun, 29 Apr 2007 08:35:27 +0000 (01:35 -0700)

git-svn: Add 'find-rev' command

This patch adds a new 'find-rev' command to git-svn that lets you easily
translate between SVN revision numbers and git tree-ish.

Signed-off-by: Adam Roben <aroben@apple.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix symlink handling in git-svn, related to PerlIOJunio C Hamano Sun, 29 Apr 2007 21:05:54 +0000 (14:05 -0700)

Fix symlink handling in git-svn, related to PerlIO

After reading the leading contents from a symlink data obtained
from subversion, which we expect to begin with 'link ', the code
forked to hash the remainder (which should match readlink()
result) using git-hash-objects, by redirecting its STDIN from
the filehandle we read that 'link ' from. This was Ok with Perl
on modern Linux, but on Mac OS, the read in the parent process
slurped more than we asked for in stdio buffer, and the child
did not correctly see the "remainder".

This attempts to fix the issue by using lower level sysseek and
sysread instead of seek and read to bypass the stdio buffer.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
Acked-by: Seth Falcon <sethfalcon@gmail.com>

Merge branch 'jc/attr'Junio C Hamano Sun, 29 Apr 2007 18:01:27 +0000 (11:01 -0700)

Merge branch 'jc/attr'

* jc/attr:
Add 'filter' attribute and external filter driver definition.
Add 'ident' conversion.

Make sure test-genrandom and test-chmtime are builtas... Junio C Hamano Sat, 28 Apr 2007 22:32:49 +0000 (15:32 -0700)

Make sure test-genrandom and test-chmtime are builtas part of the main build.

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

Make macros to prevent double-inclusion in headers... Junio C Hamano Sun, 29 Apr 2007 06:38:52 +0000 (23:38 -0700)

Make macros to prevent double-inclusion in headers consistent.

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

Apply mailmap in git-blame output.Junio C Hamano Fri, 27 Apr 2007 07:42:15 +0000 (00:42 -0700)

Apply mailmap in git-blame output.

This makes git-blame to use the same mailmap used by
git-shortlog.

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

Split out mailmap handling out of shortlogJunio C Hamano Fri, 27 Apr 2007 07:41:15 +0000 (00:41 -0700)

Split out mailmap handling out of shortlog

This splits out a few functions to deal with mailmap from
shortlog and makes it a bit more usable from other programs.
Most notably, it does not clobber input e-mail address anymore.

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

blame -s: suppress author name and time.Junio C Hamano Thu, 12 Apr 2007 22:50:45 +0000 (15:50 -0700)

blame -s: suppress author name and time.

With this "git blame -b -s HEAD~n..HEAD" becomes a nicer way to
review the result of recent changes in context.

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

Fall back to $EMAIL for missing GIT_AUTHOR_EMAIL and... Josh Triplett Sun, 29 Apr 2007 01:40:28 +0000 (18:40 -0700)

Fall back to $EMAIL for missing GIT_AUTHOR_EMAIL and GIT_COMMITTER_EMAIL

Some other programs get the user's email address from $EMAIL, so fall back to
that if we don't have a Git-specific email address.

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge commit 'gfi/master'Junio C Hamano Sun, 29 Apr 2007 08:54:28 +0000 (01:54 -0700)

Merge commit 'gfi/master'

* commit 'gfi/master':

Merge branch 'maint'Junio C Hamano Sun, 29 Apr 2007 08:52:43 +0000 (01:52 -0700)

Merge branch 'maint'

* maint:
http.c: Fix problem with repeated calls of http_init
Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation
Fix import-tars fix.
Update .mailmap with "Michael"
Do not barf on too long action description
Catch empty pathnames in trees during fsck
Don't allow empty pathnames in fast-import
import-tars: be nice to wrong directory modes
git-svn: Added 'find-rev' command
git shortlog documentation: add long options and fix a typo

http.c: Fix problem with repeated calls of http_initJulian Phillips Sun, 29 Apr 2007 02:46:42 +0000 (03:46 +0100)

http.c: Fix problem with repeated calls of http_init

Calling http_init after calling http_cleanup causes a segfault. This
is due to the pragma_header curl_slist being freed but not being set
to NULL. The subsequent call to http_init tries to setup the slist
again, but it now points to an invalid memory location.

Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Add missing reference to GIT_COMMITTER_DATE in git... Josh Triplett Sun, 29 Apr 2007 01:40:12 +0000 (18:40 -0700)

Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix import-tars fix.Junio C Hamano Sun, 29 Apr 2007 07:31:14 +0000 (00:31 -0700)

Fix import-tars fix.

This heeds advice from our resident Perl expert to make sure
the script is not confused with a string that ends with /\n

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

Update .mailmap with "Michael"Junio C Hamano Sun, 29 Apr 2007 07:22:00 +0000 (00:22 -0700)

Update .mailmap with "Michael"

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

Do not barf on too long action descriptionJunio C Hamano Sat, 28 Apr 2007 07:15:48 +0000 (00:15 -0700)

Do not barf on too long action description

Reflog message is primarily about easier identification, and
leaving truncated entry is much better than dying.

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

Merge branch 'maint' of git://repo.or.cz/git/fastimport... Junio C Hamano Sun, 29 Apr 2007 01:15:00 +0000 (18:15 -0700)

Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint

* 'maint' of git://repo.or.cz/git/fastimport:
Don't allow empty pathnames in fast-import
import-tars: be nice to wrong directory modes

Catch empty pathnames in trees during fsckShawn O. Pearce Sun, 29 Apr 2007 00:29:23 +0000 (20:29 -0400)

Catch empty pathnames in trees during fsck

Released versions of fast-import have been able to create a tree that
contains files or subtrees that contain no name. Unfortunately these
trees aren't valid, but people may have actually tried to create them
due to bugs in import-tars.perl or their own fast-import frontend.

We now look for this unusual condition and warn the user if at
least one of their tree objects contains the problem.

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

Merge branch 'gfi-maint' into gfi-masterShawn O. Pearce Sun, 29 Apr 2007 00:05:58 +0000 (20:05 -0400)

Merge branch 'gfi-maint' into gfi-master

* gfi-maint:
Don't allow empty pathnames in fast-import
import-tars: be nice to wrong directory modes

Merge commit 'jc/maint' into gfi-maintShawn O. Pearce Sun, 29 Apr 2007 00:05:20 +0000 (20:05 -0400)

Merge commit 'jc/maint' into gfi-maint

* commit 'jc/maint': (35 commits)
Update git-http-fetch documentation
Update git-local-fetch documentation
Update git-http-push documentation
Update -L documentation for git-blame/git-annotate
Update git-grep documentation
Update git-fmt-merge documentation
Document additional options for git-fetch
Removing -n option from git-diff-files documentation
Start preparing for 1.5.1.3
Sanitize @to recipients.
git-svn: Ignore usernames in URLs in find_by_url
Document --dry-run and envelope-sender for git-send-email.
Allow users to optionally specify their envelope sender.
Ensure clean addresses are always used with Net::SMTP
Validate @recipients before using it for sendmail and Net::SMTP.
Perform correct quoting of recipient names.
Change the scope of the $cc variable as it is not needed outside of send_message.
Debugging cleanup improvements
Prefix Dry- to the message status to denote dry-runs.
Document --dry-run parameter to send-email.
...

Don't allow empty pathnames in fast-importShawn O. Pearce Sun, 29 Apr 2007 00:01:27 +0000 (20:01 -0400)

Don't allow empty pathnames in fast-import

riddochc on #git noticed corruption caused by import-tars. This
was fixed in the prior commit by Dscho, but fast-import was wrong
to have allowed a tree to be created with an empty string as the
filename. No operating system allows this, and Git itself doesn't
accept this into the index.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

import-tars: be nice to wrong directory modesJohannes Schindelin Sat, 28 Apr 2007 23:59:47 +0000 (01:59 +0200)

import-tars: be nice to wrong directory modes

Some tars seem to have modes 0755 for directories, not 01000755. Do
not generate an empty object for them, but ignore them.

Noticed by riddochc on IRC.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

git-svn: Added 'find-rev' commandAdam Roben Fri, 27 Apr 2007 18:57:53 +0000 (11:57 -0700)

git-svn: Added 'find-rev' command

This patch adds a new 'find-rev' command to git-svn that lets you easily
translate between SVN revision numbers and git tree-ish.

Signed-off-by: Adam Roben <aroben@apple.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git shortlog documentation: add long options and fix... Michele Ballabio Fri, 27 Apr 2007 19:56:47 +0000 (21:56 +0200)

git shortlog documentation: add long options and fix a typo

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'maint'Junio C Hamano Fri, 27 Apr 2007 06:29:09 +0000 (23:29 -0700)

Merge branch 'maint'

* maint:
Update git-http-fetch documentation
Update git-local-fetch documentation
Update git-http-push documentation
Update -L documentation for git-blame/git-annotate
Update git-grep documentation
Update git-fmt-merge documentation
Document additional options for git-fetch
Removing -n option from git-diff-files documentation

Update git-http-fetch documentationAndrew Ruder Fri, 27 Apr 2007 04:59:02 +0000 (23:59 -0500)

Update git-http-fetch documentation

Documentation/git-http-fetch.txt: --recover to resume a failed fetch
operation.

Signed-off-by: Andrew Ruder <andy@aeruder.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Update git-local-fetch documentationAndrew Ruder Fri, 27 Apr 2007 04:59:01 +0000 (23:59 -0500)

Update git-local-fetch documentation

Documentation/git-local-fetch.txt: -s to use
symbolic links instead of file-to-file copy, -l
to use hardlinks, -n to never use file-to-file
copies, --recover to resume a failed fetch.

Signed-off-by: Andrew Ruder <andy@aeruder.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Update git-http-push documentationAndrew Ruder Fri, 27 Apr 2007 04:59:00 +0000 (23:59 -0500)

Update git-http-push documentation

Documentation/git-http-push.txt: Changing --complete to --all. Added
documentation for -d and -D to remote remote refs.

Signed-off-by: Andrew Ruder <andy@aeruder.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Update -L documentation for git-blame/git-annotateAndrew Ruder Fri, 27 Apr 2007 04:58:59 +0000 (23:58 -0500)

Update -L documentation for git-blame/git-annotate

Documenting alternate ways to use -L:

-L /regex/,end
-L start,+offset

Signed-off-by: Andrew Ruder <andy@aeruder.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Update git-grep documentationAndrew Ruder Fri, 27 Apr 2007 04:58:58 +0000 (23:58 -0500)

Update git-grep documentation

Documentation/git-grep.txt: Document -F/--fixed-strings to
search for non-regexp patterns. Document -I to not search
binary files. Document -<num> as a shortcut for -C<num>.

Signed-off-by: Andrew Ruder <andy@aeruder.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Update git-fmt-merge documentationAndrew Ruder Fri, 27 Apr 2007 04:58:57 +0000 (23:58 -0500)

Update git-fmt-merge documentation

Documentation/git-fmt-merge-msg.txt:
--summary to list commit summaries on merge
--no-summary
--file to take merged objects from a file.
Configuration option merge.summary

Signed-off-by: Andrew Ruder <andy@aeruder.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Document additional options for git-fetchAndrew Ruder Fri, 27 Apr 2007 04:58:56 +0000 (23:58 -0500)

Document additional options for git-fetch

Document --quiet/-q and --verbose/-v
Add -n as an alternate for --no-tags
Fix some whitespace issues

Signed-off-by: Andrew Ruder <andy@aeruder.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Removing -n option from git-diff-files documentationAndrew Ruder Fri, 27 Apr 2007 04:58:55 +0000 (23:58 -0500)

Removing -n option from git-diff-files documentation

-n is not a short form of --no-index as the documentation
suggests. Removing it from the documentation and command
usage string.

Signed-off-by: Andrew Ruder <andy@aeruder.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

post-receive-email example hook: sed command for gettin... Andy Parkins Thu, 26 Apr 2007 21:37:16 +0000 (22:37 +0100)

post-receive-email example hook: sed command for getting description was wrong

The sed command that extracted the first line of the project description
didn't include the -n switch and hence the project name was being
printed twice. This was ruining the email header generation because it
was assumed that the description was only one line and was included in
the subject. This turned the subject into a two line item and
prematurely finished the header.

Signed-off-by: Andy Parkins <andyparkins@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

post-receive-email example hook: detect rewind-only... Andy Parkins Thu, 26 Apr 2007 21:36:24 +0000 (22:36 +0100)

post-receive-email example hook: detect rewind-only updates and output sensible message

Sometimes a non-fast-forward update doesn't add new commits, it merely
removes old commits. This patch adds support for detecting that and
outputting a more correct message.

Signed-off-by: Andy Parkins <andyparkins@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

post-receive-email example hook: fastforward should... Andy Parkins Thu, 26 Apr 2007 21:35:39 +0000 (22:35 +0100)

post-receive-email example hook: fastforward should have been fast_forward

Signed-off-by: Andy Parkins <andyparkins@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Ignore merged status of the file-level mergeAlex Riesen Thu, 26 Apr 2007 19:13:49 +0000 (21:13 +0200)

Ignore merged status of the file-level merge

as it is not relevant for whether the result should be written.
Even if no real merge happened, there might be _no_ reason to
rewrite the working tree file. Maybe even more so.

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

Add a test for merging changed and rename-changed branchesAlex Riesen Wed, 25 Apr 2007 20:07:45 +0000 (22:07 +0200)

Add a test for merging changed and rename-changed branches

Also leave a warning for future merge-recursive explorers.

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

Avoid excessive rewrites in merge-recursiveAlex Riesen Wed, 25 Apr 2007 20:06:59 +0000 (22:06 +0200)

Avoid excessive rewrites in merge-recursive

If a file is changed in one branch, and renamed and changed to the
same content in another branch than we can skip the rewrite of this
file in the working directory, as the content does not change.

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

Merge branch 'maint'Junio C Hamano Thu, 26 Apr 2007 06:31:45 +0000 (23:31 -0700)

Merge branch 'maint'

* maint:
Start preparing for 1.5.1.3
Sanitize @to recipients.
git-svn: Ignore usernames in URLs in find_by_url
Document --dry-run and envelope-sender for git-send-email.
Allow users to optionally specify their envelope sender.
Ensure clean addresses are always used with Net::SMTP
Validate @recipients before using it for sendmail and Net::SMTP.
Perform correct quoting of recipient names.
Change the scope of the $cc variable as it is not needed outside of send_message.
Debugging cleanup improvements
Prefix Dry- to the message status to denote dry-runs.
Document --dry-run parameter to send-email.
git-svn: Don't rely on $_ after making a function call
Fix handle leak in write_tree
Actually handle some-low memory conditions

Conflicts:

RelNotes
git-send-email.perl

Start preparing for 1.5.1.3Junio C Hamano Thu, 26 Apr 2007 06:27:07 +0000 (23:27 -0700)

Start preparing for 1.5.1.3

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

Sanitize @to recipients.Robin H. Johnson Thu, 26 Apr 2007 04:53:22 +0000 (21:53 -0700)

Sanitize @to recipients.

We need to sanitize @to as well to ensure that names are properly quoted.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-svn: Ignore usernames in URLs in find_by_urlAdam Roben Wed, 25 Apr 2007 19:42:58 +0000 (12:42 -0700)

git-svn: Ignore usernames in URLs in find_by_url

Usernames don't matter for the purposes of find_by_url, so always remove them
before doing any comparisons.

Signed-off-by: Adam Roben <aroben@apple.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Add --date={local,relative,default}Junio C Hamano Wed, 25 Apr 2007 06:36:22 +0000 (23:36 -0700)

Add --date={local,relative,default}

This adds --date={local,relative,default} option to log family of commands,
to allow displaying timestamps in user's local timezone, relative time, or
the default format.

Existing --relative-date option is a synonym of --date=relative; we could
probably deprecate it in the long run.

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

Document --dry-run and envelope-sender for git-send... Robin H. Johnson Thu, 26 Apr 2007 02:37:23 +0000 (19:37 -0700)

Document --dry-run and envelope-sender for git-send-email.

Catch the documentation up with the rest of this patchset.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Allow users to optionally specify their envelope sender.Robin H. Johnson Thu, 26 Apr 2007 02:37:22 +0000 (19:37 -0700)

Allow users to optionally specify their envelope sender.

If your normal user is not the same user you are subscribed to a list with,
then the default envelope sender used will cause your messages to bounce or
silently vanish into the ether.

This patch provides an optional parameter to set the envelope sender.
To use it with the sendmail binary, you must have privileges to use the -f
parameter!

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Ensure clean addresses are always used with Net::SMTPRobin H. Johnson Thu, 26 Apr 2007 02:37:21 +0000 (19:37 -0700)

Ensure clean addresses are always used with Net::SMTP

Always pass in clean addresses to Net::SMTP for the MAIL FROM, and use them on
the SMTP non-quiet output as well.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Validate @recipients before using it for sendmail and... Robin H. Johnson Thu, 26 Apr 2007 02:37:20 +0000 (19:37 -0700)

Validate @recipients before using it for sendmail and Net::SMTP.

Ensure that @recipients is only raw addresses when it is handed to the sendmail
binary OR Net::SMTP, otherwise BCC cases might get an extra <, or wierd stuff
might be passed to the exec.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Perform correct quoting of recipient names.Robin H. Johnson Thu, 26 Apr 2007 02:37:19 +0000 (19:37 -0700)

Perform correct quoting of recipient names.

Always perform quoting of the recipient names if they contain periods,
previously only the author's address was treated this way. This stops sendmail
binaries from exploding the name into bad addresses.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Change the scope of the $cc variable as it is not neede... Robin H. Johnson Thu, 26 Apr 2007 02:37:18 +0000 (19:37 -0700)

Change the scope of the $cc variable as it is not needed outside of send_message.

$cc is only used inside the send_message scope, so lets clean it out of the global scope.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Debugging cleanup improvementsRobin H. Johnson Thu, 26 Apr 2007 02:37:17 +0000 (19:37 -0700)

Debugging cleanup improvements

The debug output is much more helpful if it has the parameters that were used.
Pull the sendmail parameters into a seperate array for that, and also include
similar data during the Net::SMTP case.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Prefix Dry- to the message status to denote dry-runs.Robin H. Johnson Thu, 26 Apr 2007 02:37:16 +0000 (19:37 -0700)

Prefix Dry- to the message status to denote dry-runs.

While doing testing, it's useful to see that a dry run was actually done,
instead of a real one.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Document --dry-run parameter to send-email.Robin H. Johnson Thu, 26 Apr 2007 02:37:15 +0000 (19:37 -0700)

Document --dry-run parameter to send-email.

Looks like --dry-run was added to the code, but never to the --help output.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-svn: Don't rely on $_ after making a function callAdam Roben Wed, 25 Apr 2007 18:50:32 +0000 (11:50 -0700)

git-svn: Don't rely on $_ after making a function call

Many functions and operators in perl set $_, so its value cannot be relied upon
after calling arbitrary functions. The solution is simply to copy the value of
$_ into a local variable that will not get overwritten.

Signed-off-by: Adam Roben <aroben@apple.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix handle leak in write_treeAlex Riesen Wed, 25 Apr 2007 22:28:17 +0000 (00:28 +0200)

Fix handle leak in write_tree

This is a quick and dirty fix for the broken "git cherry-pick -n" on
some broken OS, which does not remove the directory entry after unlink
succeeded(!) if the file is still open somewher.
The entry is left but "protected": no open, no unlink, no stat.
Very annoying.

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

Actually handle some-low memory conditionsShawn O. Pearce Wed, 25 Apr 2007 08:02:27 +0000 (04:02 -0400)

Actually handle some-low memory conditions

Tim Ansell discovered his Debian server didn't permit git-daemon to
use as much memory as it needed to handle cloning a project with
a 128 MiB packfile. Filtering the strace provided by Tim of the
rev-list child showed this gem of a sequence:

open("./objects/pack/pack-*.pack", O_RDONLY|O_LARGEFILE <unfinished ...>
<... open resumed> ) = 5

OK, so the packfile is fd 5...

mmap2(NULL, 33554432, PROT_READ, MAP_PRIVATE, 5, 0 <unfinished ...>
<... mmap2 resumed> ) = 0xb5e2d000

and we mapped one 32 MiB window from it at position 0...

mmap2(NULL, 31020635, PROT_READ, MAP_PRIVATE, 5, 0x6000 <unfinished ...>
<... mmap2 resumed> ) = -1 ENOMEM (Cannot allocate memory)

And we asked for another window further into the file. But got
denied. In Tim's case this was due to a resource limit on the
git-daemon process, and its children.

Now where are we in the code? We're down inside use_pack(),
after we have called unuse_one_window() enough times to make sure
we stay within our allowed maximum window size. However since we
didn't unmap the prior window at 0xb5e2d000 we aren't exceeding
the current limit (which probably was just the defaults).

But we're actually down inside xmmap()...

So we release the window we do have (by calling release_pack_memory),
assuming there is some memory pressure...

munmap(0xb5e2d000, 33554432 <unfinished ...>
<... munmap resumed> ) = 0
close(5 <unfinished ...>
<... close resumed> ) = 0

And that was the last window in this packfile. So we closed it.
Way to go us. Our xmmap did not expect release_pack_memory to
close the fd its about to map...

mmap2(NULL, 31020635, PROT_READ, MAP_PRIVATE, 5, 0x6000 <unfinished ...>
<... mmap2 resumed> ) = -1 EBADF (Bad file descriptor)

And so the Linux kernel happily tells us f' off.

write(2, "fatal: ", 7 <unfinished ...>
<... write resumed> ) = 7
write(2, "Out of memory? mmap failed: Bad "..., 47 <unfinished ...>
<... write resumed> ) = 47

And we report the bad file descriptor error, and not the ENOMEM,
and die, claiming we are out of memory. But actually that mmap
should have succeeded, as we had enough memory for that window,
seeing as how we released the prior one.

Originally when I developed the sliding window mmap feature I had
this exact same bug in fast-import, and I dealt with it by handing
in the struct packed_git* we want to open the new window for, as the
caller wasn't prepared to reopen the packfile if unuse_one_window
closed it. The same is true here from xmmap, but the caller doesn't
have the struct packed_git* handy. So I'm using the file descriptor
instead to perform the same test.

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

init_buffer(): Kill buf pointerLuiz Fernando N. Capitulino Wed, 25 Apr 2007 14:18:41 +0000 (11:18 -0300)

init_buffer(): Kill buf pointer

We don't need it, it's possible to assign the block of memory to bufp

Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
Signed-off-by: Junio C Hamano <junkio@cox.net>

core-tutorial: minor fixesLuiz Fernando N. Capitulino Wed, 25 Apr 2007 14:18:28 +0000 (11:18 -0300)

core-tutorial: minor fixes

- Do not break the line when it's not needed
- s/Your/You

Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
Signed-off-by: Junio C Hamano <junkio@cox.net>

read_cache_from(): small simplificationLuiz Fernando N. Capitulino Wed, 25 Apr 2007 14:18:17 +0000 (11:18 -0300)

read_cache_from(): small simplification

This change 'opens' the code block which maps the index file into
memory, making the code clearer and easier to read.

Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
Signed-off-by: Junio C Hamano <junkio@cox.net>

entry.c: Use const qualifier for 'struct checkout'... Luiz Fernando N. Capitulino Wed, 25 Apr 2007 14:18:08 +0000 (11:18 -0300)

entry.c: Use const qualifier for 'struct checkout' parameters

Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
Signed-off-by: Junio C Hamano <junkio@cox.net>

remove_subtree(): Use strerror() when possibleLuiz Fernando N. Capitulino Wed, 25 Apr 2007 14:17:56 +0000 (11:17 -0300)

remove_subtree(): Use strerror() when possible

Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Add 'filter' attribute and external filter driver defin... Junio C Hamano Sat, 21 Apr 2007 10:14:13 +0000 (03:14 -0700)

Add 'filter' attribute and external filter driver definition.

The interface is similar to the custom low-level merge drivers.

First you configure your filter driver by defining 'filter.<name>.*'
variables in the configuration.

filter.<name>.clean filter command to run upon checkin
filter.<name>.smudge filter command to run upon checkout

Then you assign filter attribute to each path, whose name
matches the custom filter driver's name.

Example:

(in .gitattributes)
*.c filter=indent

(in config)
[filter "indent"]
clean = indent
smudge = cat

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

Add 'ident' conversion.Junio C Hamano Sun, 22 Apr 2007 02:09:02 +0000 (19:09 -0700)

Add 'ident' conversion.

The 'ident' attribute set to path squashes "$ident:<any bytes
except dollor sign>$" to "$ident$" upon checkin, and expands it
to "$ident: <blob SHA-1> $" upon checkout.

As we have two conversions that affect checkin/checkout paths,
clarify how they interact with each other.

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

Merge branch 'jc/the-index'Junio C Hamano Wed, 25 Apr 2007 05:13:22 +0000 (22:13 -0700)

Merge branch 'jc/the-index'

* jc/the-index:
Make read-cache.c "the_index" free.
Move index-related variables into a structure.

Merge branch 'mk/diff'Junio C Hamano Wed, 25 Apr 2007 05:12:48 +0000 (22:12 -0700)

Merge branch 'mk/diff'

* mk/diff:
Diff between two blobs should take mode changes into account now.
use mode of the tree in git-diff, if <tree>:<file> syntax is used
store mode in rev_list, if <tree>:<filename> syntax is used
add add_object_array_with_mode
add get_sha1_with_mode
Add S_IFINVALID mode

Merge branch 'maint'Junio C Hamano Wed, 25 Apr 2007 05:07:34 +0000 (22:07 -0700)

Merge branch 'maint'

* maint:
Remove usernames from all commit messages, not just when using svmprops
applymbox & quiltimport: typofix.
Create a sysconfdir variable, and use it for ETC_GITCONFIG

Merge branch 'master' of git://repo.or.cz/git/fastimportJunio C Hamano Wed, 25 Apr 2007 05:02:38 +0000 (22:02 -0700)

Merge branch 'master' of git://repo.or.cz/git/fastimport

* 'master' of git://repo.or.cz/git/fastimport:
fast-import: size_t vs ssize_t
fix importing of subversion tars
Don't repack existing objects in fast-import

Remove usernames from all commit messages, not just... Adam Roben Wed, 25 Apr 2007 01:02:07 +0000 (18:02 -0700)

Remove usernames from all commit messages, not just when using svmprops

Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz>
Signed-off-by: Adam Roben <aroben@apple.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

applymbox & quiltimport: typofix.Junio C Hamano Tue, 24 Apr 2007 21:27:00 +0000 (14:27 -0700)

applymbox & quiltimport: typofix.

6777c380 fixed only one of three typos introduced in an earlier
patch 87ab7992. This fixes the other two.

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

gitattributes documentation: clarify overridingJunio C Hamano Tue, 24 Apr 2007 20:46:02 +0000 (13:46 -0700)

gitattributes documentation: clarify overriding

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

fast-import: size_t vs ssize_tSami Farin Tue, 24 Apr 2007 19:56:02 +0000 (22:56 +0300)

fast-import: size_t vs ssize_t

size_t is unsigned, so (n < 0) is never true.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

t/test-lib.sh: Protect ourselves from common misconfigu... Junio C Hamano Tue, 24 Apr 2007 18:21:47 +0000 (11:21 -0700)

t/test-lib.sh: Protect ourselves from common misconfiguration
that exports CDPATH to the environment

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

fix importing of subversion tarsUwe Kleine-König Tue, 24 Apr 2007 11:51:04 +0000 (13:51 +0200)

fix importing of subversion tars

add a / between the prefix and name fields of the tar archive if prefix
is non-empty.

Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Create a sysconfdir variable, and use it for ETC_GITCONFIGJosh Triplett Tue, 24 Apr 2007 07:51:35 +0000 (00:51 -0700)

Create a sysconfdir variable, and use it for ETC_GITCONFIG

ETC_GITCONFIG defaults to $(prefix)/etc/gitconfig, so if you just set
prefix=/usr, you end up with a git that looks in /usr/etc/gitconfig, rather
than /etc/gitconfig as specified by the FHS. Furthermore, setting
ETC_GITCONFIG does not fix the paths to any future system-wide configuration
files.

Factor out the path to the system-wide configuration directory into a variable
sysconfdir, normally set to $(prefix)/etc, but set to /etc when prefix=/usr .
This fixes the prefix=/usr problem for ETC_GITCONFIG, and allows centralized
configuration of any future system-wide configuration files without requiring
further action from package maintainers or other people building and
installing git.

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Diff between two blobs should take mode changes into... Junio C Hamano Mon, 23 Apr 2007 06:56:22 +0000 (23:56 -0700)

Diff between two blobs should take mode changes into account now.

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

use mode of the tree in git-diff, if <tree>:<file>... Martin Koegler Sun, 22 Apr 2007 16:44:00 +0000 (18:44 +0200)

use mode of the tree in git-diff, if <tree>:<file> syntax is used

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>

store mode in rev_list, if <tree>:<filename> syntax... Martin Koegler Sun, 22 Apr 2007 16:43:59 +0000 (18:43 +0200)

store mode in rev_list, if <tree>:<filename> syntax is used

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>

add add_object_array_with_modeMartin Koegler Sun, 22 Apr 2007 16:43:58 +0000 (18:43 +0200)

add add_object_array_with_mode

Each object in struct object_array is extended with the mode.
If not specified, S_IFINVALID is used. An object with an mode value
can be added with add_object_array_with_mode.

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>

add get_sha1_with_modeMartin Koegler Mon, 23 Apr 2007 20:55:05 +0000 (22:55 +0200)

add get_sha1_with_mode

get_sha1_with_mode basically behaves as get_sha1. It has an additional
parameter for storing the mode of the object.

If the mode can not be determined, it stores S_IFINVALID.

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Add S_IFINVALID modeMartin Koegler Sun, 22 Apr 2007 16:43:56 +0000 (18:43 +0200)

Add S_IFINVALID mode

S_IFINVALID is used to signal, that no mode information is available.

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'maint'Junio C Hamano Tue, 24 Apr 2007 07:08:16 +0000 (00:08 -0700)

Merge branch 'maint'

* maint:
Documentation/git-reset.txt: suggest git commit --amend in example.
Build RPM with ETC_GITCONFIG=/etc/gitconfig
Ignore all man sections as they are generated files.
Fix typo in git-am: s/Was is/Was it/
Reverse the order of -b and --track in the man page.
dir.c(common_prefix): Fix two bugs

Conflicts:

git.spec.in