Junio C Hamano [Mon, 22 May 2006 00:37:54 +0000 (17:37 -0700)]
Merge branch 'jc/mailinfo' into next
* jc/mailinfo:
mailinfo: skip bogus UNIX From line inside body
tutorial-2: typofix in examples.
tutorial: add discussion of index file, object database
tutorial: expanded discussion of commit history
tutorial: replace "whatchanged" by "log"
NO_INET_NTOP and compat/inet_ntop.c for some systems (e.g. old Cygwin).
remove superflous "const"
checkdiff_consume: strtol parameter fix.
Elaborate on why ':' is a bad idea in a ref name.
Reference git-check-ref-format in git-branch.
Junio C Hamano [Mon, 22 May 2006 00:15:06 +0000 (17:15 -0700)]
mailinfo: skip bogus UNIX From line inside body
Sometimes people just include the whole format-patch output in
the commit e-mail. Detect it and skip the bogus ">From " line.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 22 May 2006 00:37:25 +0000 (17:37 -0700)]
tutorial-2: typofix in examples.
Signed-off-by: Junio C Hamano <junkio@cox.net>
J. Bruce Fields [Sun, 21 May 2006 23:49:34 +0000 (19:49 -0400)]
tutorial: add discussion of index file, object database
Add a sequel to tutorial.txt which discusses the index file and
the object database.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
J. Bruce Fields [Sun, 21 May 2006 20:54:05 +0000 (16:54 -0400)]
tutorial: expanded discussion of commit history
Expand the history-browsing section of the tutorial a bit, in part to
address Junio's suggestion that we mention "git grep" and Linus's
complaint that people are missing the flexibility of the commandline
interfaces for selecting commits.
This reads a little more like a collection of examples than a
"tutorial", but maybe that's what people need at this point.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
J. Bruce Fields [Sun, 21 May 2006 20:52:34 +0000 (16:52 -0400)]
tutorial: replace "whatchanged" by "log"
Junio suggested changing references to git-whatchanged to git-log.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Yakov Lerner [Sun, 21 May 2006 21:37:00 +0000 (00:37 +0300)]
NO_INET_NTOP and compat/inet_ntop.c for some systems (e.g. old Cygwin).
For systems which lack inet_ntop(), this adds compat/inet_ntop.c,
and related build constant, NO_INET_NTOP. Older Cygwin(s) lack
inet_ntop().
Signed-off-by: Yakov Lerner <iler.ml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alex Riesen [Sun, 21 May 2006 20:45:46 +0000 (22:45 +0200)]
remove superflous "const"
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 21 May 2006 10:16:51 +0000 (03:16 -0700)]
Merge branch 'js/fmt-patch' into next
* js/fmt-patch:
git-rebase: use canonical A..B syntax to format-patch
Junio C Hamano [Sun, 21 May 2006 10:16:38 +0000 (03:16 -0700)]
git-rebase: use canonical A..B syntax to format-patch
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 21 May 2006 10:01:59 +0000 (03:01 -0700)]
checkdiff_consume: strtol parameter fix.
The second parameter is not the end of string input; it is
the optional return value to retrieve where the parser stopped.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 21 May 2006 09:59:51 +0000 (02:59 -0700)]
Merge branch 'js/fmt-patch' into next
* js/fmt-patch:
git-format-patch: now built-in.
fmt-patch: Support --attach
diff family: add --check option
Document that "git add" only adds non-ignored files.
Junio C Hamano [Sun, 21 May 2006 09:48:21 +0000 (02:48 -0700)]
git-format-patch: now built-in.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn Pearce [Sun, 21 May 2006 02:03:14 +0000 (22:03 -0400)]
Elaborate on why ':' is a bad idea in a ref name.
With the new cat-file syntax of 'v1.3.3:refs.c' we should mention
it as part of the reason why ':' is not permitted in a ref name.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn Pearce [Sun, 21 May 2006 01:54:46 +0000 (21:54 -0400)]
Reference git-check-ref-format in git-branch.
Its nice to have git-check-ref-format actually get mentioned in
git-branch's documentation as the syntax of a ref name must conform
to what is described in git-check-ref-format.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Sat, 20 May 2006 13:40:29 +0000 (15:40 +0200)]
fmt-patch: Support --attach
This patch touches a couple of files, because it adds options to print a
custom text just after the subject of a commit, and just after the
diffstat.
[jc: made "many dashes" used as the boundary leader into a single
variable, to reduce the possibility of later tweaks to miscount the
number of dashes to break it.]
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 21 May 2006 08:34:54 +0000 (01:34 -0700)]
Merge branch 'master' into js/fmt-patch
* master: (119 commits)
diff family: add --check option
Document that "git add" only adds non-ignored files.
Add a conversion tool to migrate remote information into the config
fetch, pull: ask config for remote information
Fix build procedure for builtin-init-db
read-tree -m -u: do not overwrite or remove untracked working tree files.
apply --cached: do not check newly added file in the working tree
Implement a --dry-run option to git-quiltimport
Implement git-quiltimport
Revert "builtin-grep: workaround for non GNU grep."
builtin-grep: workaround for non GNU grep.
builtin-grep: workaround for non GNU grep.
git-am: use apply --cached
apply --cached: apply a patch without using working tree.
apply --numstat: show new name, not old name.
Documentation/Makefile: create tarballs for the man pages and html files
Allow pickaxe and diff-filter options to be used by git log.
Libify the index refresh logic
Builtin git-init-db
Remove unnecessary local in get_ref_sha1.
...
Johannes Schindelin [Sat, 20 May 2006 21:43:13 +0000 (23:43 +0200)]
diff family: add --check option
Actually, it is a diff option now, so you can say
git diff --check
to ask if what you are about to commit is a good patch.
[jc: this also would work for fmt-patch, but the point is that
the check is done before making a commit. format-patch is run
from an already created commit, and that is too late to catch
whitespace damaged change.]
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Santi [Fri, 19 May 2006 21:02:34 +0000 (23:02 +0200)]
Document that "git add" only adds non-ignored files.
Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 20 May 2006 08:55:25 +0000 (01:55 -0700)]
Merge branch 'jc/dirwalk-n-cache-tree' into next
* jc/dirwalk-n-cache-tree:
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 20 May 2006 08:28:49 +0000 (01:28 -0700)]
Merge branch 'lt/dirwalk' into jc/dirwalk-n-cache-tree
This commit is what this branch is all about. It records the
evil merge needed to adjust built-in git-add and git-rm for
the cache-tree extension.
* lt/dirwalk:
Add builtin "git rm" command
Move pathspec matching from builtin-add.c into dir.c
Prevent bogus paths from being added to the index.
builtin-add: fix unmatched pathspec warnings.
Remove old "git-add.sh" remnants
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
Conflicts:
Makefile
builtin.h
git.c
update-index.c
Junio C Hamano [Sat, 20 May 2006 07:56:11 +0000 (00:56 -0700)]
Merge branch 'jc/cache-tree' into jc/dirwalk-n-cache-tree
* jc/cache-tree: (24 commits)
Fix crash when reading the empty tree
fsck-objects: do not segfault on missing tree in cache-tree
cache-tree: a bit more debugging support.
read-tree: invalidate cache-tree entry when a new index entry is added.
Fix test-dump-cache-tree in one-tree disappeared case.
fsck-objects: mark objects reachable from cache-tree
cache-tree: replace a sscanf() by two strtol() calls
cache-tree.c: typefix
test-dump-cache-tree: validate the cached data as well.
cache_tree_update: give an option to update cache-tree only.
read-tree: teach 1-way merege and plain read to prime cache-tree.
read-tree: teach 1 and 2 way merges about cache-tree.
update-index: when --unresolve, smudge the relevant cache-tree entries.
test-dump-cache-tree: report number of subtrees.
cache-tree: sort the subtree entries.
Teach fsck-objects about cache-tree.
index: make the index file format extensible.
cache-tree: protect against "git prune".
Add test-dump-cache-tree
Use cache-tree in update-index.
...
Junio C Hamano [Sat, 20 May 2006 01:15:34 +0000 (18:15 -0700)]
Merge branch 'jc/tartree' into next
* jc/tartree:
built-in tar-tree and remote tar-tree
Junio C Hamano [Sat, 20 May 2006 01:06:08 +0000 (18:06 -0700)]
Merge branch 'master' into next
* master:
Fix build procedure for builtin-init-db
Allow pickaxe and diff-filter options to be used by git log.
Libify the index refresh logic
Builtin git-init-db
Junio C Hamano [Fri, 19 May 2006 01:46:44 +0000 (18:46 -0700)]
built-in tar-tree and remote tar-tree
This makes tar-tree a built-in. As an added bonus, you can now
say:
git tar-tree --remote=remote-repository <ent> [<base>]
This does not work with git-daemon yet, but should work with
localhost and git over ssh transports.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 20 May 2006 00:44:07 +0000 (17:44 -0700)]
Merge branch 'js/fetchconfig'
* js/fetchconfig:
Add a conversion tool to migrate remote information into the config
fetch, pull: ask config for remote information
Junio C Hamano [Sat, 20 May 2006 00:30:34 +0000 (17:30 -0700)]
Merge branch 'lt/dirwalk' into next
* lt/dirwalk:
Add builtin "git rm" command
Move pathspec matching from builtin-add.c into dir.c
Linus Torvalds [Fri, 19 May 2006 23:19:34 +0000 (16:19 -0700)]
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 20 May 2006 00:23:07 +0000 (17:23 -0700)]
Fix build procedure for builtin-init-db
c3c8835fbb182d971d71939b9a3ec7c8b86d6caf broke the default template
location which is in builtin-init-db.o, by not supplying the
compilation-time constant to the right build commands.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 20 May 2006 00:02:22 +0000 (17:02 -0700)]
Merge branch 'jc/read-tree-safety'
* jc/read-tree-safety:
read-tree -m -u: do not overwrite or remove untracked working tree files.
Junio C Hamano [Fri, 19 May 2006 23:59:29 +0000 (16:59 -0700)]
Merge branch 'jc/apply'
* jc/apply:
apply --cached: do not check newly added file in the working tree
Junio C Hamano [Fri, 19 May 2006 23:57:11 +0000 (16:57 -0700)]
Merge branch 'eb/quilt'
* eb/quilt:
Implement a --dry-run option to git-quiltimport
Implement git-quiltimport
Junio C Hamano [Fri, 19 May 2006 23:55:33 +0000 (16:55 -0700)]
Merge branch 'jc/grep'
* jc/grep:
Revert "builtin-grep: workaround for non GNU grep."
builtin-grep: workaround for non GNU grep.
Junio C Hamano [Fri, 19 May 2006 23:26:45 +0000 (16:26 -0700)]
Merge branch 'lt/grep'
* lt/grep:
builtin-grep: workaround for non GNU grep.
git-am: use apply --cached
apply --cached: apply a patch without using working tree.
apply --numstat: show new name, not old name.
Junio C Hamano [Fri, 19 May 2006 23:26:01 +0000 (16:26 -0700)]
Merge branch 'ts/doctar'
* ts/doctar:
Documentation/Makefile: create tarballs for the man pages and html files
Sean [Fri, 19 May 2006 04:19:20 +0000 (00:19 -0400)]
Allow pickaxe and diff-filter options to be used by git log.
Handle the -S option when passed to git log such that only the
appropriate commits are displayed. Also per Junio's comments, do
the same for "--diff-filter", so that it too can be used as an option
to git log. By default no patch or diff information is displayed.
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Fri, 19 May 2006 23:07:51 +0000 (16:07 -0700)]
Move pathspec matching from builtin-add.c into dir.c
I'll use it for builtin-rm.c too.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Fri, 19 May 2006 16:56:35 +0000 (09:56 -0700)]
Libify the index refresh logic
This cleans up and libifies the "git update-index --[really-]refresh"
functionality. This will be eventually required for eventually doing the
"commit" and "status" commands as built-ins.
It really just moves "refresh_index()" from update-index.c to
read-cache.c, but it also has to change the calling convention so that the
function uses a "unsigned int flags" argument instead of various static
flags variables for passing down the information about whether to be quiet
or not, and allow unmerged entries etc.
That actually cleans up update-index.c too, since it turns out that all
those flags were really specific to that one function of the index update,
so they shouldn't have had file-scope visibility even before.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Timo Hirvonen [Fri, 19 May 2006 10:03:57 +0000 (13:03 +0300)]
Builtin git-init-db
Basically this just renames init-db.c to builtin-init-db.c and makes
some strings const.
Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 19 May 2006 16:10:38 +0000 (09:10 -0700)]
Merge early part of 'sp/reflog' branch
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
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>
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>
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
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.
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>
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>
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>
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>
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>
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>
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.
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>
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>
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
Junio C Hamano [Thu, 18 May 2006 05:33:06 +0000 (22:33 -0700)]
Merge branch 'maint'
* maint:
git-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>
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
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>
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.
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>
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
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>
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.
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.
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."
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>
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
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.
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.
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>
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>
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.
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.
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>
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
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.
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>
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>
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>
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>
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>
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
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>
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
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
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>
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
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>
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
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.
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.
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.
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>
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.
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>
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
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
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
Junio C Hamano [Tue, 16 May 2006 01:12:57 +0000 (18:12 -0700)]
Merge branch 'lt/config'
* lt/config: