gitweb.git
git.el: Try to reuse an existing buffer when running... Alexandre Julliard Sat, 22 Jul 2006 13:39:53 +0000 (15:39 +0200)

git.el: Try to reuse an existing buffer when running git-status.

By default, running git-status again will now reuse an existing buffer
that displays the same directory. The old behavior of always creating
a new buffer can be obtained by customizing the git-reuse-status-buffer
option.

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

git.el: Prepend a slash to the file name when adding... Alexandre Julliard Sat, 22 Jul 2006 13:39:32 +0000 (15:39 +0200)

git.el: Prepend a slash to the file name when adding to .gitignore.

This way the ignore command will really only ignore the marked files
and not files with the same name in subdirectories.

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

git.el: Run git-rerere on commits if the rr-cache direc... Alexandre Julliard Sat, 22 Jul 2006 13:39:02 +0000 (15:39 +0200)

git.el: Run git-rerere on commits if the rr-cache directory exists.

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

git-svn: fix fetching new directories copies when using... Eric Wong Thu, 20 Jul 2006 08:43:01 +0000 (01:43 -0700)

git-svn: fix fetching new directories copies when using SVN:: libs

Log output from SVN doesn't list all the new files that were
added if a new directory was copied from an existing place in
the repository. This means we'll have to do some extra work and
traverse new directories ourselves.

This has been updated from the original patch to defer traversed
adds until all removals have been done. Please disregard the
original.

Thanks to Ben Williamson for the excellent bug report and
testing.

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

tar-tree: add the "tar.umask" config optionWilly Tarreau Thu, 20 Jul 2006 09:30:44 +0000 (11:30 +0200)

tar-tree: add the "tar.umask" config option

By default, git-tar-tree(1) sets file and directories modes to 0666
or 0777. While this is both useful and acceptable for projects such
as the Linux Kernel, it might be excessive for other projects. With
this variable, it becomes possible to tell git-tar-tree(1) to apply
a specific umask to the modes above. The special value "user"
indicates that the user's current umask will be used. This should be
enough for most projects, as it will lead to the same permissions as
git-checkout(1) would use. The default value remains 0, which means
world read-write.

Signed-off-by: Willy Tarreau <w@1wt.eu>
Acked-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>

cvsexportcommit - add -a (add author line) flag, cleanu... Martin Langhoff Tue, 18 Jul 2006 02:22:49 +0000 (14:22 +1200)

cvsexportcommit - add -a (add author line) flag, cleanup warnings

This patch adds support for -a which will add an "Author: " line, and possibly
a "Committer: " line to the bottom of the commit message for CVS.

The commit message parser is now a little bit better, and some warnings
have been cleaned up.

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

unpack-objects: remove stale and confusing commentJunio C Hamano Mon, 17 Jul 2006 20:08:14 +0000 (13:08 -0700)

unpack-objects: remove stale and confusing comment

The very initial version of unpack-objects.c::unpack_all() used
to unpack from the end of the pack, but since end of June last
year it was changed to stream from the front and the comment
does not reflect the reality anymore.

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

git-fetch: fix --keep vs --thinJunio C Hamano Mon, 17 Jul 2006 20:01:27 +0000 (13:01 -0700)

git-fetch: fix --keep vs --thin

When --keep is specified there is no reason to pass --thin to git-fetch-pack,
which are mutually exclusive. This does not hurt because fetch-pack disables
thin transfer when both are given internally, but still is confusing.

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

Merge branch 'sp/reflog' v1.4.2-rc1Junio C Hamano Mon, 17 Jul 2006 08:08:11 +0000 (01:08 -0700)

Merge branch 'sp/reflog'

* sp/reflog:
Record rebase changes as 'rebase' in the reflog.
Log ref changes made by resolve.
Log ref changes made by quiltimport.
Log ref changes made by git-merge and git-pull.

git-svn: don't check for migrations/upgrades on commit... Eric Wong Sat, 15 Jul 2006 14:10:56 +0000 (07:10 -0700)

git-svn: don't check for migrations/upgrades on commit-diff

Unlike other git-svn commands, commit-diff is intended to
operate without needing any additional metadata inside .git

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

show-branch: fix performance problem.Junio C Hamano Sun, 16 Jul 2006 07:00:09 +0000 (00:00 -0700)

show-branch: fix performance problem.

The core function used in show-branch, join_revs(), was supposed
to be exactly the same algorithm as merge_bases(), except that
it was a version enhanced for use with more than two heads.
However, it needed to mark and keep a list of all the commits it
has seen, because it needed them for its semi-graphical output.
The function to implement this list, mark_seen(), stupidly used
insert_by_date(), when it did not need to keep the list sorted
during its processing. This made "show-branch --merge-base"
more than 20x slower compared to "merge-base --all" in some
cases (e.g. between b5032a5 and 48ce8b0 in the Linux 2.6 kernel
archive). The performance of "show-branch --independent"
suffered from the same reason.

This patch sorts the resulting list after the list traversal
just once to fix these problems.

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

Documentation/urls.txt: Use substitution to escape... Jonas Fonseca Fri, 14 Jul 2006 23:36:00 +0000 (16:36 -0700)

Documentation/urls.txt: Use substitution to escape square brackets

This changes "[user@]" to use {startsb} and {endsb} to insert [ and ],
similar to how {caret} is used in git-rev-parse.txt.

[jc: Removed a well-intentioned comment that broke the final
formatting from the original patch. While we are at it,
updated the paragraph that claims to be equivalent to the
section that was updated earlier without making matching
changes.]

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

Documentation/Makefile: product depends on asciidoc... Junio C Hamano Fri, 14 Jul 2006 23:32:38 +0000 (16:32 -0700)

Documentation/Makefile: product depends on asciidoc.conf

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

Merge branch 'lt/unitype'Junio C Hamano Fri, 14 Jul 2006 22:39:19 +0000 (15:39 -0700)

Merge branch 'lt/unitype'

* lt/unitype:
builtin-prune.c: forgot TYPE => OBJ changes.
Remove TYPE_* constant macros and use object_type enums consistently.

Merge branch 'sp/lazy-mkdir'Junio C Hamano Fri, 14 Jul 2006 22:38:37 +0000 (15:38 -0700)

Merge branch 'sp/lazy-mkdir'

* sp/lazy-mkdir:
Make lazy mkdir more robust.

Fix "git-fetch --tags" exit status when nothing has... Sergey Vlasov Fri, 14 Jul 2006 15:06:57 +0000 (19:06 +0400)

Fix "git-fetch --tags" exit status when nothing has been changed

After commit 55b7835e1b81a6debc7648149d2b8a4c5c64ddba git-fetch --tags
exits with status 1 when no tags have been changed, which breaks calling
git-fetch from scripts.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>

argv created by handle_alias should be NULL terminatedMatthias Lederhofer Fri, 14 Jul 2006 16:37:06 +0000 (18:37 +0200)

argv created by handle_alias should be NULL terminated

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

documentation (urls.txt) typofixAlp Toker Fri, 14 Jul 2006 18:31:50 +0000 (11:31 -0700)

documentation (urls.txt) typofix

builtin-prune.c: forgot TYPE => OBJ changes.Junio C Hamano Fri, 14 Jul 2006 06:37:52 +0000 (23:37 -0700)

builtin-prune.c: forgot TYPE => OBJ changes.

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

Record rebase changes as 'rebase' in the reflog.Shawn Pearce Fri, 14 Jul 2006 04:47:23 +0000 (00:47 -0400)

Record rebase changes as 'rebase' in the reflog.

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

gitweb.css: Use monospace fonts for commits and tree... Luben Tuikov Thu, 13 Jul 2006 19:36:22 +0000 (12:36 -0700)

gitweb.css: Use monospace fonts for commits and tree-diff.

Use monospace fonts for the commit header, commit message,
and tree-diff. This helps viewing commit logs with ASCII art.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Do not use perl in git-commit.shAlex Riesen Thu, 13 Jul 2006 08:30:43 +0000 (10:30 +0200)

Do not use perl in git-commit.sh

git-commit.sh has the only one place where perl is used
and there it can quite trivially be done in sh.

git-ls-files without "-z" produces quoted output, even if
is different from that produced by perl code it is good
enough.

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

diff: Support 256 colorsTimo Hirvonen Thu, 13 Jul 2006 16:08:06 +0000 (19:08 +0300)

diff: Support 256 colors

Add support for more than 8 colors. Colors can be specified as numbers
-1..255. -1 is same as "normal".

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff: Support both attributes and colorsTimo Hirvonen Thu, 13 Jul 2006 16:06:12 +0000 (19:06 +0300)

diff: Support both attributes and colors

Make it possible to set both colors and a attribute for diff colors.
Background colors are supported too.

Syntax is now:

[attr] [fg [bg]]
[fg [bg]] [attr]

Empty value is same as "normal normal", ie use default colors. The new
syntax is backwards compatible.

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Documentation about exclude/ignore filesMatthias Lederhofer Wed, 12 Jul 2006 19:54:51 +0000 (21:54 +0200)

Documentation about exclude/ignore files

Use .git/info/exclude in the example in git-ls-files.txt,
instead of .git/ignore, and update the list of commands looking
at .git/info/exclude in repository-layout.txt.

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

daemon: new option --detach to run git-daemon in backgroundMatthias Lederhofer Thu, 13 Jul 2006 16:47:13 +0000 (18:47 +0200)

daemon: new option --detach to run git-daemon in background

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

daemon: new option --pid-file=<path> to store the pidMatthias Lederhofer Thu, 13 Jul 2006 10:18:08 +0000 (12:18 +0200)

daemon: new option --pid-file=<path> to store the pid

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

upload-pack: ignore write errors to stderrMatthias Lederhofer Thu, 13 Jul 2006 11:07:59 +0000 (13:07 +0200)

upload-pack: ignore write errors to stderr

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

daemon: if one of the standard fds is missing open... Matthias Lederhofer Thu, 13 Jul 2006 16:32:11 +0000 (18:32 +0200)

daemon: if one of the standard fds is missing open it to /dev/null

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

daemon: use a custom die routine with syslogMatthias Lederhofer Thu, 13 Jul 2006 10:02:29 +0000 (12:02 +0200)

daemon: use a custom die routine with syslog

Removed the git-daemon prefix from die() because no other call to die
does this.

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Documentation: Fix ssh://[user@]host.xz URLJunio C Hamano Fri, 14 Jul 2006 04:48:45 +0000 (21:48 -0700)

Documentation: Fix ssh://[user@]host.xz URL

Earlier commit c3f17061 broke asciidoc markup.

Noticed by Alp Toker with a fix, but fixed up in a way with smaller
formatting impact.

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

Adjust t4013 tests to corrected format-patch.Junio C Hamano Fri, 14 Jul 2006 04:39:13 +0000 (21:39 -0700)

Adjust t4013 tests to corrected format-patch.

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

format-patch: Generate a newline between the subject... Robert Shearman Thu, 13 Jul 2006 22:17:22 +0000 (23:17 +0100)

format-patch: Generate a newline between the subject header and the message body

format-patch previously didn't generate a newline after a subject. This
caused the diffstat to not be displayed in messages with only one line
for the commit message.
This patch fixes this by adding a newline after the headers if a body
hasn't been added.
Signed-off-by: Robert Shearman <rob@codeweavers.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

t4013 diff format tests updateJunio C Hamano Fri, 14 Jul 2006 02:51:12 +0000 (19:51 -0700)

t4013 diff format tests update

This changes one test commit in the sequence to have more than
one lines of commit log. A few output formats (--pretty=email
aka format-patch and --pretty=oneline) need to behave
differently on single and multi-line log, and this change will
help catching breakages.

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

Display help for Git mode after pressing `h' or `?... Jakub Narebski Thu, 13 Jul 2006 20:22:14 +0000 (22:22 +0200)

Display help for Git mode after pressing `h' or `?' in *git-status*

Add bindings for "h" and "?" in git-status-mode to display help about the mode,
including keymap via (describe-function 'git-status-mode), like in PCL-CVS.

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

Wrap long lines in docstrings in contrib/emacs/git.elJakub Narebski Thu, 13 Jul 2006 20:22:13 +0000 (22:22 +0200)

Wrap long lines in docstrings in contrib/emacs/git.el

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

Remove TYPE_* constant macros and use object_type enums... Linus Torvalds Wed, 12 Jul 2006 03:45:31 +0000 (20:45 -0700)

Remove TYPE_* constant macros and use object_type enums consistently.

This updates the type-enumeration constants introduced to reduce
the memory footprint of "struct object" to match the type bits
already used in the packfile format, by removing the former
(i.e. TYPE_* constant macros) and using the latter (i.e. enum
object_type) throughout the code for consistency.

Eventually we can stop passing around the "type strings"
entirely, and this will help - no confusion about two different
integer enumeration.

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

Make lazy mkdir more robust.Shawn Pearce Wed, 12 Jul 2006 05:00:16 +0000 (01:00 -0400)

Make lazy mkdir more robust.

Linus Torvalds <torvalds@osdl.org> wrote:

It's entirely possible that we should just make that whole

if (ret == ENOENT)

go away. Yes, it's the right error code if a subdirectory is missing, and
yes, POSIX requires it, and yes, WXP is probably just a horrible piece of
sh*t, but on the other hand, I don't think git really has any serious
reason to even care.

Merge branch 'ml/trace'Junio C Hamano Thu, 13 Jul 2006 06:09:10 +0000 (23:09 -0700)

Merge branch 'ml/trace'

* ml/trace:
test-lib: unset GIT_TRACE
GIT_TRACE: fix a mixed declarations and code warning
GIT_TRACE: show which built-in/external commands are executed

test-lib: unset GIT_TRACEJunio C Hamano Thu, 13 Jul 2006 06:09:00 +0000 (23:09 -0700)

test-lib: unset GIT_TRACE

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

git-repack: avoid redirecting stderr into git-pack... Junio C Hamano Thu, 13 Jul 2006 06:00:46 +0000 (23:00 -0700)

git-repack: avoid redirecting stderr into git-pack-objects

We are trying to catch error condition of git-rev-list and cause
the downstream pack-objects to barf, but if you run rev-list
with anything that mucks with its stderr (such as GIT_TRACE),
any stderr output would cause the pipeline to fail.

[jc: originally from Matthias Lederhofer, with a reworded error message.]

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

Fix grammatical error in git-revertJunio C Hamano Thu, 13 Jul 2006 05:51:25 +0000 (22:51 -0700)

Fix grammatical error in git-revert

We always talk about "commit xyz".

We never talk about "xyz commit", except when we end up talking
about a commit as a branch head (notably, I would say "the HEAD
commit", or possibly "the top-of-master commit", but here
$commit is a SHA1 name, not anything else).

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

Merge branch 'js/merge-base'Junio C Hamano Thu, 13 Jul 2006 05:44:59 +0000 (22:44 -0700)

Merge branch 'js/merge-base'

* js/merge-base:
Additional merge-base tests (revised)
merge-base: update the clean-up postprocessing

Merge branch 'lt/prune'Junio C Hamano Thu, 13 Jul 2006 05:31:55 +0000 (22:31 -0700)

Merge branch 'lt/prune'

* lt/prune:
builtin "git prune"

Merge branch 'lt/merge-tree'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

fmt-merge-msg fixJunio 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>

gitweb: Make command invocations go through the git... 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>

gitweb: Include a site name in page titlesAlp 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>

gitweb: Send XHTML as 'application/xhtml+xml' where... 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>

Log ref changes made by resolve.Shawn Pearce Tue, 11 Jul 2006 06:25:09 +0000 (02:25 -0400)

Log ref changes made by resolve.

Since git-resolve is essentially a form of git-merge record any
ref updates it makes similiar to how git-merge would record them.

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

Log ref changes made by quiltimport.Shawn Pearce Tue, 11 Jul 2006 06:10:19 +0000 (02:10 -0400)

Log ref changes made by quiltimport.

When importing a quilt patch to a branch which has a reflog record
the update to HEAD with a log message indicating the change was
made by quiltimport and what patch caused the change.

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

Log ref changes made by git-merge and git-pull.Shawn Pearce Tue, 11 Jul 2006 05:52:54 +0000 (01:52 -0400)

Log ref changes made by git-merge and git-pull.

When git-merge updates HEAD as a result of a merge record what
happened during the merge into the reflog associated with HEAD
(if any). The log reports who caused the update (git-merge or
git-pull, by invoking git-merge), what the remote ref names were
and the type of merge process used.

The merge information can be useful when reviewing a reflog for
a branch such as `master` where fast forward and trivial in index
merges might be common as the user tracks an upstream.

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

git-fetch: fix a bashism (==)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>

Make the unpacked object header functions static to... 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>

git-send-email: Remove redundant Reply-To headerAlp 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>

typofix (git-name-rev documentation)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>

Mention the [user@] part in documentation of ssh:/... 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>

tests: Set EDITOR=: and VISUAL=: globallyEric 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>

Log ref changes made by git-fetch and git-pull.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>

Record the type of commit operation in the reflog.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>

Allow user.name and user.email to drive reflog entry.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>

Fix linking for not-so-clever linkers.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>

git-rev-list: add documentation for --parents, --no... 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>

Merge branch 'jc/show-merge'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...]

Avoid C99 comments, use old-style C comments instead.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>

Fix more typos, primarily in the codePavel 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>

gitweb.cgi: Teach "a=blob" action to know the blob... 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>

gitweb.cgi: Create $git_temp if it doesn't existLuben 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>

Merge branch 'lt/gitweb'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

git-svn: fix --file/-F option in commit-diffEric 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>

Avoid C99 initializersShawn 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>

Merge branch 'jc/rename'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.

Merge branch 'jc/grep'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.

Merge branch 'jc/mailinfo'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

Merge branch 'ew/diff'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

Merge branch 'ew/svn'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

Additional merge-base tests (revised)A Large Angry SCM Wed, 5 Jul 2006 00:35:20 +0000 (17:35 -0700)

Additional merge-base tests (revised)

Signed-off-by: A Large Angry SCM <gitzilla@gmail.com>

merge-base: update the clean-up postprocessingJunio C Hamano Wed, 5 Jul 2006 01:46:42 +0000 (18:46 -0700)

merge-base: update the clean-up postprocessing

This removes the "contaminate the well even more" approach
taken in the current merge-base postprosessing code. Instead,
when there are more than one merge-base results, we compute the
merge-base between them and see if one is a fast-forward of the
other, in which case the ancestor is removed from the result.

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

Fix typos involving the word 'commit'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>

Fix some doubled word typosAlp 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>

Fix some doubled word typosAlp 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>

"git -p cmd" to page anywhereJunio 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>

change ent to tree in git-diff documentationMatthias 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>

Typofix in Makefile comment.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>

Assorted typo fixesPavel Roskin Sun, 9 Jul 2006 07:44:30 +0000 (03:44 -0400)

Assorted typo fixes

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

GIT_TRACE: fix a mixed declarations and code warningTimo Hirvonen Wed, 28 Jun 2006 09:15:00 +0000 (12:15 +0300)

GIT_TRACE: fix a mixed declarations and code warning

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

GIT_TRACE: show which built-in/external commands are... Matthias Lederhofer Sun, 25 Jun 2006 13:56:18 +0000 (15:56 +0200)

GIT_TRACE: show which built-in/external commands are executed

With the environment variable GIT_TRACE set git will show
- alias expansion
- built-in command execution
- external command execution
on stderr.

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

builtin "git prune"Linus Torvalds Thu, 6 Jul 2006 17:16:22 +0000 (10:16 -0700)

builtin "git prune"

This actually removes the objects to be pruned, unless you specify "-n"
(at which point it will just tell you which files it would prune).

This doesn't do the pack-file pruning that the shell-script used to do,
but if somebody really wants to, they could add it easily enough. I wonder
how useful it is, though, considering that "git repack -a -d" is just a
lot more efficient and generates a better end result.

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

Add "raw" output option to blobs in "tree" view formatLuben 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>

Merge branch 'sf/diff'Junio C Hamano Sun, 9 Jul 2006 07:52:36 +0000 (00:52 -0700)

Merge branch 'sf/diff'

Disable color detection during format-patchRyan 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>

git-cvsexportcommit can't handle merge commits correctlyPeter 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>

Using 'perl' in *.shMichal 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>

sed -e '/RE/r rfile/' needs space in 'r rfile'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>

Close the index file between writing and committingJohannes 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>

templates/hooks--update: replace diffstat calls with... 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>

diff: do not use configuration magic at the core-levelJunio 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>

colored diff: diff.color = auto fixJunio 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>

git log -p --merge [[--] paths...]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>

Makefile: export NO_SVN_TESTSJohannes 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>