gitweb.git
git-describe: --long shows the object name even for... Santi Béjar Mon, 25 Feb 2008 09:43:33 +0000 (10:43 +0100)

git-describe: --long shows the object name even for a tagged commit

This is useful when you want to see parts of the commit object name
in "describe" output, even when the commit in question happens to be
a tagged version. Instead of just emitting the tag name, it will
describe such a commit as v1.2-0-deadbeef (0th commit since tag v1.2
that points at object deadbeef....).

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Add tests for filesystem challenges (case and unicode... Steffen Prohaska Sun, 24 Feb 2008 17:19:09 +0000 (18:19 +0100)

Add tests for filesystem challenges (case and unicode normalization)

Git has difficulties on file systems that do not properly
distinguish case or modify filenames in unexpected ways. The two
major examples are Windows and Mac OS X. Both systems preserve
case of file names but do not distinguish between filenames that
differ only by case. Simple operations such as "git mv" or
"git merge" can fail unexpectedly. In addition, Mac OS X normalizes
unicode, which make git's life even harder.

This commit adds tests that currently fail but should pass if
file system as decribed above are fully supported. The test need
to be run on Windows and Mac X as they already pass on Linux.

Mitch Tishmack is the original author of the tests for unicode
normalization.

[jc: fixed-up so that it will use test_expect_success to test
on sanely behaving filesystems.]

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Use a single implementation and API for copy_file()Daniel Barkalow Mon, 25 Feb 2008 19:24:48 +0000 (14:24 -0500)

Use a single implementation and API for copy_file()

Originally by Kristian Hï¿œgsberg; I fixed the conversion of rerere, which
had a different API.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/git-filter-branch: add a new msg-filter... Miklos Vajna Mon, 25 Feb 2008 14:43:53 +0000 (15:43 +0100)

Documentation/git-filter-branch: add a new msg-filter example

There were no example on how to edit commit messages, so add an msg-filter
example.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

url rewriting: take longest and first matchJunio C Hamano Mon, 25 Feb 2008 06:25:04 +0000 (22:25 -0800)

url rewriting: take longest and first match

Earlier we had a cop-out in the documentation to make the
behaviour "undefined" if configuration had more than one
insteadOf that would match the target URL, like this:

[url "git://git.or.cz/"]
insteadOf = "git.or.cz:" ; (1)
insteadOf = "repo.or.cz:" ; (2)
[url "/local/mirror/"]
insteadOf = "git.or.cz:myrepo" ; (3)
insteadOf = "repo.or.cz:" ; (4)

It would be most natural to take the longest and first match, i.e.

- rewrite "git.or.cz:frotz" to "git://git.or.cz/frotz" by using
(1),

- rewrite "git.or.cz:myrepo/xyzzy" to "/local/mirror/xyzzy" by favoring
(3) over (1), and

- rewrite "repo.or.cz:frotz" to "git://git.or.cz/frotz" by
favoring (2) over (4).

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Correct fast-export file mode strings to match fast... Shawn O. Pearce Mon, 25 Feb 2008 03:57:29 +0000 (22:57 -0500)

Correct fast-export file mode strings to match fast-import standard

The fast-import file format does not expect leading '0' in front
of a file mode; that is we want '100644' and '0100644'.

Thanks to Ian Clatworthy of the Bazaar project for noticing the
difference in output/input.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Add support for url aliases in config filesDaniel Barkalow Wed, 20 Feb 2008 18:43:53 +0000 (13:43 -0500)

Add support for url aliases in config files

This allows users with different preferences for access methods to the
same remote repositories to rewrite each other's URLs by pattern
matching across a large set of similiarly set up repositories to each
get the desired access.

For example, if you don't have a kernel.org account, you might want
settings like:

[url "git://git.kernel.org/pub/"]
insteadOf = master.kernel.org:/pub

Then, if you give git a URL like:

master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git

it will act like you gave it:

git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git

and you can cut-and-paste pull requests in email without fixing them
by hand, for example.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-bundle.txt: Add different strategies to create... Santi Béjar Sun, 24 Feb 2008 13:42:40 +0000 (14:42 +0100)

git-bundle.txt: Add different strategies to create the bundle

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin-for-each-ref.c: fix typo in error messageMichele Ballabio Sun, 24 Feb 2008 23:16:04 +0000 (00:16 +0100)

builtin-for-each-ref.c: fix typo in error message

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

help: respect aliasesJeff King Sun, 24 Feb 2008 22:17:37 +0000 (17:17 -0500)

help: respect aliases

If we have an alias "foo" defined, then the help text for
"foo" (via "git help foo" or "git foo --help") now shows the
definition of the alias.

Before showing an alias definition, we make sure that there
is no git command which would override the alias (so that
even though you may have a "log" alias, even though it will
not work, we don't want to it supersede "git help log").

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

make alias lookup a public, procedural functionJeff King Sun, 24 Feb 2008 22:17:14 +0000 (17:17 -0500)

make alias lookup a public, procedural function

This converts git_config_alias to the public alias_lookup
function. Because of the nature of our config parser, we
still have to rely on setting static data. However, that
interface is wrapped so that you can just say

value = alias_lookup(key);

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

help: use parseoptJeff King Sun, 24 Feb 2008 22:16:55 +0000 (17:16 -0500)

help: use parseopt

This patch converts cmd_help to use parseopt, along with a
few style cleanups, including:

- enum constants are now ALL_CAPS

- parse_help_format returns an enum value rather than
setting a global as a side effect

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

send-email: test compose functionalityJeff King Sun, 24 Feb 2008 21:04:14 +0000 (16:04 -0500)

send-email: test compose functionality

This is just a basic sanity check that --compose works at
all.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t9001: enhance fake sendmail test harnessJeff King Sun, 24 Feb 2008 21:03:52 +0000 (16:03 -0500)

t9001: enhance fake sendmail test harness

Previously, the fake.sendmail test harness would write its
output to a hardcoded file, allowing only a single message
to be tested. Instead, let's have it save the messages for
all of its invocations so that we can see which messages
were sent, and in which order.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'lt/dirstat'Junio C Hamano Mon, 25 Feb 2008 02:14:53 +0000 (18:14 -0800)

Merge branch 'lt/dirstat'

* lt/dirstat:
diff --dirstat: saner handling of binary and unmerged files
Add "--dirstat" for some directory statistics

Eliminate confusing "won't bisect on seeked tree" failureCarl Worth Sun, 24 Feb 2008 01:14:17 +0000 (17:14 -0800)

Eliminate confusing "won't bisect on seeked tree" failure

This error message is very confusing---it doesn't tell the user
anything about how to fix the situation. And the actual fix
for the situation ("git bisect reset") does a checkout of a
potentially random branch, (compared to what the user wants to
be on for the bisect she is starting).

The simplest way to eliminate the confusion is to just make
"git bisect start" do the cleanup itself. There's no significant
loss of safety here since we already have a general safety in
the form of the reflog.

Note: We preserve the warning for any cogito users. We do this
by switching from .git/head-name to .git/BISECT_START for the
extra state, (which is a more descriptive name anyway).

Signed-off-by: Carl Worth <cworth@cworth.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --dirstat: saner handling of binary and unmerged... Junio C Hamano Mon, 25 Feb 2008 01:37:15 +0000 (17:37 -0800)

diff --dirstat: saner handling of binary and unmerged files

We do not account binary nor unmerged files when --shortstat is
asked for (or the summary stat at the end of --stat).

The new option --dirstat should work the same way as it is about
summarizing the changes of multiple files by adding them up.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jc/apply-whitespace'Junio C Hamano Mon, 25 Feb 2008 01:23:17 +0000 (17:23 -0800)

Merge branch 'jc/apply-whitespace'

* jc/apply-whitespace:
ws_fix_copy(): move the whitespace fixing function to ws.c
apply: do not barf on patch with too large an offset
core.whitespace: cr-at-eol
git-apply --whitespace=fix: fix whitespace fuzz introduced by previous run
builtin-apply.c: pass ws_rule down to match_fragment()
builtin-apply.c: move copy_wsfix() function a bit higher.
builtin-apply.c: do not feed copy_wsfix() leading '+'
builtin-apply.c: simplify calling site to apply_line()
builtin-apply.c: clean-up apply_one_fragment()
builtin-apply.c: mark common context lines in lineinfo structure.
builtin-apply.c: optimize match_beginning/end processing a bit.
builtin-apply.c: make it more line oriented
builtin-apply.c: push match-beginning/end logic down
builtin-apply.c: restructure "offset" matching
builtin-apply.c: refactor small part that matches context

Use git-describe --exact-match in bash prompt on detach... Shawn O. Pearce Sun, 24 Feb 2008 08:07:33 +0000 (03:07 -0500)

Use git-describe --exact-match in bash prompt on detached HEAD

Most of the time when I am on a detached HEAD and I am not doing
a rebase or bisect operation the working directory is sitting on a
tagged release of the repository. Showing the tag name instead of
the commit SHA-1 is much more descriptive and a much better reminder
of the state of this working directory.

Now that git-describe --exact-match is available as a cheap means
of obtaining the exact annotated tag or nothing at all, we can
favor the annotated tag name over the abbreviated commit SHA-1.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Teach git-describe --exact-match to avoid expensive... Shawn O. Pearce Sun, 24 Feb 2008 08:07:31 +0000 (03:07 -0500)

Teach git-describe --exact-match to avoid expensive tag searches

Sometimes scripts want (or need) the annotated tag name that exactly
matches a specific commit, or no tag at all. In such cases it can be
difficult to determine if the output of `git describe $commit` is a
real tag name or a tag+abbreviated commit. A common idiom is to run
git-describe twice:

if test $(git describe $commit) = $(git describe --abbrev=0 $commit)
...

but this is a huge waste of time if the caller is just going to pick a
different method to describe $commit or abort because it is not exactly
an annotated tag.

Setting the maximum number of candidates to 0 allows the caller to ask
for only a tag that directly points at the supplied commit, or to have
git-describe abort if no such item exists.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Avoid accessing non-tag refs in git-describe unless... Shawn O. Pearce Sun, 24 Feb 2008 08:07:28 +0000 (03:07 -0500)

Avoid accessing non-tag refs in git-describe unless --all is requested

If we aren't going to use a ref there is no reason for us to open
its object from the object database. This avoids opening any of
the head commits reachable from refs/heads/ unless they are also
reachable through the commit we have been asked to describe and
we need to walk through it to find a tag.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Teach git-describe to use peeled ref information when... Shawn O. Pearce Sun, 24 Feb 2008 08:07:25 +0000 (03:07 -0500)

Teach git-describe to use peeled ref information when scanning tags

By using the peeled ref information inside of the packed-refs file we
can avoid opening tag objects to obtain the commits they reference.
This speeds up git-describe when there are a large number of tags
in the repository as we have less objects to parse before we can
start commit matching.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Optimize peel_ref for the current ref of a for_each_ref... Shawn O. Pearce Sun, 24 Feb 2008 08:07:22 +0000 (03:07 -0500)

Optimize peel_ref for the current ref of a for_each_ref callback

Currently the only caller of peel_ref is show-ref, which is using
this function to show the peeled tag information if it is available
from an existing packed-refs file. The call happens during the
for_each_ref callback function, so we have the proper struct ref_list
already on the call stack but it is not easily available to return
the peeled information to the caller.

We now save the current struct ref_list item before calling back
into the callback function so that future calls to peel_ref from
within the callback function can quickly access the current ref.
Doing so will save us an lstat() per ref processed as we no longer
have to check the filesystem to see if the ref exists as a loose
file or is packed. This current ref caching also saves a linear
scan of the cached packed refs list.

As a micro-optimization we test the address of the passed ref name
against the current_ref->name before we go into the much more costly
strcmp(). Nearly any caller of peel_ref will be passing us the same
string do_for_each_ref passed them, which is current_ref->name.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Sun, 24 Feb 2008 18:01:19 +0000 (10:01 -0800)

Merge branch 'maint'

* maint:
Protect peel_ref fallback case from NULL parse_object result
Ensure 'make dist' compiles git-archive.exe on Cygwin

Be more verbose when checkout takes a long timeLinus Torvalds Sat, 23 Feb 2008 21:36:08 +0000 (13:36 -0800)

Be more verbose when checkout takes a long time

So I find it irritating when git thinks for a long time without telling me
what's taking so long. And by "long time" I definitely mean less than two
seconds, which is already way too long for me.

This hits me when doing a large pull and the checkout takes a long time,
or when just switching to another branch that is old and again checkout
takes a while.

Now, git read-tree already had support for the "-v" flag that does nice
updates about what's going on, but it was delayed by two seconds, and if
the thing had already done more than half by then it would be quiet even
after that, so in practice it meant that we migth be quiet for up to four
seconds. Much too long.

So this patch changes the timeout to just one second, which makes it much
more palatable to me.

The other thing this patch does is that "git checkout" now doesn't disable
the "-v" flag when doing its thing, and only disables the output when
given the -q flag. When allowing "checkout -m" to fall back to a 3-way
merge, the users will see the error message from straight "checkout",
so we will tell them that we do fall back to make them look less scary.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Protect peel_ref fallback case from NULL parse_object... Shawn O. Pearce Sun, 24 Feb 2008 08:07:19 +0000 (03:07 -0500)

Protect peel_ref fallback case from NULL parse_object result

If the SHA-1 we are requesting the object for does not exist in
the object database we get a NULL back. Accessing the type from
that is not likely to succeed on any system.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ensure 'make dist' compiles git-archive.exe on CygwinShawn O. Pearce Sun, 24 Feb 2008 05:38:04 +0000 (00:38 -0500)

Ensure 'make dist' compiles git-archive.exe on Cygwin

On Cygwin we have to use git-archive.exe as the target, otherwise
running 'make dist' does not compile git-archive in the current
directory. That may cause 'make dist' to fail on a clean source
tree that has never been built before.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

checkout: error out when index is unmerged even with -mJunio C Hamano Sat, 23 Feb 2008 23:45:19 +0000 (15:45 -0800)

checkout: error out when index is unmerged even with -m

Even when -m is given to allow fallilng back to 3-way merge
while switching branches, we should refuse if the original index
is unmerged.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Daniel Barkalow <barkalow@iabervon.org>

t4014: Replace sed's non-standard 'Q' by standard 'q'Steffen Prohaska Sat, 23 Feb 2008 08:41:56 +0000 (09:41 +0100)

t4014: Replace sed's non-standard 'Q' by standard 'q'

t4014 test used GNU extension 'Q' in its sed scripts, but the
uses can safely be replaced with 'q'. Among other platforms,
sed on Mac OS X 10.4 does not accept the former.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

ws_fix_copy(): move the whitespace fixing function... Junio C Hamano Sun, 24 Feb 2008 00:59:16 +0000 (16:59 -0800)

ws_fix_copy(): move the whitespace fixing function to ws.c

This is used by git-apply but we can use it elsewhere by slightly
generalizing it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

checkout: show progress when checkout takes long time... Junio C Hamano Sat, 23 Feb 2008 23:37:48 +0000 (15:37 -0800)

checkout: show progress when checkout takes long time while switching branches

Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Fix bugs in git_search_grep_body: it's length... Jakub Narebski Sat, 23 Feb 2008 21:37:08 +0000 (22:37 +0100)

gitweb: Fix bugs in git_search_grep_body: it's length(), not len()

Use int(<expr>/2) to get integer value for a substring length.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

pack-objects: Print a message describing the number... Brandon Casey Sat, 23 Feb 2008 02:12:58 +0000 (20:12 -0600)

pack-objects: Print a message describing the number of threads for packing

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

pack-objects: Add runtime detection of online CPU'sAndreas Ericsson Sat, 23 Feb 2008 02:11:56 +0000 (20:11 -0600)

pack-objects: Add runtime detection of online CPU's

Packing objects can be done in parallell nowadays, but it's
only done if the config option pack.threads is set to a value
above 1. Because of that, the code-path used is often not the
most optimal one.

This patch adds a routine to detect the number of online CPU's
at runtime (online_cpus()). When pack.threads (or --threads=) is
given a value of 0, the number of threads is set to the number of
online CPU's. This feature is also documented.

As per Nicolas Pitre's recommendations, the default is still to
run pack-objects single-threaded unless explicitly activated,
either by configuration or by command line parameter.

The routine online_cpus() is a rework of "numcpus.c", written by
one Philip Willoughby <pgw99@doc.ic.ac.uk>. numcpus.c is in the
public domain and can presently be downloaded from
http://csgsoft.doc.ic.ac.uk/numcpus/

Signed-off-by: Andreas Ericsson <ae@op5.se>
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

start_command(), if .in/.out > 0, closes file descripto... Johannes Sixt Thu, 21 Feb 2008 22:42:56 +0000 (23:42 +0100)

start_command(), if .in/.out > 0, closes file descriptors, not the callers

Callers of start_command() can set the members .in and .out of struct
child_process to a value > 0 to specify that this descriptor is used as
the stdin or stdout of the child process.

Previously, if start_command() was successful, this descriptor was closed
upon return. Here we now make sure that the descriptor is also closed in
case of failures. All callers are updated not to close the file descriptor
themselves after start_command() was called.

Note that earlier run_gpg_verify() of git-verify-tag set .out = 1, which
worked because start_command() treated this as a special case, but now
this is incorrect because it closes the descriptor. The intent here is to
inherit stdout to the child, which is achieved by .out = 0.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

start_command(), .in/.out/.err = -1: Callers must close... Johannes Sixt Sat, 16 Feb 2008 17:36:38 +0000 (18:36 +0100)

start_command(), .in/.out/.err = -1: Callers must close the file descriptor

By setting .in, .out, or .err members of struct child_process to -1, the
callers of start_command() can request that a pipe is allocated that talks
to the child process and one end is returned by replacing -1 with the
file descriptor.

Previously, a flag was set (for .in and .out, but not .err) to signal
finish_command() to close the pipe end that start_command() had handed out,
so it was optional for callers to close the pipe, and many already do so.
Now we make it mandatory to close the pipe.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sync with 1.5.4.3Junio C Hamano Sat, 23 Feb 2008 19:49:34 +0000 (11:49 -0800)

Sync with 1.5.4.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>

GIT 1.5.4.3 v1.5.4.3Junio C Hamano Sat, 23 Feb 2008 19:31:04 +0000 (11:31 -0800)

GIT 1.5.4.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint' of git://repo.or.cz/git-gui into... Junio C Hamano Sat, 23 Feb 2008 19:23:59 +0000 (11:23 -0800)

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

* 'maint' of git://repo.or.cz/git-gui:
git-gui: Focus insertion point at end of strings in repository chooser
git-gui: Avoid hardcoded Windows paths in Cygwin package files
git-gui: Default TCL_PATH to same location as TCLTK_PATH
git-gui: Paper bag fix error dialogs opening over the main window
git-gui: Ensure error dialogs always appear over all other windows
git-gui: relax "dirty" version detection
git-gui: support Git Gui.app under OS X 10.5

Add merge-subtree backJunio C Hamano Sat, 23 Feb 2008 19:08:25 +0000 (11:08 -0800)

Add merge-subtree back

An earlier commit e1b3a2c (Build-in merge-recursive) made the
subtree merge strategy backend unavailable. This resurrects
it.

A new test t6029 currently only tests the strategy is available,
but it should be enhanced to check the real "subtree" case.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-stash: add new 'pop' subcommandBrandon Casey Fri, 22 Feb 2008 22:52:50 +0000 (16:52 -0600)

git-stash: add new 'pop' subcommand

This combines the existing stash subcommands 'apply' and 'drop' to
allow a single stash entry to be applied and then dropped, in other
words 'popped', from the stash list.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-stash: add new 'drop' subcommandBrandon Casey Fri, 22 Feb 2008 19:04:54 +0000 (13:04 -0600)

git-stash: add new 'drop' subcommand

This allows a single stash entry to be deleted. It takes an
optional argument which is a stash reflog entry. If no
arguments are supplied, it drops the most recent stash entry.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-reflog: add option --updateref to write the last... Brandon Casey Fri, 22 Feb 2008 19:04:12 +0000 (13:04 -0600)

git-reflog: add option --updateref to write the last reflog sha1 into the ref

Certain sanity checks on the reflog assume that the sha1 of the top reflog
entry will be equal to the sha1 stored in the ref.

When reflog entries are deleted, this assumption may not hold. This patch
adds a new option to git-reflog which causes the subcommands "expire" and
"delete" to update the ref with the sha1 of the top-most reflog entry.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

refs.c: make close_ref() and commit_ref() non-staticBrandon Casey Fri, 22 Feb 2008 18:57:30 +0000 (12:57 -0600)

refs.c: make close_ref() and commit_ref() non-static

This is in preparation to the reflog-expire changes which will
allow updating the ref after expiring the reflog.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-reflog: add option --rewrite to update reflog entri... Brandon Casey Fri, 22 Feb 2008 18:56:50 +0000 (12:56 -0600)

git-reflog: add option --rewrite to update reflog entries while expiring

Certain sanity checks on the reflog assume that each entry will contain
a reference to the previous entry. i.e. that the "old" sha1 field of a
reflog entry will be equal to the "new" sha1 field of the previous entry.

When reflog entries are deleted, this assumption may not hold. This patch
adds a new option to git-reflog which causes the subcommands "expire" and
"delete" to rewrite the "old" sha1 field of each reflog entry so that it
points to the previous reflog entry.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

reflog-delete: parse standard reflog optionsBrandon Casey Fri, 22 Feb 2008 21:08:59 +0000 (15:08 -0600)

reflog-delete: parse standard reflog options

Add support for some standard reflog options such as --dry-run and
--verbose to the reflog delete subcommand.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'bc/reflog-fix' into js/reflog-deleteJunio C Hamano Sat, 23 Feb 2008 06:54:37 +0000 (22:54 -0800)

Merge branch 'bc/reflog-fix' into js/reflog-delete

* bc/reflog-fix: (1490 commits)
builtin-reflog.c: don't install new reflog on write failure
hash: fix lookup_hash semantics
gitweb: Better chopping in commit search results
builtin-tag.c: remove cruft
git-merge-index documentation: clarify synopsis
send-email: fix In-Reply-To regression
git-reset --hard and git-read-tree --reset: fix read_cache_unmerged()
Teach git-grep --name-only as synonym for -l
diff: fix java funcname pattern for solaris
t3404: use configured shell instead of /bin/sh
git_config_*: don't assume we are parsing a config file
prefix_path: use is_absolute_path() instead of *orig == '/'
git-clean: handle errors if removing files fails
Clarified the meaning of git-add -u in the documentation
git-clone.sh: properly configure remote even if remote's head is dangling
git.el: Set process-environment instead of invoking env
Documentation/git-stash: document options for git stash list
send-email: squelch warning due to comparing undefined $_ to ""
cvsexportcommit: be graceful when "cvs status" reorders the arguments
Rename git-core rpm to just git and rename the meta-pacakge to git-all.
...

Conflicts:

Documentation/git-reflog.txt
t/t1410-reflog.sh

builtin-reflog.c: don't install new reflog on write... Brandon Casey Fri, 22 Feb 2008 18:47:08 +0000 (12:47 -0600)

builtin-reflog.c: don't install new reflog on write failure

When expiring reflog entries, a new temporary log is written which contains
only the entries to retain. After it is written, it is renamed to replace
the existing reflog. Currently, we check that writing of the new log is
successful and print a message on failure, but the original reflog is still
replaced with the new reflog even on failure. This patch causes the
original reflog to be retained if we fail when writing the new reflog.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

pull: pass --strategy along to to rebaseJay Soffian Sat, 23 Feb 2008 00:52:29 +0000 (19:52 -0500)

pull: pass --strategy along to to rebase

rebase supports --strategy, so pull should pass the option along to it.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Use helper function for copying index entry informationLinus Torvalds Sat, 23 Feb 2008 04:41:17 +0000 (20:41 -0800)

Use helper function for copying index entry information

We used to just memcpy() the index entry when we copied the stat() and
SHA1 hash information, which worked well enough back when the index
entry was just an exact bit-for-bit representation of the information on
disk.

However, these days we actually have various management information in
the cache entry too, and we should be careful to not overwrite it when
we copy the stat information from another index entry.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Name hash fixups: export (and rename) remove_hash_entryLinus Torvalds Sat, 23 Feb 2008 04:39:21 +0000 (20:39 -0800)

Name hash fixups: export (and rename) remove_hash_entry

This makes the name hash removal function (which really just sets the
bit that disables lookups of it) available to external routines, and
makes read_cache_unmerged() use it when it drops an unmerged entry from
the index.

It's renamed to remove_index_entry(), and we drop the (unused) 'istate'
argument.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix name re-hashing semanticsLinus Torvalds Sat, 23 Feb 2008 04:37:40 +0000 (20:37 -0800)

Fix name re-hashing semantics

We handled the case of removing and re-inserting cache entries badly,
which is something that merging commonly needs to do (removing the
different stages, and then re-inserting one of them as the merged
state).

We even had a rather ugly special case for this failure case, where
replace_index_entry() basically turned itself into a no-op if the new
and the old entries were the same, exactly because the hash routines
didn't handle it on their own.

So what this patch does is to not just have the UNHASHED bit, but a
HASHED bit too, and when you insert an entry into the name hash, that
involves:

- clear the UNHASHED bit, because now it's valid again for lookup
(which is really all that UNHASHED meant)

- if we're being lazy, we're done here (but we still want to clear the
UNHASHED bit regardless of lazy mode, since we can become unlazy
later, and so we need the UNHASHED bit to always be set correctly,
even if we never actually insert the entry into the hash list)

- if it was already hashed, we just leave it on the list

- otherwise mark it HASHED and insert it into the list

this all means that unhashing and rehashing a name all just works
automatically. Obviously, you cannot change the name of an entry (that
would be a serious bug), but nothing can validly do that anyway (you'd
have to allocate a new struct cache_entry anyway since the name length
could change), so that's not a new limitation.

The code actually gets simpler in many ways, although the lazy hashing
does mean that there are a few odd cases (ie something can be marked
unhashed even though it was never on the hash in the first place, and
isn't actually marked hashed!).

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Avoid unnecessary "if-before-free" tests.Jim Meyering Thu, 31 Jan 2008 17:26:32 +0000 (18:26 +0100)

Avoid unnecessary "if-before-free" tests.

This change removes all obvious useless if-before-free tests.
E.g., it replaces code like this:

if (some_expression)
free (some_expression);

with the now-equivalent:

free (some_expression);

It is equivalent not just because POSIX has required free(NULL)
to work for a long time, but simply because it has worked for
so long that no reasonable porting target fails the test.
Here's some evidence from nearly 1.5 years ago:

http://www.winehq.org/pipermail/wine-patches/2006-October/031544.html

FYI, the change below was prepared by running the following:

git ls-files -z | xargs -0 \
perl -0x3b -pi -e \
's/\bif\s*\(\s*(\S+?)(?:\s*!=\s*NULL)?\s*\)\s+(free\s*\(\s*\1\s*\))/$2/s'

Note however, that it doesn't handle brace-enclosed blocks like
"if (x) { free (x); }". But that's ok, since there were none like
that in git sources.

Beware: if you do use the above snippet, note that it can
produce syntactically invalid C code. That happens when the
affected "if"-statement has a matching "else".
E.g., it would transform this

if (x)
free (x);
else
foo ();

into this:

free (x);
else
foo ();

There were none of those here, either.

If you're interested in automating detection of the useless
tests, you might like the useless-if-before-free script in gnulib:
[it *does* detect brace-enclosed free statements, and has a --name=S
option to make it detect free-like functions with different names]

http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=blob;f=build-aux/useless-if-before-free

Addendum:
Remove one more (in imap-send.c), spotted by Jean-Luc Herren <jlh@gmx.ch>.

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Fri, 22 Feb 2008 22:01:43 +0000 (14:01 -0800)

Merge branch 'maint'

* maint:
hash: fix lookup_hash semantics

hash: fix lookup_hash semanticsJeff King Fri, 22 Feb 2008 19:47:27 +0000 (14:47 -0500)

hash: fix lookup_hash semantics

We were returning the _address of_ the stored item (or NULL)
instead of the item itself. While this sort of indirection
is useful for insertion (since you can lookup and then
modify), it is unnecessary for read-only lookup. Since the
hash code splits these functions between the internal
lookup_hash_entry function and the public lookup_hash
function, it makes sense for the latter to provide what
users of the library expect.

The result of this was that the index caching returned bogus
results on lookup. We unfortunately didn't catch this
because we were returning a "struct cache_entry **" as a
"void *", and accidentally assigning it to a "struct
cache_entry *".

As it happens, this actually _worked_ most of the time,
because the entries were defined as:

struct cache_entry {
struct cache_entry *next;
...
};

meaning that interpreting a "struct cache_entry **" as a
"struct cache_entry *" would yield an entry where all fields
were totally bogus _except_ for the next pointer, which
pointed to the actual cache entry. When walking the list, we
would look at the bogus "name" field, which was unlikely to
match our lookup, and then proceed to the "real" entry.

The reading of bogus data was silently ignored most of the
time, but could cause a segfault for some data (which seems
to be more common on OS X).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Better chopping in commit search resultsJunio C Hamano Fri, 22 Feb 2008 16:33:47 +0000 (17:33 +0100)

gitweb: Better chopping in commit search results

When searching commit messages (commit search), if matched string is
too long, the generated HTML was munged leading to an ill-formed XHTML
document.

Now gitweb chop leading, trailing and matched parts, HTML escapes
those parts, then composes and marks up match info. HTML output is
never chopped. Limiting matched info to 80 columns (with slop) is now
done by dividing remaining characters after chopping match equally to
leading and trailing part, not by chopping composed and HTML marked
output.

Noticed-by: Jean-Baptiste Quenot <jbq@caraldi.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

hash-object: cleanup handling of command line optionsGerrit Pape Thu, 21 Feb 2008 10:06:47 +0000 (10:06 +0000)

hash-object: cleanup handling of command line options

git hash-object used to process the --stdin command line argument
before reading subsequent arguments. This caused 'git hash-object
--stdin -w' to fail to actually write the object into the
database, while '-w --stdin' properly did. Now git hash-object
first reads all arguments, and then processes them.

This regresses one insane use case. git hash-object used to allow
multiple --stdin arguments on the command line:

$ git hash-object --stdin --stdin
foo
^D
bar
^D

Now git hash-object errors out if --stdin is given more than once.

Reported by Josh Triplett through
http://bugs.debian.org/464432

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin-tag.c: remove cruftGerrit Pape Fri, 22 Feb 2008 09:53:09 +0000 (09:53 +0000)

builtin-tag.c: remove cruft

After changing builtin-tag.c to use strbuf in fd17f5b (Replace all
read_fd use with strbuf_read, and get rid of it.), the last condition
in do_sign() will always be false, as it's checked already right
above. So let's remove the cruft.

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-merge-index documentation: clarify synopsisGerrit Pape Fri, 22 Feb 2008 08:55:29 +0000 (08:55 +0000)

git-merge-index documentation: clarify synopsis

The options following <merge-program> are not -a, --, or <file>...,
but either -a, or -- <file>..., while -- is optional.

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Shawn O. Pearce Fri, 22 Feb 2008 06:40:25 +0000 (01:40 -0500)

Merge branch 'maint'

* maint:
git-gui: Focus insertion point at end of strings in repository chooser
git-gui: Avoid hardcoded Windows paths in Cygwin package files
git-gui: Default TCL_PATH to same location as TCLTK_PATH
git-gui: Paper bag fix error dialogs opening over the main window

git-gui: Focus insertion point at end of strings in... Shawn O. Pearce Mon, 11 Feb 2008 05:53:52 +0000 (00:53 -0500)

git-gui: Focus insertion point at end of strings in repository chooser

When selecting a local working directory for a new repository or a
location to clone an existing repository into we now set the insert
point at the end of the selected path, allowing the user to type in
any additional parts of the path if they so desire.

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

git-gui: Avoid hardcoded Windows paths in Cygwin packag... Shawn O. Pearce Fri, 22 Feb 2008 00:27:46 +0000 (19:27 -0500)

git-gui: Avoid hardcoded Windows paths in Cygwin package files

When we are being built by the Cygwin package maintainers we need to
embed the POSIX path to our library files and not the Windows path.
Embedding the Windows path means all end-users who install our Cygwin
package would be required to install Cygwin at the same Windows path
as the package maintainer had Cygwin installed to. This requirement
is simply not user-friendly and may be infeasible for a large number
of our users.

We now try to auto-detect if the Tcl/Tk binary we will use at runtime
is capable of translating POSIX paths into Windows paths the same way
that cygpath does the translations. If the Tcl/Tk binary gives us the
same results then it understands the Cygwin path translation process
and should be able to read our library files from a POSIX path name.

If it does not give us the same answer as cygpath then the Tcl/Tk
binary might actually be a native Win32 build (one that is not
linked against Cygwin) and thus requires the native Windows path
to our library files. We can assume this is not a Cygwin package
as the Cygwin maintainers do not currently ship a pure Win32 build
of Tcl/Tk.

Reported on the git mailing list by Jurko Gospodnetić.

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

git-gui: Default TCL_PATH to same location as TCLTK_PATHShawn O. Pearce Fri, 22 Feb 2008 00:17:27 +0000 (19:17 -0500)

git-gui: Default TCL_PATH to same location as TCLTK_PATH

Most users set TCLTK_PATH to tell git-gui where to find wish, but they
fail to set TCL_PATH to the same Tcl installation. We use the non-GUI
tclsh during builds so headless systems are still able to create an
index file and create message files without GNU msgfmt. So it matters
to us that we find a working TCL_PATH at build time.

If TCL_PATH hasn't been set yet we can take a better guess about what
tclsh executable to use by replacing 'wish' in the executable path with
'tclsh'. We only do this replacement on the filename part of the path,
just in case the string "wish" appears in the directory paths. Most of
the time the tclsh will be installed alongside wish so this replacement
is a sensible and safe default.

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

git-gui: Paper bag fix error dialogs opening over the... Shawn O. Pearce Thu, 21 Feb 2008 17:22:08 +0000 (12:22 -0500)

git-gui: Paper bag fix error dialogs opening over the main window

If the main window is the only toplevel we have open then we
don't have a valid grab right now, so we need to assume the
best toplevel to use for the parent is ".".

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

git-gui: fix typo in lib/spellcheck.tclMichele Ballabio Thu, 21 Feb 2008 14:38:56 +0000 (15:38 +0100)

git-gui: fix typo in lib/spellcheck.tcl

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

send-email: fix In-Reply-To regressionJay Soffian Fri, 22 Feb 2008 00:16:04 +0000 (19:16 -0500)

send-email: fix In-Reply-To regression

Fix a regression introduced by

1ca3d6e (send-email: squelch warning due to comparing undefined $_ to "")

where if the user was prompted for an initial In-Reply-To and didn't
provide one, messages would be sent out with an invalid In-Reply-To of
"<>"

Also add test cases for the regression and the fix. A small modification
was needed to allow send-email to take its replies from stdin if the
environment variable GIT_SEND_EMAIL_NOTTY is set.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

checkout: updates to tracking reportJunio C Hamano Thu, 21 Feb 2008 03:42:53 +0000 (19:42 -0800)

checkout: updates to tracking report

Ask branch_get() for the new branch explicitly instead of
letting it return a potentially stale information.

Tighten the logic to find the tracking branch to deal better
with misconfigured repositories (i.e. branch.*.merge can exist
but it may not have a refspec that fetches to .it)

Also fixes grammar in a message, as pointed out by Jeff King.

The function is about reporting and not automatically
fast-forwarding to the upstream, so stop calling it
"adjust-to".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Daniel Barkalow <barkalow@iabervon.org>

builtin-checkout.c: Remove unused prefix arguments... Daniel Barkalow Thu, 21 Feb 2008 15:50:42 +0000 (10:50 -0500)

builtin-checkout.c: Remove unused prefix arguments in switch_branches path

This path doesn't actually care where in the tree you started out,
since it must change the whole thing anyway. With the gratuitous bug
removed, the argument is unused.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-reset --hard and git-read-tree --reset: fix read_ca... Junio C Hamano Thu, 21 Feb 2008 19:33:56 +0000 (11:33 -0800)

git-reset --hard and git-read-tree --reset: fix read_cache_unmerged()

When invalidating unmerged entries in the index, we used to set
their ce_mode to 0 to note the fact that they do not matter
anymore which also made sure that later unpack_trees() call
would not reuse them. Instead just remove them from the index.

Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-gui: Shorten Aspell version strings to just Aspell... Shawn O. Pearce Thu, 21 Feb 2008 05:20:50 +0000 (00:20 -0500)

git-gui: Shorten Aspell version strings to just Aspell version number

We really only support Aspell, so showing the compatibility line from
ispell is of little value to end users.

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

git-gui: Gracefully display non-aspell version errors... Shawn O. Pearce Thu, 21 Feb 2008 05:17:18 +0000 (00:17 -0500)

git-gui: Gracefully display non-aspell version errors to users

If the user has somehow managed to make us execute ispell instead
of aspell, even though our code is invoking aspell, and ispell is
not recognizing the aspell command line options we use to invoke
it then we don't want a giant usage message back from ispell.

Instead we show the ispell version number, letting the user know
we don't actually support that spell checker.

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

git-gui: Catch and display aspell startup failures... Shawn O. Pearce Thu, 21 Feb 2008 03:34:11 +0000 (22:34 -0500)

git-gui: Catch and display aspell startup failures to the user

If we feed a bad dictionary name to aspell on startup it may appear
to start (as Tcl found the executable in our $PATH) but it fails to
give us the version string. In such a case the close of the pipe
will report the exit status of the process (failure) and that is
an error in Tcl.

We now trap the subprocess failure and display the stderr message
from it, letting the user know why the failure is happening. We then
disable the spell checker, but keep our object instance so the user
can alter their preferred dictionary through the options dialog, and
possibly restart the spell checker.

I was also originally wrong to use "error" here for the display
of the problem to the user. I meant to use "error_popup", which
will open a message box and show the failure in a GUI context,
rather than killing git-gui and showing the message on the console.

Noticed by Ilari on #git.

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

git-gui: Only bind the spellcheck popup suggestion... Shawn O. Pearce Thu, 21 Feb 2008 02:55:43 +0000 (21:55 -0500)

git-gui: Only bind the spellcheck popup suggestion hook once

If we reconnect to the spellchecker there is no reason to resetup
the binding for button 3 on our text widget to show the suggestion
list (if available).

Plus, by moving it out of _connect and into init we can now break
out of _connect earlier if there is something wrong with the pipe,
for example if the dictionary we were asked to load is not valid.

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

git-gui: Remove explicit references to 'aspell' in... Shawn O. Pearce Thu, 21 Feb 2008 02:52:54 +0000 (21:52 -0500)

git-gui: Remove explicit references to 'aspell' in message strings

Users may or may not be using aspell here. About the only thing
we are using that is aspell specific (and not supported by ispell
or an ispell variant) is some command line options when we start
up aspell, and a forced encoding of UTF-8. Both of these can be
corrected and/or cleaned up by users through an aspell wrapper
script, or through further improvements to git-gui. There is no
reason to require our translated strings to reference a specific
spell checker, especially if that spell checker implementation is
not very suitable for the language being translated.

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

git-gui: Ensure all spellchecker 'class' variables... Shawn O. Pearce Thu, 21 Feb 2008 02:48:21 +0000 (21:48 -0500)

git-gui: Ensure all spellchecker 'class' variables are initialized

If we somehow managed to get our spellchecker instance created but
aspell wasn't startable we may not finish _connect and thus may
find one or more of our fields was not initialized in the instance.

If we have an instance but no version, there is no reason to show
a version to the user in our about dialog. We effectively have no
spellchecker available.

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

Merge branch 'maint'Shawn O. Pearce Thu, 21 Feb 2008 05:21:54 +0000 (00:21 -0500)

Merge branch 'maint'

* maint:
git-gui: Ensure error dialogs always appear over all other windows

git-gui: Ensure error dialogs always appear over all... Shawn O. Pearce Thu, 21 Feb 2008 04:37:07 +0000 (23:37 -0500)

git-gui: Ensure error dialogs always appear over all other windows

If we are opening an error dialog we want it to appear above all of
the other windows, even those that we may have opened with a grab
to make the window modal. Failure to do so may allow an error
dialog to open up (and grab focus!) under an existing toplevel,
making the user think git-gui has frozen up and is unresponsive,
as they cannot get to the dialog.

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

Teach git-grep --name-only as synonym for -lShawn O. Pearce Thu, 21 Feb 2008 04:28:07 +0000 (23:28 -0500)

Teach git-grep --name-only as synonym for -l

I expected git grep --name-only to give me only the file names,
much as git diff --name-only only generates filenames. Alas the
option is -l, which matches common external greps but doesn't match
other parts of the git UI.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff: fix java funcname pattern for solarisJeff King Thu, 21 Feb 2008 00:01:16 +0000 (19:01 -0500)

diff: fix java funcname pattern for solaris

The Solaris regex library doesn't like having the '$' anchor
inside capture parentheses. It rejects the match, causing
t4018 to fail.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t3404: use configured shell instead of /bin/shJeff King Thu, 21 Feb 2008 00:00:44 +0000 (19:00 -0500)

t3404: use configured shell instead of /bin/sh

The fake-editor shell script invoked /bin/sh; normally this
is fine, unless the /bin/sh doesn't meet our compatibility
requirements, as is the case with Solaris. Specifically, the
$() syntax used by fake-editor is not understood.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git_config_*: don't assume we are parsing a config... Jeff King Thu, 21 Feb 2008 00:00:32 +0000 (19:00 -0500)

git_config_*: don't assume we are parsing a config file

These functions get called by other code, including parsing
config options from the command line. In that case,
config_file_name is NULL, leading to an ugly message or even
a segfault on some implementations of printf.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

prefix_path: use is_absolute_path() instead of *orig... Johannes Sixt Tue, 19 Feb 2008 21:29:40 +0000 (22:29 +0100)

prefix_path: use is_absolute_path() instead of *orig == '/'

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-clean: handle errors if removing files failsMiklos Vajna Thu, 21 Feb 2008 01:44:46 +0000 (02:44 +0100)

git-clean: handle errors if removing files fails

git-clean simply ignored errors if removing a file or directory failed. This
patch makes it raise a warning and the exit code also greater than zero if
there are remaining files.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'mk/color'Junio C Hamano Thu, 21 Feb 2008 00:13:56 +0000 (16:13 -0800)

Merge branch 'mk/color'

* mk/color:
Add color.ui variable which globally enables colorization if set

Merge branch 'js/maint-cvsexport'Junio C Hamano Thu, 21 Feb 2008 00:13:52 +0000 (16:13 -0800)

Merge branch 'js/maint-cvsexport'

* js/maint-cvsexport:
cvsexportcommit: be graceful when "cvs status" reorders the arguments

Conflicts:

t/t9200-git-cvsexportcommit.sh

Merge branch 'js/maint-http-push'Junio C Hamano Thu, 21 Feb 2008 00:13:32 +0000 (16:13 -0800)

Merge branch 'js/maint-http-push'

* js/maint-http-push:
http-push: avoid a needless goto
http-push: do not get confused by submodules
http-push: avoid invalid memory accesses

Merge branch 'jk/empty-tree'Junio C Hamano Thu, 21 Feb 2008 00:13:28 +0000 (16:13 -0800)

Merge branch 'jk/empty-tree'

* jk/empty-tree:
add--interactive: handle initial commit better
hard-code the empty tree object

Merge branch 'lt/revision-walker'Junio C Hamano Thu, 21 Feb 2008 00:13:24 +0000 (16:13 -0800)

Merge branch 'lt/revision-walker'

* lt/revision-walker:
Add "--show-all" revision walker flag for debugging

Merge branch 'mc/prefix'Junio C Hamano Thu, 21 Feb 2008 00:13:22 +0000 (16:13 -0800)

Merge branch 'mc/prefix'

* mc/prefix:
Avoid a useless prefix lookup in strbuf_expand()

Merge branch 'bc/fopen'Junio C Hamano Thu, 21 Feb 2008 00:13:19 +0000 (16:13 -0800)

Merge branch 'bc/fopen'

* bc/fopen:
Add compat/fopen.c which returns NULL on attempt to open directory

Merge branch 'jc/setup'Junio C Hamano Thu, 21 Feb 2008 00:13:16 +0000 (16:13 -0800)

Merge branch 'jc/setup'

* jc/setup:
builtin-mv: minimum fix to avoid losing files
git-add: adjust to the get_pathspec() changes.
Make blame accept absolute paths
setup: sanitize absolute and funny paths in get_pathspec()

Merge branch 'maint'Junio C Hamano Thu, 21 Feb 2008 00:13:13 +0000 (16:13 -0800)

Merge branch 'maint'

* maint:
Clarified the meaning of git-add -u in the documentation
git-clone.sh: properly configure remote even if remote's head is dangling
Documentation/git-stash: document options for git stash list
send-email: squelch warning due to comparing undefined $_ to ""

Clarified the meaning of git-add -u in the documentationPekka Kaitaniemi Wed, 20 Feb 2008 22:29:39 +0000 (00:29 +0200)

Clarified the meaning of git-add -u in the documentation

The git-add documentation did not state clearly that the -u switch
updates only the tracked files that are in the current directory and
its subdirectories.

Signed-off-by: Pekka Kaitaniemi <kaitanie@cc.helsinki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

checkout: work from a subdirectoryJunio C Hamano Wed, 20 Feb 2008 23:54:54 +0000 (15:54 -0800)

checkout: work from a subdirectory

When switching branches from a subdirectory, checkout rewritten
in C extracted the toplevel of the tree in there.

This should fix it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

checkout: tone down the "forked status" diagnostic... Junio C Hamano Wed, 20 Feb 2008 23:05:23 +0000 (15:05 -0800)

checkout: tone down the "forked status" diagnostic messages

When checking out a branch that is behind or forked from a
branch you are building on top of, we used to show full
left-right log but if you already _know_ you have long history
since you forked, it is a bit too much.

This tones down the message quite a bit, by only showing the
number of commits each side has since they diverged. Also the
message is not shown at all under --quiet.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-clone.sh: properly configure remote even if remote... Gerrit Pape Wed, 20 Feb 2008 15:10:17 +0000 (15:10 +0000)

git-clone.sh: properly configure remote even if remote's head is dangling

When cloning a remote repository which's HEAD refers to a nonexistent
ref, git-clone cloned all existing refs, but failed to write the
configuration for 'remote'. Now it detects the dangling remote HEAD,
refuses to checkout any local branch since HEAD refers to nowhere, but
properly writes the configuration for 'remote', so that subsequent
'git fetch's don't fail.

The problem was reported by Daniel Jacobowitz through
http://bugs.debian.org/466581

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git.el: Set process-environment instead of invoking envDavid Kågedal Tue, 19 Feb 2008 14:01:53 +0000 (15:01 +0100)

git.el: Set process-environment instead of invoking env

This will make it a little less posix-dependent, and more efficient.

Included is also a minor doc improvement.

Signed-off-by: David Kågedal <davidk@lysator.liu.se>
Acked-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/git-stash: document options for git stash... Miklos Vajna Wed, 20 Feb 2008 11:31:35 +0000 (12:31 +0100)

Documentation/git-stash: document options for git stash list

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Resolve value supplied for no-colon push refspecsDaniel Barkalow Wed, 20 Feb 2008 17:54:05 +0000 (12:54 -0500)

Resolve value supplied for no-colon push refspecs

When pushing a refspec like "HEAD", we used to treat it as
"HEAD:HEAD", which didn't work without rewriting. Instead, we should
resolve the ref. If it's a symref, further require it to point to a
branch, to avoid doing anything especially unexpected. Also remove the
rewriting previously added in builtin-push.

Since the code for "HEAD" uses the regular refspec parsing, it
automatically handles "+HEAD" without anything special.

[jc: added a further test to make sure that "remote.*.push = HEAD" works]

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

send-email: squelch warning due to comparing undefined... Jay Soffian Wed, 20 Feb 2008 05:55:07 +0000 (00:55 -0500)

send-email: squelch warning due to comparing undefined $_ to ""

The check to see if initial_reply_to is defined was also comparing $_ to
"" for a reason I cannot ascertain (looking at the commit which made the
change didn't provide enlightenment), but if $_ is undefined, perl
generates a warning.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>