Junio C Hamano [Thu, 13 Jul 2006 05:31:22 +0000 (22:31 -0700)]
Merge branch 'lt/merge-tree'
* lt/merge-tree:
Improved three-way blob merging code
Prepare "git-merge-tree" for future work
xdiff: generate "anti-diffs" aka what is common to two files
Junio C Hamano [Thu, 13 Jul 2006 05:21:05 +0000 (22:21 -0700)]
fmt-merge-msg fix
The new C version mistranslated the original Perl version in the
case to pull from the HEAD. This made it to say nonsense like
this:
Merge commit ...url... of HEAD
* HEAD:
...
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alp Toker [Wed, 12 Jul 2006 22:55:10 +0000 (23:55 +0100)]
gitweb: Make command invocations go through the git wrapper
This patch makes invocations of core git commands go through the 'git'
binary itself, which improves readability and might help system
administrators lock down their CGI environment for security.
Signed-off-by: Alp Toker <alp@atoker.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alp Toker [Tue, 11 Jul 2006 20:10:26 +0000 (21:10 +0100)]
gitweb: Include a site name in page titles
This helps users tell one 'git' bookmark apart from the other in their
browser and improves the indexing of gitweb sites in Web search engines.
The title defaults to the SERVER_NAME environment variable, often given
by the webserver.
Signed-off-by: Alp Toker <alp@atoker.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alp Toker [Tue, 11 Jul 2006 10:19:34 +0000 (11:19 +0100)]
gitweb: Send XHTML as 'application/xhtml+xml' where possible
"The 'text/html' media type [RFC2854] is primarily for HTML, not for
XHTML. In general, this media type is NOT suitable for XHTML."
This patch makes gitweb use content negotiation to conservatively send
pages as Content-Type 'application/xhtml+xml' when the user agent
explicitly claims to support it.
It falls back to 'text/html' even if the user agent appears to
implicitly support 'application/xhtml+xml' due to a '*/*' glob, working
around an insidious bug in Internet Explorer where sending the correct
media type prevents the page from being displayed.
Signed-off-by: Alp Toker <alp@atoker.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Tue, 11 Jul 2006 21:06:39 +0000 (14:06 -0700)]
git-fetch: fix a bashism (==)
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Tue, 11 Jul 2006 17:10:29 +0000 (10:10 -0700)]
Make the unpacked object header functions static to sha1_file.c
Nobody else uses them, and I'm going to start changing them.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alp Toker [Tue, 11 Jul 2006 10:19:37 +0000 (11:19 +0100)]
git-send-email: Remove redundant Reply-To header
There is no sense in duplicating the sender address in Reply-To as it's
already provided in the From header.
Signed-off-by: Alp Toker <alp@atoker.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alp Toker [Tue, 11 Jul 2006 10:19:33 +0000 (11:19 +0100)]
typofix (git-name-rev documentation)
Signed-off-by: Alp Toker <alp@atoker.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Yakov Lerner [Tue, 11 Jul 2006 21:02:00 +0000 (21:02 +0000)]
Mention the [user@] part in documentation of ssh:// urls.
Signed-off-by: Yakov Lerner <iler.ml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Tue, 11 Jul 2006 19:01:54 +0000 (12:01 -0700)]
tests: Set EDITOR=: and VISUAL=: globally
This way we don't have to remember to set it for each test; and
if we forget, we won't cause interactive editors to be spawned
for non-interactive tests.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn Pearce [Tue, 11 Jul 2006 03:38:35 +0000 (23:38 -0400)]
Log ref changes made by git-fetch and git-pull.
When git-fetch updates a reference record in the associated reflog
what type of update took place and who caused it (git-fetch or
git-pull, by invoking git-fetch).
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn Pearce [Tue, 11 Jul 2006 02:48:47 +0000 (22:48 -0400)]
Record the type of commit operation in the reflog.
If committing a merge (.git/MERGE_HEAD exists), an initial tree
(no HEAD) or using --amend to amend the prior commit then denote
the subtype of commit in the reflog. This helps to distinguish
amended or merge commits from normal commits.
In the case of --amend the prior sha1 is probably the commit which
is being thrown away in favor of the new commit. Since it is likely
that the old commit doesn't have any ref pointing to it anymore
it can be interesting to know why that the commit was replaced
and orphaned.
In the case of a merge the prior sha1 is probably the first parent
of the new merge commit. Consequently having its prior sha1 in the
reflog is slightly less interesting but its still informative to
know the commit was the result of a merge which had to be completed
by hand.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn Pearce [Tue, 11 Jul 2006 00:27:54 +0000 (20:27 -0400)]
Allow user.name and user.email to drive reflog entry.
Apparently calling setup_ident() after git_config causes the
user.name and user.email values read from the config file to be
replaced with the data obtained from the host. This means that
users who have setup their email address in user.email will instead
be writing reflog entries with their hostname.
Moving setup_ident() to before git_config in update-ref resolves
this ordering problem.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Mon, 10 Jul 2006 11:40:44 +0000 (13:40 +0200)]
Fix linking for not-so-clever linkers.
On one of my systems, the linker is not intelligent enough to link with
pager.o (in libgit.a) when only the variable pager_in_use is needed. The
consequence is that the linker complains about an undefined variable. So,
put the variable into environment.o, where it is linked always.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Matthias Lederhofer [Mon, 10 Jul 2006 17:57:21 +0000 (19:57 +0200)]
git-rev-list: add documentation for --parents, --no-merges
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 10 Jul 2006 07:53:39 +0000 (00:53 -0700)]
Merge branch 'jc/show-merge'
* jc/show-merge:
git log -p --merge [[--] paths...]
Pavel Roskin [Mon, 10 Jul 2006 06:57:51 +0000 (02:57 -0400)]
Avoid C99 comments, use old-style C comments instead.
This doesn't make the code uglier or harder to read, yet it makes the
code more portable. This also simplifies checking for other potential
incompatibilities. "gcc -std=c89 -pedantic" can flag many incompatible
constructs as warnings, but C99 comments will cause it to emit an error.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Pavel Roskin [Mon, 10 Jul 2006 05:50:18 +0000 (01:50 -0400)]
Fix more typos, primarily in the code
The only visible change is that git-blame doesn't understand
"--compability" anymore, but it does accept "--compatibility" instead,
which is already documented.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Luben Tuikov [Mon, 10 Jul 2006 03:18:57 +0000 (20:18 -0700)]
gitweb.cgi: Teach "a=blob" action to know the blob/file mime type
Now action "blob" knows the file type: if the file type is
not "text/*" then action "blob" defaults to "blob_plain",
i.e. the file is downloaded raw for the browser to interpret.
If the file type is "text/*", then "blob" defaults to the
current "cat -n"-like output, from which you can click
"plain", to get the "blob_plain" output.
Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Luben Tuikov [Mon, 10 Jul 2006 03:07:27 +0000 (20:07 -0700)]
gitweb.cgi: Create $git_temp if it doesn't exist
Unless we'd done diffs, $git_temp doesn't exist and then
mime lookups fail. Explicitly create it, if it doesn't
exist already.
Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 10 Jul 2006 07:20:42 +0000 (00:20 -0700)]
Merge branch 'lt/gitweb'
* lt/gitweb:
Add "raw" output option to blobs in "tree" view format
Eric Wong [Mon, 10 Jul 2006 03:20:48 +0000 (20:20 -0700)]
git-svn: fix --file/-F option in commit-diff
Also, allow messages from tags to be used as
commit messages.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn Pearce [Sat, 8 Jul 2006 18:34:02 +0000 (14:34 -0400)]
Avoid C99 initializers
In a handful places, we use C99 structure and array
initializers, which some compilers do not support.
This can be handy when you are trying to compile GIT on a
Solaris system that has an older C compiler, for example.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 10 Jul 2006 07:03:55 +0000 (00:03 -0700)]
Merge branch 'jc/rename'
* jc/rename:
diffcore-rename: try matching up renames without populating filespec first.
Junio C Hamano [Mon, 10 Jul 2006 06:49:03 +0000 (23:49 -0700)]
Merge branch 'jc/grep'
* jc/grep:
git-grep: boolean expression on pattern matching.
Junio C Hamano [Mon, 10 Jul 2006 06:49:00 +0000 (23:49 -0700)]
Merge branch 'jc/mailinfo'
* jc/mailinfo:
mailinfo: assume input is latin-1 on the header as we do for the body
Junio C Hamano [Mon, 10 Jul 2006 06:47:39 +0000 (23:47 -0700)]
Merge branch 'ew/diff'
* ew/diff:
templates/hooks--update: replace diffstat calls with git diff --stat
diff: do not use configuration magic at the core-level
Update diff-options and config documentation.
diff.c: --no-color to defeat diff.color configuration.
diff.c: respect diff.renames config option
Junio C Hamano [Mon, 10 Jul 2006 06:37:19 +0000 (23:37 -0700)]
Merge branch 'ew/svn'
* ew/svn:
Fix some doubled word typos
Typofix in Makefile comment.
Makefile: export NO_SVN_TESTS
git-svn: migrate out of contrib (follow-up)
git-svn: migrate out of contrib
Alp Toker [Sun, 9 Jul 2006 09:36:24 +0000 (10:36 +0100)]
Fix typos involving the word 'commit'
Signed-off-by: Alp Toker <alp@atoker.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alp Toker [Sun, 9 Jul 2006 09:36:23 +0000 (10:36 +0100)]
Fix some doubled word typos
Signed-off-by: Alp Toker <alp@atoker.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alp Toker [Sun, 9 Jul 2006 09:36:23 +0000 (10:36 +0100)]
Fix some doubled word typos
Signed-off-by: Alp Toker <alp@atoker.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 6 Jun 2006 23:58:40 +0000 (16:58 -0700)]
"git -p cmd" to page anywhere
This allows you to say:
git -p diff v2.6.16-rc5..
and the command pipes the output of any git command to your pager.
[jc: this resurrects a month old RFC patch with improvement
suggested by Linus to call it --paginate instead of --less.]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Matthias Lederhofer [Sun, 9 Jul 2006 09:59:39 +0000 (11:59 +0200)]
change ent to tree in git-diff documentation
Signed-off-by: Junio C Hamano <junkio@cox.net>
Pavel Roskin [Sun, 9 Jul 2006 09:44:58 +0000 (02:44 -0700)]
Typofix in Makefile comment.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Pavel Roskin [Sun, 9 Jul 2006 07:44:30 +0000 (03:44 -0400)]
Assorted typo fixes
Signed-off-by: Junio C Hamano <junkio@cox.net>
Luben Tuikov [Fri, 7 Jul 2006 06:39:30 +0000 (23:39 -0700)]
Add "raw" output option to blobs in "tree" view format
Add a "raw" output option to blobs in "tree" view format, so that the
user doesn't have to click on "blob", wait for the (binary) file to be
uploaded and shown in "blob" mode, and then click on "plain" to
download the (binary) file.
This is useful when the file is clearly binary and we don't want the
browser to upload and display it in "blob" mode, but we just want to
download it. Case in point: pdf files, wlg.
Note: the "raw" format is equivalent to the blob->plain view, not
blob->head view. I.e. the view has the hash of the file as listed
by git-ls-tree, not just "HEAD".
Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 9 Jul 2006 07:52:36 +0000 (00:52 -0700)]
Merge branch 'sf/diff'
Ryan Anderson [Sun, 9 Jul 2006 06:28:21 +0000 (02:28 -0400)]
Disable color detection during format-patch
Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Peter Baumann [Fri, 7 Jul 2006 10:55:41 +0000 (12:55 +0200)]
git-cvsexportcommit can't handle merge commits correctly
git-cvsexportcommit should check if the parent (supplied on the cmdline) to use
for a merge commit is one of the real parents of the merge.
But it errors out if the _first_ parent doesn't match and never checks
the other parents.
Signed-off-by: Peter Baumann <siprbaum@stud.informatik.uni-erlangen.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Michal Rokos [Sat, 8 Jul 2006 15:32:04 +0000 (17:32 +0200)]
Using 'perl' in *.sh
Some GIT's shell script are using bare 'perl' for perl invocation.
Use @@PERL@@ symbol and replace it with PERL_PATH_SQ everywhere.
Signed-off-by: Michal Rokos <michal.rokos@nextsoft.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Michal Rokos [Sat, 8 Jul 2006 15:27:10 +0000 (17:27 +0200)]
sed -e '/RE/r rfile/' needs space in 'r rfile'
Some implementations of sed (like HP-UX one) mandate a space between 'r'
and 'rfile'.
Signed-off-by: Michal Rokos <michal.rokos@nextsoft.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Sat, 8 Jul 2006 08:56:28 +0000 (10:56 +0200)]
Close the index file between writing and committing
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Sat, 8 Jul 2006 08:50:02 +0000 (01:50 -0700)]
templates/hooks--update: replace diffstat calls with git diff --stat
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 8 Jul 2006 08:05:16 +0000 (01:05 -0700)]
diff: do not use configuration magic at the core-level
The Porcelainish has become so much usable as the UI that there
is not much reason people should be using the core programs by
hand anymore. At this point we are better off making the
behaviour of the core programs predictable by keeping them
unaffected by the configuration variables. Otherwise they will
become very hard to use as reliable building blocks.
For example, "git-commit -a" internally uses git-diff-files to
figure out the set of paths that need to be updated in the
index, and we should never allow diff.renames that happens to be
in the configuration to interfere (or slow down the process).
The UI level configuration such as showing renamed diff and
coloring are still honored by the Porcelainish ("git log" family
and "git diff"), but not by the core anymore.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 8 Jul 2006 00:48:02 +0000 (17:48 -0700)]
colored diff: diff.color = auto fix
Even if the standard output is connected to a tty, do not
colorize the diff if we are talking to a dumb terminal when
diff.color configuration variable is set to "auto".
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 3 Jul 2006 09:59:32 +0000 (02:59 -0700)]
git log -p --merge [[--] paths...]
This adds Linus's wish, "--merge" flag, which makes the above
expand to a rough equivalent to:
git log -p HEAD MERGE_HEAD ^$(git-merge-base HEAD MERGE_HEAD) \
-- $(git-ls-files -u [paths...] | cut -f2 | uniq)
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Fri, 7 Jul 2006 11:26:31 +0000 (13:26 +0200)]
Makefile: export NO_SVN_TESTS
Without this patch, it really is not sufficient to define NO_SVN_TESTS
in config.mak or the Makefile.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 7 Jul 2006 12:28:05 +0000 (05:28 -0700)]
Update diff-options and config documentation.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 7 Jul 2006 12:27:24 +0000 (05:27 -0700)]
diff.c: --no-color to defeat diff.color configuration.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Fri, 7 Jul 2006 11:01:23 +0000 (04:01 -0700)]
diff.c: respect diff.renames config option
diff.renames is mentioned several times in the documentation,
but to my surprise it didn't do anything before this patch.
Also add the --no-renames option to override this from the
command-line.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Stephan Feder [Fri, 7 Jul 2006 13:57:09 +0000 (15:57 +0200)]
diff-options: Explain --text and -a
Signed-off-by: Stephan Feder <sf@b-i-t.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Stephan Feder [Fri, 7 Jul 2006 13:57:08 +0000 (15:57 +0200)]
Add -a and --text to common diff options help
Signed-off-by: Stephan Feder <sf@b-i-t.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Stephan Feder [Fri, 7 Jul 2006 13:57:07 +0000 (15:57 +0200)]
Teach diff -a as shorthand for --text
Signed-off-by: Stephan Feder <sf@b-i-t.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Stephan Feder [Fri, 7 Jul 2006 10:33:57 +0000 (12:33 +0200)]
Teach --text option to diff
Add new item text to struct diff_options.
If set then do not try to detect binary files.
Signed-off-by: Stephan Feder <sf@b-i-t.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jakub Narebski [Fri, 7 Jul 2006 18:57:55 +0000 (20:57 +0200)]
send-email: format 2822 datestring ourselves.
It is not worth trying to force C locale (and failing) just to
format the 2822 datestring.
This code was borrowed from /usr/bin/822-date (Ian Jackson and
Klee Dienes, both in public domain), per suggestion by Eric Wong.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Acked-by: Jakub Narebski <jnareb@gmail.com>
Stephan Feder [Fri, 7 Jul 2006 10:33:44 +0000 (12:33 +0200)]
Do not drop data from '\0' until eol in patch output
The binary file detection is just a heuristic which can well fail.
Do not produce garbage patches in these cases.
Signed-off-by: Stephan Feder <sf@b-i-t.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Fri, 7 Jul 2006 10:10:45 +0000 (03:10 -0700)]
builtin-log: respect diff configuration options
The log commands are all capable of generating diffs, so we
should respect those configuration options for diffs here.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 7 Jul 2006 10:17:16 +0000 (03:17 -0700)]
git-svn: migrate out of contrib (follow-up)
Check for SVN::Core so test 910[45] don't fail if the user
doesn't have those installed.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 7 Jul 2006 05:37:51 +0000 (22:37 -0700)]
rev-parse documentation: talk about range notation.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 7 Jul 2006 02:21:47 +0000 (19:21 -0700)]
show-branch: match documentation and usage
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 7 Jul 2006 02:26:13 +0000 (19:26 -0700)]
Merge branch 'js/merge-base'
Junio C Hamano [Thu, 6 Jul 2006 07:16:35 +0000 (00:16 -0700)]
builtin-rev-parse.c: constness tightening
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 6 Jul 2006 07:35:47 +0000 (00:35 -0700)]
diffcore-rename: try matching up renames without populating filespec first.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Thu, 6 Jul 2006 07:14:16 +0000 (00:14 -0700)]
git-svn: migrate out of contrib
Allow NO_SVN_TESTS to be defined to skip git-svn tests. These
tests are time-consuming due to SVN being slow, and even more so
if SVN Perl libraries are not available.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 7 Jul 2006 00:01:00 +0000 (17:01 -0700)]
Merge branch 'ew/instaweb'
* ew/instaweb:
instaweb: fix unportable ';' usage in sed
Makefile: replace ugly and unportable sed invocation
Add git-instaweb, instantly browse the working repo with gitweb
gitweb: Declare global variables with "our"
gitweb: Enable tree (directory) history display
gitweb: optimize per-file history generation
Joachim Berdal Haga [Thu, 6 Jul 2006 20:35:54 +0000 (22:35 +0200)]
core.compression documentation formatting fix.
I didn't notice earlier that two colons are required for the
asciidoc entry.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 5 Jul 2006 21:17:49 +0000 (14:17 -0700)]
mailinfo: assume input is latin-1 on the header as we do for the body
When the input mbox does not identify what encoding it is in,
and already have RFC2047 stripped away, we cannot tell what
encoding the header text is in. For body text, when the message
does not say what charset it is in, we fall back to assume
latin-1 input when converting to utf8. This should be done
consistently to the header as well.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 6 Jul 2006 02:44:03 +0000 (19:44 -0700)]
git-reset: complain and exit upon seeing an unknown parameter.
The check to use "rev-parse --verify" was defeated by the use of
"--default HEAD". "git reset --hard bogus-committish" just
defaulted to reset to the HEAD without complaining.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 30 Jun 2006 10:04:05 +0000 (03:04 -0700)]
git-grep: boolean expression on pattern matching.
This extends the behaviour of git-grep when multiple -e options
are given. So far, we allowed multiple -e to behave just like
regular grep with multiple -e, i.e. the patterns are OR'ed
together.
With this change, you can also have multiple patterns AND'ed
together, or form boolean expressions, like this (the
parentheses are quoted from the shell in this example):
$ git grep -e _PATTERN --and \( -e atom -e token \)
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 5 Jul 2006 23:40:15 +0000 (16:40 -0700)]
Merge branch 'lt/gitweb'
* lt/gitweb:
gitweb: Declare global variables with "our"
gitweb: Enable tree (directory) history display
gitweb: optimize per-file history generation
Junio C Hamano [Wed, 5 Jul 2006 23:36:46 +0000 (16:36 -0700)]
Merge branch 'jc/fmt-merge-msg-test'
* jc/fmt-merge-msg-test:
t6200: fmt-merge-msg test.
Junio C Hamano [Wed, 5 Jul 2006 23:36:25 +0000 (16:36 -0700)]
Merge branch 'jc/sha1'
* jc/sha1:
A better-scheduled PPC SHA-1 implementation.
test-sha1: test hashing large buffer
Makefile: add framework to verify and bench sha1 implementations.
Junio C Hamano [Wed, 5 Jul 2006 23:33:50 +0000 (16:33 -0700)]
Merge branch 'jc/diff-test'
* jc/diff-test:
t4013: add "diff" UI program tests.
Junio C Hamano [Wed, 5 Jul 2006 23:31:24 +0000 (16:31 -0700)]
Merge branch 'th/diff'
* th/diff:
builtin-diff: turn recursive on when defaulting to --patch format.
t4013: note improvements brought by the new output code.
t4013: add format-patch tests.
format-patch: fix diff format option implementation
combine-diff.c: type sanity.
t4013 test updates for new output code.
Fix some more diff options changes.
Fix diff-tree -s
log --raw: Don't descend into subdirectories by default
diff-tree: Use ---\n as a message separator
Print empty line between raw, stat, summary and patch
t4013: add more tests around -c and --cc
whatchanged: Default to DIFF_FORMAT_RAW
Don't xcalloc() struct diffstat_t
Add msg_sep to diff_options
DIFF_FORMAT_RAW is not default anymore
Set default diff output format after parsing command line
Make --raw option available for all diff commands
Merge with_raw, with_stat and summary variables to output_format
t4013: add tests for diff/log family output options.
Junio C Hamano [Wed, 5 Jul 2006 23:25:32 +0000 (16:25 -0700)]
Merge branch 'jc/grepfix'
* jc/grepfix:
git-grep: use a bit more specific error messages.
git-grep: fix exit code when we use external grep.
git-grep: fix parsing of pathspec separator '--'
Junio C Hamano [Wed, 5 Jul 2006 23:23:46 +0000 (16:23 -0700)]
Merge branch 'js/fmt-merge-msg'
* js/fmt-merge-msg:
Make git-fmt-merge-msg a builtin
Ville Skytt\e,Ad\e(B [Tue, 4 Jul 2006 22:35:52 +0000 (01:35 +0300)]
Fix print-log and diff compatibility with recent vc versions
Here's a patch that fixes print-log and diff compatibility with recent
vc versions, such as current GNU Emacs CVS.
Signed-off-by: Ville Skytt\e,Ad\e(B <scop@xemacs.org>
Eric Wong [Wed, 5 Jul 2006 12:14:00 +0000 (05:14 -0700)]
git-svn: avoid fetching files outside of the URL we're tracking
Thanks to Santi <sbejar@gmail.com> for the bug report and explanation:
> /path/to/repository/project/file
> /path/to/repository/project-2/file
<...>
> you end up with a project with the following files:
>
> file
> -2/file
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Junio C Hamano [Wed, 5 Jul 2006 00:45:22 +0000 (17:45 -0700)]
Re-fix clear_commit_marks().
Fix clear_commit_marks() enough to be usable in
get_merge_bases(), and retire now unused clear_object_marks().
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Tue, 4 Jul 2006 19:29:10 +0000 (12:29 -0700)]
Improve git-peek-remote
This makes git-peek-remote able to basically do everything that
git-ls-remote does (but obviously just for the native protocol, so no
http[s]: or rsync: support).
The default behaviour is the same, but you can now give a mixture of
"--refs", "--tags" and "--heads" flags, where "--refs" forces
git-peek-remote to only show real refs (ie none of the fakey tag lookups,
but also not the special pseudo-refs like HEAD and MERGE_HEAD).
The "--tags" and "--heads" flags respectively limit the output to just
regular tags and heads, of course.
You can still also ask to limit them by name too.
You can combine the flags, so
git peek-remote --refs --tags .
will show all local _true_ tags, without the generated tag lookups
(compare the output without the "--refs" flag).
And "--tags --heads" will show both tags and heads, but will avoid (for
example) any special refs outside of the standard locations.
I'm also planning on adding a "--ignore-local" flag that allows us to ask
it to ignore any refs that we already have in the local tree, but that's
an independent thing.
All this is obviously gearing up to making "git fetch" cheaper.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Rene Scharfe [Tue, 4 Jul 2006 19:22:20 +0000 (21:22 +0200)]
rev-list: free commit_list in ... handler
Johannes noticed the missing call to free_commit_list() in the
patch from Santi to add ... support to rev-parse. Turns out I
forgot it too in rev-list. This patch is against the next branch
(
3b1d06a).
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 4 Jul 2006 09:44:48 +0000 (02:44 -0700)]
git-grep: use a bit more specific error messages.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 4 Jul 2006 09:43:40 +0000 (02:43 -0700)]
git-grep: fix exit code when we use external grep.
Upon hit, we should exit with status 0.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 4 Jul 2006 09:31:50 +0000 (02:31 -0700)]
git-grep: fix parsing of pathspec separator '--'
We used to misparse
git grep -e foo -- '*.sh'
Signed-off-by: Junio C Hamano <junkio@cox.net>
Santi Béjar [Tue, 4 Jul 2006 09:02:22 +0000 (11:02 +0200)]
Teach rev-parse the ... syntax.
[jc: moved the difference code around into its own function.]
Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Tue, 4 Jul 2006 08:04:24 +0000 (01:04 -0700)]
t8001-annotate: fix a bash-ism in this test
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Mon, 3 Jul 2006 15:18:43 +0000 (17:18 +0200)]
Make git-fmt-merge-msg a builtin
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 4 Jul 2006 01:09:54 +0000 (18:09 -0700)]
t6200: fmt-merge-msg test.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 2 Jul 2006 23:03:59 +0000 (16:03 -0700)]
send-email: do not barf when Term::ReadLine does not like your terminal
As long as we do not need to readline from the terminal, we
should not barf when starting up the program. Without this
patch, t9001 test on Cygwin occasionally died with the following
error message:
Unable to get Terminal Size. The TIOCGWINSZ ioctl didn't work. The COLUMNS and LINES environment variables didn't work. The resize program didn't work. at /usr/lib/perl5/vendor_perl/5.8/cygwin/Term/ReadKey.pm line 362.
Compilation failed in require at /usr/lib/perl5/vendor_perl/5.8/Term/ReadLine/Perl.pm line 58.
Acked-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 4 Jul 2006 01:48:23 +0000 (18:48 -0700)]
boolean: accept yes and no as well
Signed-off-by: Junio C Hamano <junkio@cox.net>
Ryan Anderson [Tue, 4 Jul 2006 01:30:02 +0000 (21:30 -0400)]
annotate: Correct most merge following to annotate correctly.
There is still a bug involving octopus merges, somewhere, but this gets normal
merges correct, so it's still an improvement over the existing version.
Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Ryan Anderson [Tue, 4 Jul 2006 01:30:01 +0000 (21:30 -0400)]
annotate: Support annotation of files on other revisions.
This is a bug fix, and cleans up one or two other things spotted during the
course of tracking down the main bug here.
Also, the test-suite is updated to reflect this case.
Signed-off-by: Ryan Anderson <ryan@michonline.com>
(cherry picked from
2f7554b4db3ab2c2d3866b160245c91c9236fc9a commit)
Signed-off-by: Junio C Hamano <junkio@cox.net>
Joachim B Haga [Mon, 3 Jul 2006 20:11:47 +0000 (22:11 +0200)]
Make zlib compression level configurable, and change default.
With the change in default, "git add ." on kernel dir is about
twice as fast as before, with only minimal (0.5%) change in
object size. The speed difference is even more noticeable
when committing large files, which is now up to 8 times faster.
The configurability is through setting core.compression = [-1..9]
which maps to the zlib constants; -1 is the default, 0 is no
compression, and 1..9 are various speed/size tradeoffs, 9
being slowest.
Signed-off-by: Joachim B Haga (cjhaga@fys.uio.no)
Acked-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 3 Jul 2006 10:14:32 +0000 (03:14 -0700)]
Merge branch 'master' into js/merge-base
This is to pull in the object-hash clean-up from the master branch.
Junio C Hamano [Mon, 3 Jul 2006 10:05:20 +0000 (03:05 -0700)]
revert clear-commit-marks for now.
Earlier change broke "git describe A B" among other things.
Revert it for now, and clean the commits smudged by
get_merge_bases using clear_object_marks() function. For
complex commit ancestry graph, this is way cheaper as well.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 3 Jul 2006 10:02:27 +0000 (03:02 -0700)]
get_merge_bases: clean up even when there is no common commit.
Actually in this case we would have traversed a lot of commits, so cleaning
things up is even more important.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 3 Jul 2006 07:53:13 +0000 (00:53 -0700)]
Makefile: tighten git-http-{fetch,push} dependencies
Although our "git-%$X:" implicit target had dependency on
$(GITLIBS) which included xdiff/lib.a, git-http-{fetch,push} had
their own building rules and with an obsolete dependency on
$(LIB_FILES). Update the rules to depend on $(GITLIBS), to make
parallel build work correctly.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Robin Rosenberg [Sun, 2 Jul 2006 22:21:00 +0000 (00:21 +0200)]
Empty author may be presented by svn as an empty string or a null value.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 2 Jul 2006 18:34:17 +0000 (11:34 -0700)]
commit.c: do not redefine UNINTERESTING bit.
Signed-off-by: Junio C Hamano <junkio@cox.net>