gitweb.git
Merge branch 'jc/maint-fix-unpack-zlib-check' into... Junio C Hamano Mon, 26 Oct 2009 01:35:59 +0000 (18:35 -0700)

Merge branch 'jc/maint-fix-unpack-zlib-check' into maint

* jc/maint-fix-unpack-zlib-check:
Fix incorrect error check while reading deflated pack data

Merge branch 'maint-1.6.4' into maintJunio C Hamano Sun, 25 Oct 2009 22:34:41 +0000 (15:34 -0700)

Merge branch 'maint-1.6.4' into maint

* maint-1.6.4:
ls-files: excludes should not impact tracked files

Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached... Junio C Hamano Sun, 25 Oct 2009 22:34:27 +0000 (15:34 -0700)

Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' into maint-1.6.4

* jk/maint-1.6.3-ls-files-no-ignore-cached:
ls-files: excludes should not impact tracked files

Merge branch 'jn/maint-1.6.3-check-ref-format-doc'... Junio C Hamano Sun, 25 Oct 2009 22:34:21 +0000 (15:34 -0700)

Merge branch 'jn/maint-1.6.3-check-ref-format-doc' into maint-1.6.4

* jn/maint-1.6.3-check-ref-format-doc:
Documentation: describe check-ref-format --branch

t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT... Markus Heidelberg Sat, 24 Oct 2009 23:39:19 +0000 (01:39 +0200)

t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test

GIT_DIFFTOOL_PROMPT doesn't have any effect if overridden with --prompt.

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Work around option parsing bug in the busybox tar imple... Andreas Schwab Sat, 24 Oct 2009 13:06:57 +0000 (15:06 +0200)

Work around option parsing bug in the busybox tar implementation

The first argument of the tar command is interpreted as a bundle of
letters specifying the mode of operation and additional options, with
any option arguments taken from subsequent words on the command line
as needed. The implementation of tar in busybox treats this bundle
as if preceded by a dash and then parses it by getopt rules, which
mishandles 'tar xfo -'. Use 'tar xof -' instead to work this around.

Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix list of released versions in the toc documentJunio C Hamano Sat, 24 Oct 2009 05:38:44 +0000 (22:38 -0700)

Fix list of released versions in the toc document

Merge branch 'jp/maint-send-email-fold' into maintJunio C Hamano Sat, 24 Oct 2009 05:30:42 +0000 (22:30 -0700)

Merge branch 'jp/maint-send-email-fold' into maint

* jp/maint-send-email-fold:
git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s

Merge branch 'jn/maint-1.6.3-check-ref-format-doc'... Junio C Hamano Sat, 24 Oct 2009 05:30:20 +0000 (22:30 -0700)

Merge branch 'jn/maint-1.6.3-check-ref-format-doc' into maint

* jn/maint-1.6.3-check-ref-format-doc:
Documentation: describe check-ref-format --branch

Merge branch 'pv/maint-add-p-no-exclude' into maintJunio C Hamano Sat, 24 Oct 2009 05:29:19 +0000 (22:29 -0700)

Merge branch 'pv/maint-add-p-no-exclude' into maint

* pv/maint-add-p-no-exclude:
git-add--interactive: never skip files included in index

Do not fail "describe --always" in a tag-less repositoryJunio C Hamano Fri, 23 Oct 2009 18:42:39 +0000 (11:42 -0700)

Do not fail "describe --always" in a tag-less repository

This fixes a regression introduce by d68dc34 (git-describe: Die early if
there are no possible descriptions, 2009-08-06).

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

Fix incorrect error check while reading deflated pack... Junio C Hamano Thu, 22 Oct 2009 06:06:14 +0000 (23:06 -0700)

Fix incorrect error check while reading deflated pack data

The loop in get_size_from_delta() feeds a deflated delta data from the
pack stream _until_ we get inflated result of 20 bytes[*] or we reach the
end of stream.

Side note. This magic number 20 does not have anything to do with the
size of the hash we use, but comes from 1a3b55c (reduce delta head
inflated size, 2006-10-18).

The loop reads like this:

do {
in = use_pack();
stream.next_in = in;
st = git_inflate(&stream, Z_FINISH);
curpos += stream.next_in - in;
} while ((st == Z_OK || st == Z_BUF_ERROR) &&
stream.total_out < sizeof(delta_head));

This git_inflate() can return:

- Z_STREAM_END, if use_pack() fed it enough input and the delta itself
was smaller than 20 bytes;

- Z_OK, when some progress has been made;

- Z_BUF_ERROR, if no progress is possible, because we either ran out of
input (due to corrupt pack), or we ran out of output before we saw the
end of the stream.

The fix b3118bd (sha1_file: Fix infinite loop when pack is corrupted,
2009-10-14) attempted was against a corruption that appears to be a valid
stream that produces a result larger than the output buffer, but we are
not even trying to read the stream to the end in this loop. If avail_out
becomes zero, total_out will be the same as sizeof(delta_head) so the loop
will terminate without the "fix". There is no fix from b3118bd needed for
this loop, in other words.

The loop in unpack_compressed_entry() is quite a different story. It
feeds a deflated stream (either delta or base) and allows the stream to
produce output up to what we expect but no more.

do {
in = use_pack();
stream.next_in = in;
st = git_inflate(&stream, Z_FINISH);
curpos += stream.next_in - in;
} while (st == Z_OK || st == Z_BUF_ERROR)

This _does_ risk falling into an endless interation, as we can exhaust
avail_out if the length we expect is smaller than what the stream wants to
produce (due to pack corruption). In such a case, avail_out will become
zero and inflate() will return Z_BUF_ERROR, while avail_in may (or may
not) be zero.

But this is not a right fix:

do {
in = use_pack();
stream.next_in = in;
st = git_inflate(&stream, Z_FINISH);
+ if (st == Z_BUF_ERROR && (stream.avail_in || !stream.avail_out)
+ break; /* wants more input??? */
curpos += stream.next_in - in;
} while (st == Z_OK || st == Z_BUF_ERROR)

as Z_BUF_ERROR from inflate() may be telling us that avail_in has also run
out before reading the end of stream marker. In such a case, both avail_in
and avail_out would be zero, and the loop should iterate to allow the end
of stream marker to be seen by inflate from the input stream.

The right fix for this loop is likely to be to increment the initial
avail_out by one (we allocate one extra byte to terminate it with NUL
anyway, so there is no risk to overrun the buffer), and break out if we
see that avail_out has become zero, in order to detect that the stream
wants to produce more than what we expect. After the loop, we have a
check that exactly tests this condition:

if ((st != Z_STREAM_END) || stream.total_out != size) {
free(buffer);
return NULL;
}

So here is a patch (without my previous botched attempts) to fix this
issue. The first hunk reverts the corresponding hunk from b3118bd, and
the second hunk is the same fix proposed earlier.

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

Document `delta` attribute in "git help attributes".Nasser Grainawi Wed, 21 Oct 2009 21:06:21 +0000 (14:06 -0700)

Document `delta` attribute in "git help attributes".

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

Mark files in t/t5100 as UTF-8Johannes Sixt Wed, 21 Oct 2009 11:35:16 +0000 (13:35 +0200)

Mark files in t/t5100 as UTF-8

This enables gitk to show the patch text with correct glyphs if the locale
is not UTF-8.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Remove a left-over file from t/t5100Johannes Sixt Wed, 21 Oct 2009 11:35:15 +0000 (13:35 +0200)

Remove a left-over file from t/t5100

This mbox file must have been added by accident in e9fe804 (git-mailinfo:
Fix getting the subject from the in-body [PATCH] line, 2008-07-14).

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/git-gc.txt: change "references" to "refer... Matt Kraai Tue, 20 Oct 2009 05:22:25 +0000 (22:22 -0700)

Documentation/git-gc.txt: change "references" to "reference"

Signed-off-by: Matt Kraai <kraai@ftbfs.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git push: say that --tag can't be used with --all or... Nanako Shiraishi Mon, 19 Oct 2009 03:57:01 +0000 (12:57 +0900)

git push: say that --tag can't be used with --all or --mirror in help text

This replaces an earlier patch by Björn Gustavsson,

Message-ID: <4AD75029.1010109@gmail.com>

Signed-off-by: しらいし ななこ <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git push: remove incomplete options list from help... Nanako Shiraishi Mon, 19 Oct 2009 02:54:12 +0000 (11:54 +0900)

git push: remove incomplete options list from help text

'git push -h' shows usage text with incomplete list of options and then
has a separate list of options that are supported. Imitate the way other
commands (I looked at 'git diff' for an example) show their options.

Signed-off-by: しらいし ななこ <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

document push's new quiet optionJeff King Mon, 19 Oct 2009 04:01:19 +0000 (00:01 -0400)

document push's new quiet option

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

Makefile: clean block-sha1/ directory instead of mozill... Carlos R. Mafra Sun, 11 Oct 2009 13:32:19 +0000 (15:32 +0200)

Makefile: clean block-sha1/ directory instead of mozilla-sha1/

'make clean' should remove the object files from block-sha1/
instead of the non-existent mozilla-sha1/ directory.

Signed-off-by: Carlos R. Mafra <crmafra@aei.mpg.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

GIT 1.6.5.1 v1.6.5.1Junio C Hamano Sat, 17 Oct 2009 06:56:55 +0000 (23:56 -0700)

GIT 1.6.5.1

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

Merge branch 'maint-1.6.4' into maintJunio C Hamano Sat, 17 Oct 2009 06:47:58 +0000 (23:47 -0700)

Merge branch 'maint-1.6.4' into maint

* maint-1.6.4:
grep: do not segfault when -f is used

grep: do not segfault when -f is usedMatt Kraai Fri, 16 Oct 2009 14:13:25 +0000 (07:13 -0700)

grep: do not segfault when -f is used

"git grep" would segfault if its -f option was used because it would
try to use an uninitialized strbuf, so initialize the strbuf.

Thanks to Johannes Sixt <j.sixt@viscovery.net> for the help with the
test cases.

Signed-off-by: Matt Kraai <kraai@ftbfs.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

sha1_file: Fix infinite loop when pack is corruptedShawn O. Pearce Wed, 14 Oct 2009 14:23:51 +0000 (07:23 -0700)

sha1_file: Fix infinite loop when pack is corrupted

Some types of corruption to a pack may confuse the deflate stream
which stores an object. In Andy's reported case a 36 byte region
of the pack was overwritten, leading to what appeared to be a valid
deflate stream that was trying to produce a result larger than our
allocated output buffer could accept.

Z_BUF_ERROR is returned from inflate() if either the input buffer
needs more input bytes, or the output buffer has run out of space.
Previously we only considered the former case, as it meant we needed
to move the stream's input buffer to the next window in the pack.

We now abort the loop if inflate() returns Z_BUF_ERROR without
consuming the entire input buffer it was given, or has filled
the entire output buffer but has not yet returned Z_STREAM_END.
Either state is a clear indicator that this loop is not working
as expected, and should not continue.

This problem cannot occur with loose objects as we open the entire
loose object as a single buffer and treat Z_BUF_ERROR as an error.

Reported-by: Andy Isaacson <adi@hexapodia.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

change throughput display units with fast linksNicolas Pitre Wed, 14 Oct 2009 03:02:04 +0000 (23:02 -0400)

change throughput display units with fast links

Switch to MiB/s when the connection is fast enough (i.e. on a LAN).

Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

clone: Supply the right commit hash to post-checkout... Björn Steinbrink Tue, 13 Oct 2009 22:11:09 +0000 (00:11 +0200)

clone: Supply the right commit hash to post-checkout when -b is used

When we use -b <branch>, we may checkout something else than what the
remote's HEAD references, but we still used remote_head to supply the
new ref value to the post-checkout hook, which is wrong.

So instead of using remote_head to find the value to be passed to the
post-checkout hook, we have to use our_head_points_at, which is always
correctly setup, even if -b is not used.

This also fixes a segfault when "clone -b <branch>" is used with a
remote repo that doesn't have a valid HEAD, as in such a case
remote_head is NULL, but we still tried to access it.

Reported-by: Devin Cofer <ranguvar@archlinux.us>
Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

remote-curl: add missing initialization of argv0_pathJohannes Sixt Tue, 13 Oct 2009 10:53:28 +0000 (12:53 +0200)

remote-curl: add missing initialization of argv0_path

All programs, in particular also the stand-alone programs (non-builtins)
must call git_extract_argv0_path(argv[0]) in order to help builds that
derive the installation prefix at runtime, such as the MinGW build.
Without this call, the program segfaults (or raises an assertion
failure).

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Tested-by: Michael Wookey <michaelwookey@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint-1.6.4' into maintJunio C Hamano Tue, 13 Oct 2009 08:01:04 +0000 (01:01 -0700)

Merge branch 'maint-1.6.4' into maint

* maint-1.6.4:
git-stash documentation: mention default options for 'list'

Documentation: describe check-ref-format --branchJonathan Nieder Mon, 12 Oct 2009 05:28:23 +0000 (00:28 -0500)

Documentation: describe check-ref-format --branch

Unless one already knew, it was not obvious what sort of shorthand
"git check-ref-format --branch" expands. Explain it.

The --branch argument is not optional.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-stash documentation: mention default options for... Miklos Vajna Mon, 12 Oct 2009 19:37:39 +0000 (21:37 +0200)

git-stash documentation: mention default options for 'list'

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

ls-files: excludes should not impact tracked filesJeff King Mon, 12 Oct 2009 05:11:57 +0000 (01:11 -0400)

ls-files: excludes should not impact tracked files

In all parts of git, .gitignore and other exclude files
impact only how we treat untracked files; they should have
no effect on files listed in the index.

This behavior was originally implemented very early on in
9ff768e, but only for --exclude-from. Later, commit 63d285c
accidentally caused us to trigger the behavior for
--exclude-per-directory.

This patch totally ignores excludes for files found in the
index. This means we are reversing the original intent of
9ff768e, while at the same time fixing the accidental
behavior of 63d285c. This is a good thing, though, as the
way that 9ff768e behaved does not really make sense with the
way exclusions are used in modern git.

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

git-add--interactive: never skip files included in... Pauli Virtanen Sat, 10 Oct 2009 15:51:45 +0000 (18:51 +0300)

git-add--interactive: never skip files included in index

Make "git add -p" to not skip files that are in index even if they are
excluded (by .gitignore etc.). This fixes the contradictory behavior
that "git status" and "git commit -a" listed such files as modified, but
"git add -p FILENAME" ignored them.

Signed-off-by: Pauli Virtanen <pav@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

GIT 1.6.5 v1.6.5Junio C Hamano Sat, 10 Oct 2009 07:05:19 +0000 (00:05 -0700)

GIT 1.6.5

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

git-svn: hide find_parent_branch output in double quiet... Simon Arlott Fri, 9 Oct 2009 12:21:13 +0000 (13:21 +0100)

git-svn: hide find_parent_branch output in double quiet mode

Hide find_parent_branch logging when -qq is specified.
This eliminates more unnecessary output when run from cron, e.g.:

Found possible branch point:
http://undernet-ircu.svn.sourceforge.net/svnroot/undernet-ircu/ircu2/trunk =>
http://undernet-ircu.svn.sourceforge.net/svnroot/undernet-ircu/ircu2/branches/authz,
1919
Found branch parent: (authz) ea061d76aea985dc0208d36fa5e0b2249b698557
Following parent with do_switch
Successfully followed parent

Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: clone: clarify discussion of initial... Jonathan Nieder Fri, 9 Oct 2009 23:07:39 +0000 (18:07 -0500)

Documentation: clone: clarify discussion of initial branch

When saying the initial branch is equal to the currently active
remote branch, it is probably intended that the branch heads
point to the same commit. Maybe it would be more useful to a
new user to emphasize that the tree contents and history are the
same.

More important, probably, is that this new branch is set up so
that "git pull" merges changes from the corresponding remote
branch. The next paragraph addresses that directly. What the
reader needs to know to begin with is that (1) the initial branch
is your own; if you do not pull, it won't get updated, and that
(2) the initial branch starts out at the same commit as the
upstream.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-send-email.perl: fold multiple entry "Cc:" and... Joe Perches Thu, 8 Oct 2009 17:03:26 +0000 (10:03 -0700)

git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s

Some MTAs reject Cc: lines longer than 78 chars.
Avoid this by using the same join as "To:" ",\n\t"
so each subsequent Cc entry is on a new line.

RCPT TO: should have a single entry per line.
see: http://www.ietf.org/rfc/rfc2821.txt

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'rs/maint-archive-prefix'Junio C Hamano Fri, 9 Oct 2009 23:27:16 +0000 (16:27 -0700)

Merge branch 'rs/maint-archive-prefix'

* rs/maint-archive-prefix:
Git archive and trailing "/" in prefix

Merge branch 'fc/mutt-alias'Junio C Hamano Fri, 9 Oct 2009 23:26:49 +0000 (16:26 -0700)

Merge branch 'fc/mutt-alias'

* fc/mutt-alias:
send-email: fix mutt regex for grouped aliases

Merge branch 'ef/msvc-noreturn'Junio C Hamano Fri, 9 Oct 2009 23:26:35 +0000 (16:26 -0700)

Merge branch 'ef/msvc-noreturn'

* ef/msvc-noreturn:
add NORETURN_PTR for function pointers
increase portability of NORETURN declarations

Merge branch 'jk/reflog-date'Junio C Hamano Fri, 9 Oct 2009 23:26:11 +0000 (16:26 -0700)

Merge branch 'jk/reflog-date'

* jk/reflog-date:
improve reflog date/number heuristic

Merge branch 'ch/am-header'Junio C Hamano Fri, 9 Oct 2009 23:25:40 +0000 (16:25 -0700)

Merge branch 'ch/am-header'

* ch/am-header:
git-am: force egrep to use correct characters set
git-am: fixed patch_format detection according to RFC2822

bash: add support for 'git replace'Björn Gustavsson Fri, 9 Oct 2009 20:49:06 +0000 (22:49 +0200)

bash: add support for 'git replace'

Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

completion: fix alias listings with newlinesStephen Boyd Fri, 9 Oct 2009 06:21:44 +0000 (23:21 -0700)

completion: fix alias listings with newlines

Aliases with newlines have been a problem since commit 56fc25f (Bash
completion support for remotes in .git/config., 2006-11-05). The chance
of the problem occurring has been slim at best, until commit 518ef8f
(completion: Replace config --list with --get-regexp, 2009-09-11)
removed the case statement introduced by commit 56fc25f. Before removing
the case statement, most aliases with newlines would work unless they
were specially crafted as follows

[alias]
foo = "log -1 --pretty='format:%s\nalias.error=broken'"

After removing the case statement, a more benign alias like

[alias]
whowhat = "log -1 --pretty='format:%an <%ae>\n%s'"
wont-complete = ...

would cause the completion to break badly.

For now, revert the removal of the case statement until someone comes up
with a better way to get keys from git-config.

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

completion: fix completion of git <TAB><TAB>Stephen Boyd Fri, 9 Oct 2009 06:21:43 +0000 (23:21 -0700)

completion: fix completion of git <TAB><TAB>

After commit 511a3fc (wrap git's main usage string., 2009-09-12), the
bash completion for git commands includes COMMAND and [ARGS] when it
shouldn't. Fix this by grepping more strictly for a line with git
commands. It's doubtful whether git will ever have commands starting
with anything besides numbers and letters so this should be fine. At
least by being stricter we'll know when we break the completion earlier.

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

import-tars: Add missing closing bracketIngmar Vanhassel Fri, 9 Oct 2009 12:08:31 +0000 (14:08 +0200)

import-tars: Add missing closing bracket

This fixes an obvious syntax error that snuck in commit 7e787953:

syntax error at /home/ingmar/bin//git-import-tars line 143, near "/^$/ { "
syntax error at /home/ingmar/bin//git-import-tars line 145, near "} else"
syntax error at /home/ingmar/bin//git-import-tars line 152, near "}"

Signed-off-by: Ingmar Vanhassel <ingmar@exherbo.org>
Acked-and-Tested-by: Peter Krefting <peter@softwolves.pp.se>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

racy-git.txt: explain nsec problem in more detailJonathan Nieder Fri, 9 Oct 2009 10:25:54 +0000 (05:25 -0500)

racy-git.txt: explain nsec problem in more detail

Idealists may want USE_NSEC to be the default on Linux some day.
Point to a patch to better explain the requirements on
filesystem code for that to happen.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: clarify "working tree" definitionJonathan Nieder Fri, 9 Oct 2009 10:20:19 +0000 (05:20 -0500)

Documentation: clarify "working tree" definition

It is not necessarily obvious to a git novice what it means for a
filesystem tree to be equal to the HEAD. Spell it out.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: clarify branch creationJonathan Nieder Fri, 9 Oct 2009 18:34:08 +0000 (13:34 -0500)

Documentation: clarify branch creation

The documentation seems to assume that the starting point for a new
branch is the tip of an existing (ordinary) branch, but that is not
the most common case. More often, "git branch" is used to begin
a branch from a remote-tracking branch, a tag, or an interesting
commit (e.g. origin/pu^2). Clarify the language so it can apply
to these cases. Thanks to Sean Estabrooks for the wording.

Also add a pointer to the user's manual for the bewildered.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: branch: update --merged descriptionJonathan Nieder Fri, 9 Oct 2009 10:18:58 +0000 (05:18 -0500)

Documentation: branch: update --merged description

Update the documentation for --merged and --no-merged to explain
the meaning of the optional parameter introduced in commit 049716b
(branch --merged/--no-merged: allow specifying arbitrary commit,
2008-07-08).

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: clarify mergeoptions descriptionJonathan Nieder Fri, 9 Oct 2009 18:51:14 +0000 (13:51 -0500)

Documentation: clarify mergeoptions description

Sounds better this way, at least to my ears. ("The syntax and
supported options of git merge" is a plural noun. "the same"
instead of "equal" sounds less technical and seems to convey
the meaning better here.)

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: git fmt-merge-msg does not have to be... Jonathan Nieder Fri, 9 Oct 2009 10:16:15 +0000 (05:16 -0500)

Documentation: git fmt-merge-msg does not have to be a script

The fmt-merge-message builtin can be invoked as "git fmt-merge-msg" rather
than through the hard link in GIT_EXEC_PATH. Although this is unlikely to
confuse most script writers, it should not hurt to make the documentation
a little clearer anyway.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Describe DOCBOOK_XSL_172, ASCIIDOC_NO_ROFF options... Jonathan Nieder Fri, 9 Oct 2009 10:15:29 +0000 (05:15 -0500)

Describe DOCBOOK_XSL_172, ASCIIDOC_NO_ROFF options in Makefile

There is excellent documentation for these options in
Documentation/Makefile, but some users may never find it.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

pull: improve advice for unconfigured error caseJeff King Mon, 5 Oct 2009 19:35:16 +0000 (15:35 -0400)

pull: improve advice for unconfigured error case

There are several reasons a git-pull invocation might not
have anything marked for merge:

1. We're not on a branch, so there is no branch
configuration.

2. We're on a branch, but there is no configuration for
this branch.

3. We fetched from the configured remote, but the
configured branch to merge didn't get fetched (either
it doesn't exist, or wasn't part of the fetch refspec).

4. We fetched from the non-default remote, but didn't
specify a branch to merge. We can't use the configured
one because it applies to the default remote.

5. We fetched from a specified remote, and a refspec was
given, but it ended up not fetching anything (this is
actually hard to do; if the refspec points to a remote
branch and it doesn't exist, then fetch will fail and
we never make it to this code path. But if you provide
a wildcard refspec like

refs/bogus/*:refs/remotes/origin/*

then you can see this failure).

We have handled (1) and (2) for some time. Recently, commit
a6dbf88 added code to handle case (3).

This patch handles cases (4) and (5), which previously just
fell under other cases, producing a confusing message.

While we're at it, let's rewrap the text for case (3), which
looks terribly ugly as it is.

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

Merge git://git.bogomips.org/git-svnJunio C Hamano Fri, 9 Oct 2009 09:53:46 +0000 (02:53 -0700)

Merge git://git.bogomips.org/git-svn

* git://git.bogomips.org/git-svn:
git-svn: Avoid spurious errors when rewriteRoot is used.

git-svn: Avoid spurious errors when rewriteRoot is... Alexander Gavrilov Fri, 9 Oct 2009 07:01:04 +0000 (11:01 +0400)

git-svn: Avoid spurious errors when rewriteRoot is used.

After doing a rebase, git-svn checks that the SVN URL
is what it expects. However, it does not account for
rewriteRoot, which is a legitimate way for the URL
to change. This produces a lot of spurious errors.

[ew: fixed line wrapping]

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>

Merge branch 'ms/msvc'Junio C Hamano Fri, 9 Oct 2009 07:02:23 +0000 (00:02 -0700)

Merge branch 'ms/msvc'

* ms/msvc:
Fix the exit code of MSVC build scripts on cygwin
Fix MSVC build on cygwin

Update draft release notes to 1.6.5Junio C Hamano Fri, 9 Oct 2009 06:59:15 +0000 (23:59 -0700)

Update draft release notes to 1.6.5

Merge branch 'maint'Junio C Hamano Fri, 9 Oct 2009 06:51:38 +0000 (23:51 -0700)

Merge branch 'maint'

* maint:
ls-files: die instead of fprintf/exit in -i error

Makefile: add a note about the NO_MMAP setting on IRIX... Brandon Casey Fri, 9 Oct 2009 00:09:37 +0000 (19:09 -0500)

Makefile: add a note about the NO_MMAP setting on IRIX and IRIX64

When git is compiled with the MIPSpro 7.4.4m compiler, and NO_PTHREADS is
set, and NO_MMAP is _not_ set, then git segfaults when trying to access the
first entry in a reflog. If NO_PTHREADS is not set (which implies that the
pthread library is linked in), or NO_MMAP _is_ set, then the segfault is
not encountered. The conservative choice has been made to set NO_MMAP in
the Makefile to avoid this flaw. The GNU C compiler does not produce this
behavior.

The segfault happens in refs.c:read_ref_at(). The mmap succeeds, and the
loop is executed properly until rec is rewound into the first line (reflog
entry) of the file. The segfault is caught by test 28 of
t1400-update-ref.sh which fails when 'git rev-parse --verify "master@{May 25
2005}"' is called.

So, add a comment in the Makefile to describe why NO_MMAP is set and as a
hint to those who may be interested in unsetting it.

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

ls-files: die instead of fprintf/exit in -i errorBen Walton Fri, 9 Oct 2009 01:53:35 +0000 (21:53 -0400)

ls-files: die instead of fprintf/exit in -i error

When ls-files was called with -i but no exclude pattern, it was
calling fprintf(stderr, "...", NULL) and then exiting. On Solaris,
passing NULL into fprintf was causing a segfault. On glibc systems,
it was simply producing incorrect output (eg: "(null)": ...). The
NULL pointer was a result of argv[0] not being preserved by the option
parser. Instead of requesting that the option parser preserve
argv[0], use die() with a constant string.

A trigger for this bug was: `git ls-files -i`

Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Makefile: enable THREADED_DELTA_SEARCH on IRIX and... Brandon Casey Thu, 8 Oct 2009 23:07:41 +0000 (18:07 -0500)

Makefile: enable THREADED_DELTA_SEARCH on IRIX and IRIX64

Since commit dcda3614 removed the use of a variable length array from
builtin-pack-objects.c, it is now safe to compile with the threaded delta
search feature enabled. Formerly, the MIPSpro 7.4.4m compiler warned that
variable length arrays should not be used with pthreads.

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

Fix the exit code of MSVC build scripts on cygwinRamsay Jones Thu, 8 Oct 2009 15:33:31 +0000 (16:33 +0100)

Fix the exit code of MSVC build scripts on cygwin

During an MSVC build on cygwin, the make program did not notice
when the compiler or linker exited with an error. This was caused
by the scripts exiting with the value returned by system() directly.

On POSIX-like systems, such as cygwin, the return value of system()
has the exit code of the executed command encoded in the first byte
(ie the value is shifted up by 8 bits). This allows the bottom
7 bits to contain the signal number of a terminated process, while
the eighth bit indicates whether a core-dump was produced. (A value
of -1 indicates that the command failed to execute.)

The make program, however, expects the exit code to be encoded in the
bottom byte. Futhermore, it apparently masks off and ignores anything
in the upper bytes.

However, these scripts are (naturally) intended to be used on the
windows platform, where we can not assume POSIX-like semantics from
a perl implementation (eg ActiveState). So, in general, we can not
assume that shifting the return value right by eight will get us
the exit code.

In order to improve portability, we assume that a zero return from
system() indicates success, whereas anything else indicates failure.
Since we don't need to know the exact exit code from the compiler
or linker, we simply exit with 0 (success) or 1 (failure).

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix MSVC build on cygwinRamsay Jones Thu, 8 Oct 2009 15:21:44 +0000 (16:21 +0100)

Fix MSVC build on cygwin

In the MSVC section of the Makefile, BASIC_CFLAGS is set to a
value which contains the string "-DWIN32-D_CONSOLE". This results
in a (single) malformed -Define being passed to the compiler.
At least on my cygwin installation, the msvc compiler seems to
ignore this parameter, without issuing an error or warning, and
results in the WIN32 and _CONSOLE macros being undefined. This
breaks the build.

In order to fix the build, we simply insert a space between the
two -Define parameters, "-DWIN32" and "-D_CONSOLE", as originally
intended.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git archive and trailing "/" in prefixRené Scharfe Thu, 8 Oct 2009 16:46:54 +0000 (18:46 +0200)

Git archive and trailing "/" in prefix

With --prefix=string that does not end with a slash, the top-level entries
are written out with the specified prefix as expected, but no paths in the
directories are added.

Fix this by adding the prefix in write_archive_entry() instead of letting
get_pathspec() and read_tree_recursive() pair; they are designed to only
handle prefixes that are path components.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

completion: add dirstat and friends to diff options v1.6.5-rc3Stephen Boyd Wed, 7 Oct 2009 08:48:51 +0000 (01:48 -0700)

completion: add dirstat and friends to diff options

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

completion: update am, commit, and logStephen Boyd Wed, 7 Oct 2009 08:48:50 +0000 (01:48 -0700)

completion: update am, commit, and log

git am learned --scissors, git commit learned --dry-run and git log
learned --decorate=long|short recently.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Makefile: enable THREADED_DELTA_SEARCH on SunOSBrandon Casey Wed, 7 Oct 2009 01:02:22 +0000 (20:02 -0500)

Makefile: enable THREADED_DELTA_SEARCH on SunOS

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

Merge branch 'maint'Junio C Hamano Thu, 8 Oct 2009 04:32:39 +0000 (21:32 -0700)

Merge branch 'maint'

* maint:
fast-import.c::validate_raw_date(): really validate the value

fast-import.c::validate_raw_date(): really validate... Junio C Hamano Tue, 29 Sep 2009 06:40:09 +0000 (23:40 -0700)

fast-import.c::validate_raw_date(): really validate the value

When reading the "raw format" timestamp from the input stream, make sure
that the timezone offset is a reasonable value by imitating 7122f82
(date.c: improve guess between timezone offset and year., 2006-06-08).

We _might_ want to also check if the timestamp itself is reasonable, but
that is left for a separate commit.

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

README: git lives at http://git-scm.com these daysStefan Naewe Wed, 7 Oct 2009 12:14:24 +0000 (14:14 +0200)

README: git lives at http://git-scm.com these days

Signed-off-by: Stefan Naewe <stefan.naewe+git@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-pull: dead code removalJunio C Hamano Mon, 5 Oct 2009 19:03:25 +0000 (12:03 -0700)

git-pull: dead code removal

Back when a74b170 (git-pull: disallow implicit merging to detached HEAD,
2007-01-15) added this check, $? referred to the error status of reading
HEAD as a symbolic-ref; but cd67e4d (Teach 'git pull' about --rebase,
2007-11-28) moved the command away from where the check is, and nobody
noticed the breakage. Ever since, $? has always been 0 (tr at the end of
the pipe to find merge_head never fails) and other case arms were never
reached.

These days, error_on_no_merge_candidates function is prepared to handle a
detached HEAD case, which was what the code this patch removes used to
handle.

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

Merge branch 'maint'Junio C Hamano Sun, 4 Oct 2009 21:48:51 +0000 (14:48 -0700)

Merge branch 'maint'

* maint:
show-branch: fix segfault when showbranch.default exists

Merge branch 'jc/maint-1.6.4-show-branch-default' into... Junio C Hamano Sun, 4 Oct 2009 21:48:44 +0000 (14:48 -0700)

Merge branch 'jc/maint-1.6.4-show-branch-default' into maint

* jc/maint-1.6.4-show-branch-default:
show-branch: fix segfault when showbranch.default exists

show-branch: fix segfault when showbranch.default existsJunio C Hamano Tue, 9 Jun 2009 06:26:44 +0000 (23:26 -0700)

show-branch: fix segfault when showbranch.default exists

When running "git show-branch" without any parameter in a repository that
has showbranch.default defined, we used to rely on the fact that our
handcrafted option parsing loop never looked at av[0].

The array of default strings had the first real command line argument in
default_arg[0], but the option parser wanted to look at the array starting
at av[1], so we assigned the address of -1th element to av to force the
loop start working from default_arg[0].

This no longer worked since 5734365 (show-branch: migrate to parse-options
API, 2009-05-21), as parse_options_start() saved the incoming &av[0] in
its ctx->out and later in parse_options_end() it did memmove to ctx->out
(with ctx->cpidx == 0), overwriting the memory before default_arg[] array.

I am not sure if this is a bug in parse_options(), or a bug in the caller,
and tonight I do not have enough concentration to figure out which. In
any case, this patch works the issue around.

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

Fix '--relative-date'Johan Sageryd Sat, 3 Oct 2009 04:20:18 +0000 (13:20 +0900)

Fix '--relative-date'

This fixes '--relative-date' so that it does not give '0
year, 12 months', for the interval 360 <= diff < 365.

Signed-off-by: Johan Sageryd <j416@1616.se>
Signed-off-by: Jeff King <peff@peff.net>

tests: make all test files executableMark Rada Fri, 2 Oct 2009 01:59:20 +0000 (21:59 -0400)

tests: make all test files executable

For consistency with the rest of the test files.

Signed-off-by: Mark Rada <marada@uwaterloo.ca>
Signed-off-by: Jeff King <peff@peff.net>

filter-branch: add --prune-empty to option summaryAdam Brewster Fri, 2 Oct 2009 00:52:11 +0000 (20:52 -0400)

filter-branch: add --prune-empty to option summary

Signed-off-by: Adam Brewster <adambrewster@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>

Fix some printf format warningsRamsay Jones Wed, 30 Sep 2009 18:49:24 +0000 (19:49 +0100)

Fix some printf format warnings

commit 51ea551 ("make sure byte swapping is optimal for git"
2009-08-18) introduced a "sane definition for ntohl()/htonl()"
for use on some GNU C platforms. Unfortunately, for some of
these platforms, this results in the introduction of a problem
which is essentially the reverse of a problem that commit 6e1c234
("Fix some warnings (on cygwin) to allow -Werror" 2008-07-3) was
intended to fix.

In particular, on platforms where the uint32_t type is defined
to be unsigned long, the return type of the new ntohl()/htonl()
is causing gcc to issue printf format warnings, such as:

warning: long unsigned int format, unsigned int arg (arg 3)

(nine such warnings, covering six different files). The earlier
commit (6e1c234) needed to suppress these same warnings, except
that the types were in the opposite direction; namely the format
specifier ("%u") was 'unsigned int' and the argument type (ie the
return type of ntohl()) was 'long unsigned int' (aka uint32_t).

In order to suppress these warnings, the earlier commit used the
(C99) PRIu32 format specifier, since the definition of this macro
is suitable for use with the uint32_t type on that platform.
This worked because the return type of the (original) platform
ntohl()/htonl() functions was uint32_t.

In order to suppress these warnings, we change the return type of
the new byte swapping functions in the compat/bswap.h header file
from 'unsigned int' to uint32_t.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Jeff King <peff@peff.net>

send-email: fix mutt regex for grouped aliasesFelipe Contreras Wed, 30 Sep 2009 14:49:36 +0000 (17:49 +0300)

send-email: fix mutt regex for grouped aliases

For example:
alias -group friends foo Foo Bar <foo@bar.com>

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Acked(-and-tested)-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Jeff King <peff@peff.net>

add NORETURN_PTR for function pointersErik Faye-Lund Wed, 30 Sep 2009 18:05:50 +0000 (18:05 +0000)

add NORETURN_PTR for function pointers

Some compilers (including at least MSVC and ARM RVDS) supports
NORETURN on function declarations, but not on function pointers.

This patch makes it possible to define NORETURN for these compilers,
by splitting the NORETURN macro into two - one for function
declarations and one for function pointers.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>

increase portability of NORETURN declarationsErik Faye-Lund Wed, 30 Sep 2009 18:05:49 +0000 (18:05 +0000)

increase portability of NORETURN declarations

Some compilers (including at least MSVC) support NORETURN
on function declarations, but only before the function-name.

This patch makes it possible to define NORETURN to something
meaningful for those compilers.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>

improve reflog date/number heuristicJeff King Thu, 24 Sep 2009 08:28:15 +0000 (04:28 -0400)

improve reflog date/number heuristic

When we show a reflog, we have two ways of naming the entry:
by sequence number (e.g., HEAD@{0}) or by date (e.g.,
HEAD@{10 minutes ago}). There is no explicit option to set
one or the other, but we guess based on whether or not the
user has provided us with a date format, showing them the
date version if they have done so, and the sequence number
otherwise.

This usually made sense if the use did something like "git
log -g --date=relative". However, it didn't make much sense
if the user set the date format using the log.date config
variable; in that case, all of their reflogs would end up as
dates.

This patch records the source of the date format and only
triggers the date-based view if --date= was given on the
command line.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

builtin-mailinfo.c: check error status from rewind... Junio C Hamano Tue, 29 Sep 2009 06:40:08 +0000 (23:40 -0700)

builtin-mailinfo.c: check error status from rewind and ftruncate

A recent "cut at scissors" implementation rewinds and truncates
the output file to store the message when it sees a scissors mark,
but it did not check if these library calls succeeded.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
[sp: Use fseek as rewind returns void]
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Make just opening the generated MSVC solution file... Sebastian Schuberth Mon, 28 Sep 2009 11:34:21 +0000 (13:34 +0200)

Make just opening the generated MSVC solution file not modify it

The format of the generated MSVC solution file is fixed in a way that
just opening it in Visual Studio and immediately closing it again
without performing any modifications does not trigger a prompt to save
the solution file. This behavior was caused by several minor
incompatibilities between the generated file and what Visual Studio
2008 expected, so Visual Studio transparently fixed the file format,
marking it internally as modified.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Acked-by: Marius Storm-Olsen <mstormo@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Make generated MSVC solution file open from Windows... Sebastian Schuberth Mon, 28 Sep 2009 11:34:20 +0000 (13:34 +0200)

Make generated MSVC solution file open from Windows Explorer

In order to be able to open the generated solution file by double-
clicking it in Windows Explorer, all project files need to use DOS
line-endings and a comment about the Visual Studio version needs to
be added to the header of the solution file. This also fixes the icon
that is displayed for the solution file in Windows Explorer.
Note that opening the solution file from a running instance of Visual
Studio already worked before.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Acked-by: Marius Storm-Olsen <mstormo@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

generators/vcproj.pm: remove UNICODE from buildMichael Wookey Mon, 28 Sep 2009 10:46:52 +0000 (20:46 +1000)

generators/vcproj.pm: remove UNICODE from build

Defining UNICODE for MSVC IDE builds results in certain Win32 WIDE
API's receiving ANSI strings. The result of which is an invalid use
of the API and will end in either data corruption or an application
crash.

Prevent the use of WIDE API's when building with the MSVC IDE for
compatibility with msysGit.

Signed-off-by: Michael Wookey <michaelwookey@gmail.com>
Acked-by: Marius Storm-Olsen <mstormo@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

typo fix: Directory `...' exist, ...: s/exist/exists/Jim Meyering Tue, 29 Sep 2009 05:42:25 +0000 (07:42 +0200)

typo fix: Directory `...' exist, ...: s/exist/exists/

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Documentation/git-gc.txt: default --aggressive window... Brandon Casey Mon, 28 Sep 2009 14:56:00 +0000 (09:56 -0500)

Documentation/git-gc.txt: default --aggressive window is 250, not 10

The default --aggressive window has been 250 since 1c192f34 "gc
--aggressive: make it really aggressive", released in git v1.6.3.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Correct minor typo in post-receive hook templateFrederik Schwarzer Mon, 28 Sep 2009 08:25:55 +0000 (10:25 +0200)

Correct minor typo in post-receive hook template

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

git branch -D: give a better error message when lockfil... Miklos Vajna Sat, 26 Sep 2009 23:15:09 +0000 (01:15 +0200)

git branch -D: give a better error message when lockfile creation fails

Previously the old error message just told the user that it was not
possible to delete the ref from the packed-refs file. Give instructions
on how to resolve the problem.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

parse-opt: ignore negation of OPT_NONEG for ambiguity... Andreas Schwab Fri, 25 Sep 2009 18:44:44 +0000 (20:44 +0200)

parse-opt: ignore negation of OPT_NONEG for ambiguity checks

parse_long_opt always matches both --opt and --no-opt for any option
"opt", and only get_value checks whether --no-opt is actually valid.
Since the options for git branch contains both "no-merged" and "merged"
there are two matches for --no-merge, but no exact match. With this
patch the negation of a NONEG option is rejected earlier, but it changes
the error message from "option `no-opt' isn't available" to "unknown
option `no-opt'".

[jk: added test]

Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

make 'git clone' ask the remote only for objects it... Nicolas Pitre Sat, 26 Sep 2009 03:54:42 +0000 (23:54 -0400)

make 'git clone' ask the remote only for objects it cares about

Current behavior of 'git clone' when not using --mirror is to fetch
everything from the peer, and then filter out unwanted refs just before
writing them out to the cloned repository. This may become highly
inefficient if the peer has an unusual ref namespace, or if it simply
has "remotes" refs of its own, and those locally unwanted refs are
connecting to a large set of objects which becomes unreferenced as soon
as they are fetched.

Let's filter out those unwanted refs from the peer _before_ asking it
what refs we want to fetch instead, which is the most logical thing to
do anyway.

Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

git-am: force egrep to use correct characters setChristian Himpel Fri, 25 Sep 2009 16:43:20 +0000 (18:43 +0200)

git-am: force egrep to use correct characters set

According to egrep(1) the US-ASCII table is used when LC_ALL=C is set.
We do not rely here on the LC_ALL value we get from the environment.

Signed-off-by: Christian Himpel <chressie@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

git-am: fixed patch_format detection according to RFC2822Christian Himpel Fri, 25 Sep 2009 15:14:31 +0000 (17:14 +0200)

git-am: fixed patch_format detection according to RFC2822

RFC2822 specifies in paragraph 3.6.8, that optional header fields are
made up of any printable US-ASCII character except ' ' (space) and ':'
(colon).

The pattern for the egrep command is changed to match all of these
characters.

Signed-off-by: Christian Himpel <chressie@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

send-email: fix obscure error when encryption=tls and... Yakov Lerner Fri, 25 Sep 2009 22:10:21 +0000 (15:10 -0700)

send-email: fix obscure error when encryption=tls and smtp cannot connect

When encryption=tls and we cannot connect to the SMTP server,
git-send-email was printing an obtuse perl error:

Can't call method "command" on an undefined value
at git-send-email line 927.

This can occur when smtp host or port is misspelled, or the network
is down, and encryption has been set to tls.

Instead we expect some familiar "Cannot connect to SERVER:PORT"
message. Fix it to print normal "smtp can't connect" diagnostics.

Signed-off-by: Yakov Lerner <iler.ml@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

bash: teach 'git checkout' optionsSZEDER Gábor Thu, 24 Sep 2009 12:23:15 +0000 (14:23 +0200)

bash: teach 'git checkout' options

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

perl/Makefile.PL: detect MakeMaker versions incompatibl... Brandon Casey Thu, 24 Sep 2009 18:21:03 +0000 (13:21 -0500)

perl/Makefile.PL: detect MakeMaker versions incompatible with DESTDIR

It appears that ExtUtils::MakeMaker versions older than 6.11 do not
implement the DESTDIR mechanism. So add a test to the generated perl.mak
to detect when DESTDIR is used along with a too old ExtUtils::MakeMaker and
abort with a message suggesting the use of NO_PERL_MAKEMAKER.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

pull: Clarify "helpful" message for another corner... v1.6.5-rc2Junio C Hamano Sun, 13 Sep 2009 20:38:48 +0000 (13:38 -0700)

pull: Clarify "helpful" message for another corner case

When the remote branch we asked for merging did not exist in the set of
fetched refs, we unconditionally hinted that it was because of lack of
configuration. It is not necessarily so, and risks sending users for a
wild goose chase.

Make sure to check if that is indeed the case before telling a wild guess
to the user.

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

Update "describe" documentation to match realityThiago Farina Tue, 22 Sep 2009 23:48:06 +0000 (19:48 -0400)

Update "describe" documentation to match reality

A sample "git describe -h" did not match what the program actually says.

Signed-off-by: Thiago Farina <tfransosi@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

bash: teach 'git reset --patch'SZEDER Gábor Tue, 15 Sep 2009 10:21:45 +0000 (12:21 +0200)

bash: teach 'git reset --patch'

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>