git
18 years agoMerge branch 'eb/quilt' into next
Junio C Hamano [Fri, 19 May 2006 05:56:43 +0000 (22:56 -0700)] 
Merge branch 'eb/quilt' into next

* eb/quilt:
  Implement a --dry-run option to git-quiltimport
  Implement git-quiltimport

18 years agoImplement a --dry-run option to git-quiltimport
Eric W. Biederman [Wed, 17 May 2006 20:10:25 +0000 (14:10 -0600)] 
Implement a --dry-run option to git-quiltimport

Since large quilt trees like -mm can easily have patches
without clear authorship information, add a --dry-run
option to make the problem patches easy to find.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoImplement git-quiltimport
Eric W. Biederman [Wed, 17 May 2006 18:44:40 +0000 (12:44 -0600)] 
Implement git-quiltimport

Importing a quilt patch series into git is not very difficult
but parsing the patch descriptions and all of the other
minutia take a bit of effort to get right, so this automates it.

Since git and quilt complement each other it makes sense
to make it easy to go back and forth between the two.

If a patch is encountered that it cannot derive the author
from the user is asked.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'ts/doctar' into next
Junio C Hamano [Fri, 19 May 2006 05:08:41 +0000 (22:08 -0700)] 
Merge branch 'ts/doctar' into next

* ts/doctar:
  Documentation/Makefile: create tarballs for the man pages and html files
  SubmittingPatches: The download location of External Editor has moved
  Make git-check-format-ref a builtin.
  Make "git rev-list" be a builtin
  builtin-diff: do not say files are renamed when blob and file are given
  Provide a way to flush git-diff-tree's output

18 years agoMerge branch 'lt/dirwalk' into next
Junio C Hamano [Fri, 19 May 2006 03:16:03 +0000 (20:16 -0700)] 
Merge branch 'lt/dirwalk' into next

* lt/dirwalk:
  Prevent bogus paths from being added to the index.

18 years agoDocumentation/Makefile: create tarballs for the man pages and html files
Tilman Sauerbeck [Thu, 18 May 2006 10:57:04 +0000 (12:57 +0200)] 
Documentation/Makefile: create tarballs for the man pages and html files

[jc: rewrote by stealing from what I run to update html and
 man branches automatically]

Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoSubmittingPatches: The download location of External Editor has moved
Lukas Sandström [Thu, 18 May 2006 12:23:59 +0000 (14:23 +0200)] 
SubmittingPatches: The download location of External Editor has moved

Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake git-check-format-ref a builtin.
Lukas Sandström [Thu, 18 May 2006 12:15:55 +0000 (14:15 +0200)] 
Make git-check-format-ref a builtin.

Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake "git rev-list" be a builtin
Linus Torvalds [Thu, 18 May 2006 21:19:20 +0000 (14:19 -0700)] 
Make "git rev-list" be a builtin

This was surprisingly easy. The diff is truly minimal: rename "main()" to
"cmd_rev_list()" in rev-list.c, and rename the whole file to reflect its
new built-in status.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin-diff: do not say files are renamed when blob and file are given
Junio C Hamano [Thu, 18 May 2006 21:35:37 +0000 (14:35 -0700)] 
builtin-diff: do not say files are renamed when blob and file are given

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoPrevent bogus paths from being added to the index.
Linus Torvalds [Thu, 18 May 2006 19:07:31 +0000 (12:07 -0700)] 
Prevent bogus paths from being added to the index.

With this one, it's now a fatal error to try to add a pathname
that cannot be added with "git add", i.e.

[torvalds@g5 git]$ git add .git/config
fatal: unable to add .git/config to index

and

[torvalds@g5 git]$ git add foo/../bar
fatal: unable to add foo/../bar to index

instead of the old "Ignoring path xyz" warning that would end up
silently succeeding on any other paths.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'lt/dirwalk' into next
Junio C Hamano [Thu, 18 May 2006 08:47:13 +0000 (01:47 -0700)] 
Merge branch 'lt/dirwalk' into next

* lt/dirwalk:
  builtin-add: fix unmatched pathspec warnings.

18 years agobuiltin-add: fix unmatched pathspec warnings.
Junio C Hamano [Thu, 18 May 2006 08:29:36 +0000 (01:29 -0700)] 
builtin-add: fix unmatched pathspec warnings.

"git add Documentation/" when Documentation directory exists
does not barf (as it should not), but "git add ." barfed when it
did not add anything.  This was because we checked for the path
prefix ("Documentation/" in the former case, and an empty string
in the latter case) for existence, and lstat("", &st) would say
"Huh?".

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoProvide a way to flush git-diff-tree's output
Paul Mackerras [Thu, 18 May 2006 06:58:51 +0000 (16:58 +1000)] 
Provide a way to flush git-diff-tree's output

Gitk wants to use git-diff-tree as a filter to tell it which ids from
a given list affect a set of files or directories.  We don't want to
fork and exec a new git-diff-tree process for each batch of ids, since
there could be a lot of relatively small batches.  For example, a
batch could contain as many ids as fit in gitk's headline display
window, i.e. 20 or so, and we would be processing a new batch every
time the user scrolls that window.

The --stdin flag to git-diff-tree is suitable for this, but the main
difficulty is that the output of git-diff-tree gets buffered and
doesn't get sent until the buffer is full.

This provides a way to get git-diff-tree to flush its output buffers.
If a blank line is supplied on git-diff-tree's standard input, it will
flush its output buffers and then accept further input.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'master' into next
Junio C Hamano [Thu, 18 May 2006 06:37:51 +0000 (23:37 -0700)] 
Merge branch 'master' into next

* master:
  git-cvsimport: Handle "Removed" from pserver

18 years agoMerge branch 'maint'
Junio C Hamano [Thu, 18 May 2006 05:33:06 +0000 (22:33 -0700)] 
Merge branch 'maint'

* maint:
  git-cvsimport: Handle "Removed" from pserver

18 years agogit-cvsimport: Handle "Removed" from pserver
Elrond [Wed, 10 May 2006 17:37:04 +0000 (19:37 +0200)] 
git-cvsimport: Handle "Removed" from pserver

Sometimes the pserver says "Removed" instead of "Remove-entry".

Signed-off-by: Elrond <elrond+kernel.org@samba-tng.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'lt/dirwalk' into next
Junio C Hamano [Thu, 18 May 2006 05:27:58 +0000 (22:27 -0700)] 
Merge branch 'lt/dirwalk' into next

* lt/dirwalk:
  Remove old "git-add.sh" remnants

18 years agoRemove old "git-add.sh" remnants
Linus Torvalds [Thu, 18 May 2006 04:21:04 +0000 (21:21 -0700)] 
Remove old "git-add.sh" remnants

Repeat after me: "It's now a built-in"

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'sp/reflog' into next
Junio C Hamano [Thu, 18 May 2006 00:34:01 +0000 (17:34 -0700)] 
Merge branch 'sp/reflog' into next

* sp/reflog:
  Remove unnecessary local in get_ref_sha1.

18 years agoRemove unnecessary local in get_ref_sha1.
Shawn Pearce [Wed, 17 May 2006 09:54:46 +0000 (05:54 -0400)] 
Remove unnecessary local in get_ref_sha1.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/apply' into next
Junio C Hamano [Wed, 17 May 2006 23:56:20 +0000 (16:56 -0700)] 
Merge branch 'jc/apply' into next

* jc/apply:
  apply --cached: do not check newly added file in the working tree

18 years agoapply --cached: do not check newly added file in the working tree
Junio C Hamano [Wed, 17 May 2006 23:56:13 +0000 (16:56 -0700)] 
apply --cached: do not check newly added file in the working tree

The --cached mode does not deal with the working tree, so we
should not check it with lstat.  An earlier code omitted the
call to lstat but forgot to omit the check for the errno.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/read-tree-safety' into next
Junio C Hamano [Wed, 17 May 2006 22:54:39 +0000 (15:54 -0700)] 
Merge branch 'jc/read-tree-safety' into next

* jc/read-tree-safety:
  read-tree -m -u: do not overwrite or remove untracked working tree files.

18 years agoMerge branch 'lt/grep' into next
Junio C Hamano [Wed, 17 May 2006 22:52:16 +0000 (15:52 -0700)] 
Merge branch 'lt/grep' into next

* lt/grep:
  builtin-grep: workaround for non GNU grep.

18 years agoMerge branch 'jc/grep' into next
Junio C Hamano [Wed, 17 May 2006 22:52:03 +0000 (15:52 -0700)] 
Merge branch 'jc/grep' into next

* jc/grep:
  Revert "builtin-grep: workaround for non GNU grep."

18 years agobuiltin-grep: workaround for non GNU grep.
Linus Torvalds [Wed, 17 May 2006 18:12:22 +0000 (11:12 -0700)] 
builtin-grep: workaround for non GNU grep.

Of course, it still ignores the fact that not all grep's support some of
the flags like -F/-L/-A/-C etc, but for those cases, the external grep
itself will happily just say "unrecognized option -F" or similar.

So with this change, "git grep" should handle all the flags the native
grep handles, which is really quite fine. We don't _need_ to expose
anything more, and if you do want our extensions, you can get them with
"--uncached" and an up-to-date index.

No configuration necessary, and we automatically take advantage of any
native grep we have, if possible.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'ew/pretty-fmt'
Junio C Hamano [Wed, 17 May 2006 22:49:23 +0000 (15:49 -0700)] 
Merge branch 'ew/pretty-fmt'

* ew/pretty-fmt:
  commit: allow --pretty= args to be abbreviated

18 years agoMerge branch 'jc/apply'
Junio C Hamano [Wed, 17 May 2006 22:47:33 +0000 (15:47 -0700)] 
Merge branch 'jc/apply'

* jc/apply:
  git-am: use apply --cached
  apply --cached: apply a patch without using working tree.
  apply --numstat: show new name, not old name.

18 years agoMerge branch 'lt/dirwalk' into next
Junio C Hamano [Wed, 17 May 2006 22:32:45 +0000 (15:32 -0700)] 
Merge branch 'lt/dirwalk' into next

* lt/dirwalk:
  builtin-add: warn on unmatched pathspecs
  Do "git add" as a builtin
  Clean up git-ls-file directory walking library interface
  libify git-ls-files directory traversal

Not a conflict, but builtin-add needed to be adjusted to properly
invalidate the cache_tree entry.

18 years agobuiltin-add: warn on unmatched pathspecs
Linus Torvalds [Wed, 17 May 2006 20:23:19 +0000 (13:23 -0700)] 
builtin-add: warn on unmatched pathspecs

This is in the same spirit as what bba319b5 and 45e48120 tried
to do to help users.  A command such as "git add Documentaiton"
with misspelled pathspecs would give a friendly reminder with
this.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDo "git add" as a builtin
Linus Torvalds [Wed, 17 May 2006 16:33:32 +0000 (09:33 -0700)] 
Do "git add" as a builtin

First try. Let's see how well this works.

In many ways, the hard parts of "git commit" are not so different from
this, and a builtin commit would share a lot of the code, I think.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRevert "builtin-grep: workaround for non GNU grep."
Junio C Hamano [Wed, 17 May 2006 18:42:14 +0000 (11:42 -0700)] 
Revert "builtin-grep: workaround for non GNU grep."

This reverts 518920b764ee9150781e68217181b24d0712748e commit.
Linus has a more portable alternative.

18 years agoMerge branch 'jc/gitlink' into next
Junio C Hamano [Wed, 17 May 2006 10:16:50 +0000 (03:16 -0700)] 
Merge branch 'jc/gitlink' into next

* jc/gitlink:
  read-tree: reorganize bind_merge code.

18 years agoread-tree: reorganize bind_merge code.
Junio C Hamano [Wed, 17 May 2006 10:16:27 +0000 (03:16 -0700)] 
read-tree: reorganize bind_merge code.

This does not change the logic but moves the order of checks
around so that merging of read-tree safety code would become
easier.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'ew/pretty-fmt' into next
Junio C Hamano [Wed, 17 May 2006 10:04:14 +0000 (03:04 -0700)] 
Merge branch 'ew/pretty-fmt' into next

* ew/pretty-fmt:
  commit: allow --pretty= args to be abbreviated

Conflicts:

commit.c - adjust to --pretty=email

18 years agoMerge branch 'jc/grep' into next
Junio C Hamano [Wed, 17 May 2006 09:59:46 +0000 (02:59 -0700)] 
Merge branch 'jc/grep' into next

* jc/grep:
  builtin-grep: workaround for non GNU grep.

18 years agocommit: allow --pretty= args to be abbreviated
Eric Wong [Mon, 15 May 2006 00:20:46 +0000 (17:20 -0700)] 
commit: allow --pretty= args to be abbreviated

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin-grep: workaround for non GNU grep.
Junio C Hamano [Wed, 17 May 2006 09:48:13 +0000 (02:48 -0700)] 
builtin-grep: workaround for non GNU grep.

Some implementations do not know what to do with -H; define
NO_H_OPTION_IN_GREP when you build git if your grep lacks -H.

Most of the time, it can be worked around by prepending
/dev/null to the argument list, but that causes -L and -c to
slightly misbehave (they both expose /dev/null is given), so
when these options are given, do not run external grep that does
not understand -H.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoClean up git-ls-file directory walking library interface
Linus Torvalds [Wed, 17 May 2006 02:46:16 +0000 (19:46 -0700)] 
Clean up git-ls-file directory walking library interface

This moves the code to add the per-directory ignore files for the base
directory into the library routine.

That not only allows us to turn the function push_exclude_per_directory()
static again, it also simplifies the library interface a lot (the caller
no longer needs to worry about any of the per-directory exclude files at
all).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agolibify git-ls-files directory traversal
Linus Torvalds [Wed, 17 May 2006 02:02:14 +0000 (19:02 -0700)] 
libify git-ls-files directory traversal

This moves the core directory traversal and filename exclusion logic
into the general git library, making it available for other users
directly.

If we ever want to do "git commit" or "git add" as a built-in (and we
do), we want to be able to handle most of git-ls-files as a library.

NOTE! Not all of git-ls-files is libified by this.  The index matching
and pathspec prefix calculation is still in ls-files.c, but this is a
big part of it.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoread-tree -m -u: do not overwrite or remove untracked working tree files.
Junio C Hamano [Wed, 17 May 2006 08:17:46 +0000 (01:17 -0700)] 
read-tree -m -u: do not overwrite or remove untracked working tree files.

When a merge results in a creation of a path that did not exist
in HEAD, and if you already have that path on the working tree,
because the index has not been told about the working tree file,
read-tree happily removes it.  The issue was brought up by Santi
Béjar on the list.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'master' into next
Junio C Hamano [Wed, 17 May 2006 00:21:35 +0000 (17:21 -0700)] 
Merge branch 'master' into next

* master:
  Remove old "git-grep.sh" remnants
  merge-base: Clarify the comments on post processing.
  Update the documentation for git-merge-base

18 years agoRemove old "git-grep.sh" remnants
Linus Torvalds [Tue, 16 May 2006 23:46:31 +0000 (16:46 -0700)] 
Remove old "git-grep.sh" remnants

It's built-in now.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'maint'
Junio C Hamano [Wed, 17 May 2006 00:21:02 +0000 (17:21 -0700)] 
Merge branch 'maint'

* maint:
  merge-base: Clarify the comments on post processing.
  Update the documentation for git-merge-base

18 years agoMerge branch 'np/pack'
Junio C Hamano [Wed, 17 May 2006 00:20:24 +0000 (17:20 -0700)] 
Merge branch 'np/pack'

* np/pack:
  improve depth heuristic for maximum delta size
  pack-object: slightly more efficient
  simple euristic for further free packing improvements

18 years agomerge-base: Clarify the comments on post processing.
Junio C Hamano [Wed, 17 May 2006 00:18:22 +0000 (17:18 -0700)] 
merge-base: Clarify the comments on post processing.

The comment fooled myself believing that we still had an
unsolved horizon effect.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'np/pack' into next
Junio C Hamano [Tue, 16 May 2006 21:50:26 +0000 (14:50 -0700)] 
Merge branch 'np/pack' into next

* np/pack:
  improve depth heuristic for maximum delta size

18 years agoimprove depth heuristic for maximum delta size
Nicolas Pitre [Tue, 16 May 2006 20:29:14 +0000 (16:29 -0400)] 
improve depth heuristic for maximum delta size

This provides a linear decrement on the penalty related to delta depth
instead of being an 1/x function.  With this another 5% reduction is
observed on packs for both the GIT repo and the Linux kernel repo, as
well as fixing a pack size regression in another sample repo I have.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'se/tag'
Junio C Hamano [Tue, 16 May 2006 06:43:27 +0000 (23:43 -0700)] 
Merge branch 'se/tag'

* se/tag:
  Strip useless "tags/" prefix from git-tag -l output

18 years agoMerge branch 'se/rev-parse'
Junio C Hamano [Tue, 16 May 2006 06:43:23 +0000 (23:43 -0700)] 
Merge branch 'se/rev-parse'

* se/rev-parse:
  Add "--branches", "--tags" and "--remotes" options to git-rev-parse.

18 years agoMerge branch 'se/diff'
Junio C Hamano [Tue, 16 May 2006 06:42:37 +0000 (23:42 -0700)] 
Merge branch 'se/diff'

* se/diff:
  Convert some "apply --summary" users to "diff --summary".
  Add "--summary" option to git diff.

18 years agoMerge branch 'se/rebase'
Junio C Hamano [Tue, 16 May 2006 06:35:24 +0000 (23:35 -0700)] 
Merge branch 'se/rebase'

* se/rebase:
  Make git rebase interactive help match documentation.

18 years agoUpdate the documentation for git-merge-base
Fredrik Kuivinen [Tue, 16 May 2006 05:58:15 +0000 (07:58 +0200)] 
Update the documentation for git-merge-base

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/diff' into next
Junio C Hamano [Tue, 16 May 2006 02:06:06 +0000 (19:06 -0700)] 
Merge branch 'jc/diff' into next

* jc/diff:
  builtin-diff: fix comparison between two blobs.

18 years agobuiltin-diff: fix comparison between two blobs.
Junio C Hamano [Tue, 16 May 2006 02:05:50 +0000 (19:05 -0700)] 
builtin-diff: fix comparison between two blobs.

The code forgot that setup_revisions() leaves parsed object
names in reverse in the list.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'master' into next
Junio C Hamano [Tue, 16 May 2006 01:26:34 +0000 (18:26 -0700)] 
Merge branch 'master' into next

* master:
  Fix silly typo in new builtin grep
  Fix pack-index issue on 64-bit platforms a bit more portably.
  Install git-send-email by default
  Fix compilation on newer NetBSD systems

18 years agoMerge branch 'lt/oneway'
Junio C Hamano [Tue, 16 May 2006 01:15:26 +0000 (18:15 -0700)] 
Merge branch 'lt/oneway'

* lt/oneway:
  read-tree --reset -u fix.
  read-tree -u one-way merge fix to check out locally modified paths.
  Simplify "git reset --hard"
  Allow one-way tree merge to remove old files

18 years agoMerge branch 'ew/send-email'
Junio C Hamano [Tue, 16 May 2006 01:15:03 +0000 (18:15 -0700)] 
Merge branch 'ew/send-email'

* ew/send-email:
  send-email: quiet some warnings, reject invalid addresses
  send-email: allow sendmail binary to be used instead of SMTP

18 years agoMerge branch 'lt/config'
Junio C Hamano [Tue, 16 May 2006 01:12:57 +0000 (18:12 -0700)] 
Merge branch 'lt/config'

* lt/config:

18 years agoMerge branch 'jc/grep'
Junio C Hamano [Tue, 16 May 2006 01:12:06 +0000 (18:12 -0700)] 
Merge branch 'jc/grep'

* jc/grep: (22 commits)
  Fix silly typo in new builtin grep
  builtin-grep: unparse more command line options.
  builtin-grep: use external grep when we can take advantage of it
  builtin-grep: -F (--fixed-strings)
  builtin-grep: -w fix
  builtin-grep: typofix
  builtin-grep: tighten argument parsing.
  builtin-grep: documentation
  Teach -f <file> option to builtin-grep.
  builtin-grep: -L (--files-without-match).
  builtin-grep: binary files -a and -I
  builtin-grep: terminate correctly at EOF
  builtin-grep: tighten path wildcard vs tree traversal.
  builtin-grep: support -w (--word-regexp).
  builtin-grep: support -c (--count).
  builtin-grep: allow more than one patterns.
  builtin-grep: allow -<n> and -[ABC]<n> notation for context lines.
  builtin-grep: printf %.*s length is int, not ptrdiff_t.
  builtin-grep: do not use setup_revisions()
  builtin-grep: support '-l' option.
  ...

18 years agoMerge branch 'lt/diff'
Junio C Hamano [Tue, 16 May 2006 01:09:15 +0000 (18:09 -0700)] 
Merge branch 'lt/diff'

* lt/diff:
  git diff: support "-U" and "--unified" options properly

18 years agoFix silly typo in new builtin grep
Linus Torvalds [Tue, 16 May 2006 00:54:01 +0000 (17:54 -0700)] 
Fix silly typo in new builtin grep

The "-F" flag apparently got mis-translated due to some over-eager
copy-paste work into a duplicate "-H" when using the external grep.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/apply' into next
Junio C Hamano [Tue, 16 May 2006 00:58:02 +0000 (17:58 -0700)] 
Merge branch 'jc/apply' into next

* jc/apply:
  git-am: use apply --cached
  apply --cached: apply a patch without using working tree.

18 years agogit-am: use apply --cached
Junio C Hamano [Tue, 16 May 2006 00:25:43 +0000 (17:25 -0700)] 
git-am: use apply --cached

Now 'git apply' can apply patch without working tree, preparation
of pristine preimage and postimage trees that are done when falling
back on 3-way merge by "git am" can do so without temporary files.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoapply --cached: apply a patch without using working tree.
Junio C Hamano [Mon, 15 May 2006 22:15:47 +0000 (15:15 -0700)] 
apply --cached: apply a patch without using working tree.

A new flag "--cached" takes the cached data, applies the patch
and stores the result in the index, without using the working
tree.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/grep' into next
Junio C Hamano [Mon, 15 May 2006 20:51:35 +0000 (13:51 -0700)] 
Merge branch 'jc/grep' into next

* jc/grep:
  builtin-grep: unparse more command line options.

18 years agoMerge branch 'ew/send-email' into next
Junio C Hamano [Mon, 15 May 2006 20:51:23 +0000 (13:51 -0700)] 
Merge branch 'ew/send-email' into next

* ew/send-email:
  send-email: quiet some warnings, reject invalid addresses
  send-email: allow sendmail binary to be used instead of SMTP

18 years agoMerge branch 'np/pack' into next
Junio C Hamano [Mon, 15 May 2006 20:51:09 +0000 (13:51 -0700)] 
Merge branch 'np/pack' into next

* np/pack:
  pack-object: slightly more efficient
  simple euristic for further free packing improvements

18 years agoMerge branch 'lt/oneway' into next
Junio C Hamano [Mon, 15 May 2006 20:51:07 +0000 (13:51 -0700)] 
Merge branch 'lt/oneway' into next

* lt/oneway:
  read-tree --reset -u fix.

18 years agoMerge branch 'fix'
Junio C Hamano [Mon, 15 May 2006 20:48:22 +0000 (13:48 -0700)] 
Merge branch 'fix'

* fix:
  Fix pack-index issue on 64-bit platforms a bit more portably.
  Install git-send-email by default
  Fix compilation on newer NetBSD systems
  git config syntax updates
  Another config file parsing fix.
  checkout: use --aggressive when running a 3-way merge (-m).

18 years agobuiltin-grep: unparse more command line options.
Junio C Hamano [Mon, 15 May 2006 20:28:01 +0000 (13:28 -0700)] 
builtin-grep: unparse more command line options.

The earlier one to use external grep missed some often used options.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix pack-index issue on 64-bit platforms a bit more portably. v1.3.3
Junio C Hamano [Mon, 15 May 2006 19:52:00 +0000 (12:52 -0700)] 
Fix pack-index issue on 64-bit platforms a bit more portably.

Apparently <stdint.h> is not enough for uint32_t on OpenBSD; use
"unsigned int" -- hopefully that would stay 32-bit on every
platform we care about, at least until we update the pack-index
file format.

Our sha1 routines optimized for architectures use uint32_t and
expects '#include <stdint.h>' to be enough, so OpenBSD on arm or
ppc might have similar issues down the road, I dunno.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoInstall git-send-email by default
Eric Wong [Mon, 15 May 2006 02:26:56 +0000 (19:26 -0700)] 
Install git-send-email by default

After 567ffeb7722eefab3991cb894c96548b92b57cc2 and
4bc87a28be020a6bf7387161c65ea3d8e4a0228b, git-send-email no
longer requires any non-standard Perl modules, so there's no
reason to special-case it.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix compilation on newer NetBSD systems
Dennis Stosberg [Thu, 11 May 2006 17:35:31 +0000 (19:35 +0200)] 
Fix compilation on newer NetBSD systems

NetBSD >=2.0 has iconv() in libc.  A libiconv is not required and
does not exist.

See: http://netbsd.gw.com/cgi-bin/man-cgi?iconv+3+NetBSD-2.0

[jc: with a bit of simplification later discussed on the list.]

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agopack-object: slightly more efficient
Nicolas Pitre [Mon, 15 May 2006 17:47:16 +0000 (13:47 -0400)] 
pack-object: slightly more efficient

Avoid creating a delta index for objects with maximum depth since they
are not going to be used as delta base anyway.  This also reduce peak
memory usage slightly as the current object's delta index is not useful
until the next object in the loop is considered for deltification. This
saves a bit more than 1% on CPU usage.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosimple euristic for further free packing improvements
Nicolas Pitre [Mon, 15 May 2006 15:40:05 +0000 (11:40 -0400)] 
simple euristic for further free packing improvements

Given that the early eviction of objects with maximum delta depth
may exhibit bad packing on its own, why not considering a bias against
deep base objects in try_delta() to mitigate that bad behavior.

This patch adjust the MAX_size allowed for a delta based on the depth of
the base object as well as enabling the early eviction of max depth
objects from the object window.  When used separately, those two things
produce slightly better and much worse results respectively.  But their
combined effect is a surprising significant packing improvement.

With this really simple patch the GIT repo gets nearly 15% smaller, and
the Linux kernel repo about 5% smaller, with no significantly measurable
CPU usage difference.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoread-tree --reset -u fix.
Linus Torvalds [Mon, 15 May 2006 15:09:31 +0000 (08:09 -0700)] 
read-tree --reset -u fix.

The previous commit makes -u to mean "I do want to remove the
local changes, just update it from the read tree" only for
one-way merge.  It makes sense to have it depend on the
"--reset" flag instead.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosend-email: quiet some warnings, reject invalid addresses
Eric Wong [Mon, 15 May 2006 09:41:01 +0000 (02:41 -0700)] 
send-email: quiet some warnings, reject invalid addresses

I'm not sure why we never actually rejected invalid addresses in
the first place.  We just seemed to be using our email validity
checkers to kill duplicates.

Now we just drop invalid email addresses completely and warn
the user about it.

Since we support local sendmail, we'll also accept username-only
addresses.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosend-email: allow sendmail binary to be used instead of SMTP
Eric Wong [Mon, 15 May 2006 09:34:44 +0000 (02:34 -0700)] 
send-email: allow sendmail binary to be used instead of SMTP

This should make local mailing possible for machines without
a connection to an SMTP server.

It'll default to using /usr/sbin/sendmail or /usr/lib/sendmail
if no SMTP server is specified (the default).  If it can't find
either of those paths, it'll fall back to connecting to an SMTP
server on localhost.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'se/tag' into next
Junio C Hamano [Mon, 15 May 2006 07:55:31 +0000 (00:55 -0700)] 
Merge branch 'se/tag' into next

* se/tag:
  Strip useless "tags/" prefix from git-tag -l output

18 years agoStrip useless "tags/" prefix from git-tag -l output
Sean [Mon, 15 May 2006 00:07:39 +0000 (20:07 -0400)] 
Strip useless "tags/" prefix from git-tag -l output

18 years agoMerge branch 'jc/grep' into next
Junio C Hamano [Mon, 15 May 2006 07:52:20 +0000 (00:52 -0700)] 
Merge branch 'jc/grep' into next

* jc/grep:
  builtin-grep: use external grep when we can take advantage of it

18 years agoMerge branch 'jc/apply' into next
Junio C Hamano [Mon, 15 May 2006 07:52:20 +0000 (00:52 -0700)] 
Merge branch 'jc/apply' into next

* jc/apply:
  apply --numstat: show new name, not old name.
  Ensure author & committer before asking for commit message.
  Install git-send-email by default
  send-email: address expansion for common mailers
  diffstat rename squashing fix.

18 years agoapply --numstat: show new name, not old name.
Junio C Hamano [Mon, 15 May 2006 04:59:04 +0000 (21:59 -0700)] 
apply --numstat: show new name, not old name.

Somehow --stat showed the new name but --numstat showed the old
name for renamed/copied paths.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'fix'
Junio C Hamano [Mon, 15 May 2006 07:51:37 +0000 (00:51 -0700)] 
Merge branch 'fix'

* fix:
  Ensure author & committer before asking for commit message.

18 years agoMerge branch 'fix' into maint
Junio C Hamano [Mon, 15 May 2006 07:49:25 +0000 (00:49 -0700)] 
Merge branch 'fix' into maint

* fix:
  Ensure author & committer before asking for commit message.

18 years agoMerge branch 'lt/oneway' into next
Junio C Hamano [Mon, 15 May 2006 07:48:00 +0000 (00:48 -0700)] 
Merge branch 'lt/oneway' into next

* lt/oneway:
  read-tree -u one-way merge fix to check out locally modified paths.

18 years agoread-tree -u one-way merge fix to check out locally modified paths.
Junio C Hamano [Mon, 15 May 2006 07:46:05 +0000 (00:46 -0700)] 
read-tree -u one-way merge fix to check out locally modified paths.

The "-u" flag means "update the working tree files", but to
other types of merges, it also implies "I want to keep my local
changes" -- because they prevent local changes from getting lost
by using verify_uptodate.  The one-way merge is different from
other merges in that its purpose is opposite of doing something
else while keeping unrelated local changes.  The point of
one-way merge is to nuke local changes.  So while it feels
somewhat wrong that this actively loses local changes, it is the
right thing to do.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoInstall git-send-email by default
Eric Wong [Mon, 15 May 2006 02:26:56 +0000 (19:26 -0700)] 
Install git-send-email by default

After 567ffeb7722eefab3991cb894c96548b92b57cc2 and
4bc87a28be020a6bf7387161c65ea3d8e4a0228b, git-send-email no
longer requires any non-standard Perl modules, so there's no
reason to special-case it.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosend-email: address expansion for common mailers
Eric Wong [Mon, 15 May 2006 02:13:44 +0000 (19:13 -0700)] 
send-email: address expansion for common mailers

mutt, gnus, pine, mailrc formats should be supported.

Testing and feedback for correctness and completeness of all formats
and support for additional formats would be good.

Nested expansions are also supported.

More than one alias file to be used.

All alias file formats must still of be the same type, though.

Two git repo-config keys are required for this
(as suggested by Ryan Anderson):

    sendemail.aliasesfile = <filename of aliases file>
    sendemail.aliasfiletype = (mutt|gnus|pine|mailrc)

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Acked-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin-grep: use external grep when we can take advantage of it
Linus Torvalds [Mon, 15 May 2006 03:49:15 +0000 (20:49 -0700)] 
builtin-grep: use external grep when we can take advantage of it

It's not perfect, but it gets the "git grep some-random-string" down to
the good old half-a-second range for the kernel.

It should convert more of the argument flags for "grep", that should be
trivial to expand (I did a few just as an example). It should also bother
to try to return the right "hit" value (which it doesn't, right now - the
code is kind of there, but I didn't actually bother to do it _right_).

Also, right now it _just_ limits by number of arguments, but it should
also strictly speaking limit by total argument size (ie add up the length
of the filenames, and do the "exec_grep()" flush call if it's bigger than
some random value like 32kB).

But I think that it's _conceptually_ doing all the right things, and it
seems to work. So maybe somebody else can do some of the final polish.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodiffstat rename squashing fix.
Junio C Hamano [Mon, 15 May 2006 05:07:28 +0000 (22:07 -0700)] 
diffstat rename squashing fix.

When renaming leading/a/filename to leading/b/filename (and
"filename" is sufficiently long), we tried to squash the rename
to "leading/{a => b}/filename".  However, when "/a" or "/b" part
is empty, we underflowed and tried to print a substring of
length -1.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'se/diff' into next
Junio C Hamano [Mon, 15 May 2006 00:12:37 +0000 (17:12 -0700)] 
Merge branch 'se/diff' into next

* se/diff:
  Convert some "apply --summary" users to "diff --summary".
  Add "--summary" option to git diff.

18 years agoMerge branch 'se/rebase' into next
Junio C Hamano [Mon, 15 May 2006 00:02:30 +0000 (17:02 -0700)] 
Merge branch 'se/rebase' into next

* se/rebase:
  Make git rebase interactive help match documentation.

18 years agoMerge branch 'se/rev-parse' into next
Junio C Hamano [Sun, 14 May 2006 23:58:59 +0000 (16:58 -0700)] 
Merge branch 'se/rev-parse' into next

* se/rev-parse:
  Add "--branches", "--tags" and "--remotes" options to git-rev-parse.

18 years agoMerge branch 'lt/oneway' into next
Junio C Hamano [Sun, 14 May 2006 23:58:44 +0000 (16:58 -0700)] 
Merge branch 'lt/oneway' into next

* lt/oneway:
  Simplify "git reset --hard"
  Allow one-way tree merge to remove old files

18 years agoSimplify "git reset --hard"
Linus Torvalds [Sun, 14 May 2006 18:20:37 +0000 (11:20 -0700)] 
Simplify "git reset --hard"

Now that the one-way merge strategy does the right thing wrt files that do
not exist in the result, just remove all the random crud we did in "git
reset" to do this all by hand.

Instead, just pass in "-u" to git-read-tree when we do a hard reset, and
depend on git-read-tree to update the working tree appropriately.

This basically means that git reset turns into

# Always update the HEAD ref
git update-ref HEAD "$rev"

case "--soft"
# do nothing to index/working tree
case "--hard"
# read index _and_ update working tree
git-read-tree --reset -u "$rev"
case "--mixed"
# update just index, report on working tree differences
git-read-tree --reset "$rev"
git-update-index --refresh

which is what it was always semantically doing, it just did it in a
rather strange way because it was written to not expect git-read-tree to
do anything to the working tree.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAllow one-way tree merge to remove old files
Linus Torvalds [Sun, 14 May 2006 17:43:50 +0000 (10:43 -0700)] 
Allow one-way tree merge to remove old files

For some random reason (probably just because nobody noticed), the one-way
merge strategy didn't mark deleted files as deleted, so if you used

git-read-tree -m -u <newtree>

it would update the files that got changed in the index, but it would not
delete the files that got deleted.

This should fix it, and I can't imagine that anybody depends on the old
strange "update only existing files" behaviour.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'lt/diff' into next
Junio C Hamano [Sun, 14 May 2006 23:39:14 +0000 (16:39 -0700)] 
Merge branch 'lt/diff' into next

* lt/diff:
  git diff: support "-U" and "--unified" options properly
  include header to define uint32_t, necessary on Mac OS X