gitweb.git
Merge branch 'sr/blame-incomplete'Junio C Hamano Tue, 10 Nov 2009 20:29:53 +0000 (12:29 -0800)

Merge branch 'sr/blame-incomplete'

* sr/blame-incomplete:
blame: make sure that the last line ends in an LF

git-update-index.txt: Document the --really-refresh... Štěpán Němec Tue, 10 Nov 2009 18:11:51 +0000 (19:11 +0100)

git-update-index.txt: Document the --really-refresh option.

Add the description next to --assume-unchanged because this option is only
useful in a special case of using that option.

Signed-off-by: Štěpán Němec <stepnem@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Mon, 9 Nov 2009 02:16:04 +0000 (18:16 -0800)

Merge branch 'maint'

* maint:
Add intermediate build products to .gitignore

Add intermediate build products to .gitignoreJonathan Nieder Sun, 8 Nov 2009 22:07:16 +0000 (16:07 -0600)

Add intermediate build products to .gitignore

Temporaries such as configure.ac+ and Documentation/*.xml+
sometimes remain after an interrupted build. Tell git not to
track them.

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

Merge branch 'jc/commit-s-subject-is-not-a-footer'Junio C Hamano Sat, 7 Nov 2009 07:17:47 +0000 (23:17 -0800)

Merge branch 'jc/commit-s-subject-is-not-a-footer'

* jc/commit-s-subject-is-not-a-footer:
builtin-commit.c: fix logic to omit empty line before existing footers

builtin-commit.c: fix logic to omit empty line before... Junio C Hamano Sat, 7 Nov 2009 07:06:06 +0000 (23:06 -0800)

builtin-commit.c: fix logic to omit empty line before existing footers

"commit -s" used to add an empty line before adding S-o-b line only when
the last line of the existing log message is not another S-o-b line, but
c1e01b0 (commit: More generous accepting of RFC-2822 footer lines.,
2009-10-28) introduced logic to omit this empty line when the message ends
with a run of "footer" lines, to cover S-o-b's friends, e.g. Acked-by.

However, the logic was overzealous and missed one corner case. A message
that consists of a single line that begins with Token + colon, it can be
mistaken as a S-o-b's friend. We do want an empty line in such a case.

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

pack-objects: move thread autodetection closer to relev... Nicolas Pitre Wed, 4 Nov 2009 21:32:46 +0000 (16:32 -0500)

pack-objects: move thread autodetection closer to relevant code

Let's keep thread stuff close together if possible. And in this case,
this even reduces the #ifdef noise, and allows for skipping the
autodetection altogether if delta search is not needed (like with a pure
clone).

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

Merge branch 'maint'Junio C Hamano Thu, 5 Nov 2009 00:34:02 +0000 (16:34 -0800)

Merge branch 'maint'

* maint:
Fix documentation grammar typo
Allow curl helper to work without a local repository
Require a struct remote in transport_get()

Fix documentation grammar typoGisle Aas Wed, 4 Nov 2009 21:57:46 +0000 (22:57 +0100)

Fix documentation grammar typo

Introduced in 492cf3f (More precise description of 'git describe --abbrev', 2009-10-29)

Signed-off-by: Gisle Aas <gisle@aas.no>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Allow curl helper to work without a local repositoryDaniel Barkalow Wed, 4 Nov 2009 02:52:35 +0000 (21:52 -0500)

Allow curl helper to work without a local repository

It's okay to use the curl helper without a local repository, so long
as you don't use "fetch". There aren't any git programs that would try
to use it, and it doesn't make sense to try it (since there's nowhere
to write the results), but we may as well be clear.

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

Require a struct remote in transport_get()Daniel Barkalow Wed, 4 Nov 2009 02:38:51 +0000 (21:38 -0500)

Require a struct remote in transport_get()

cmd_ls_remote() was calling transport_get() with a NULL remote and a
non-NULL url in the case where it was run outside a git
repository. This involved a bunch of ill-tested special
cases. Instead, simply get the struct remote for the URL with
remote_get(), which works fine outside a git repository, and can also
take global options into account.

This fixes a tiny and obscure bug where "git ls-remote" without a repo
didn't support global url.*.insteadOf, even though "git clone" and
"git ls-remote" in any repo did.

Also, enforce that all callers provide a struct remote to transport_get().

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

Merge branch 'jn/show-normalized-refs'Junio C Hamano Mon, 2 Nov 2009 18:46:36 +0000 (10:46 -0800)

Merge branch 'jn/show-normalized-refs'

* jn/show-normalized-refs:
t1402: Make test executable

t1402: Make test executableStephen Boyd Mon, 2 Nov 2009 09:30:05 +0000 (01:30 -0800)

t1402: Make test executable

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

Merge branch 'bg/clone-doc' into maintJunio C Hamano Mon, 2 Nov 2009 06:51:04 +0000 (22:51 -0800)

Merge branch 'bg/clone-doc' into maint

* bg/clone-doc:
git-clone.txt: Fix grammar and formatting

Merge branch 'maint'Junio C Hamano Mon, 2 Nov 2009 06:10:08 +0000 (22:10 -0800)

Merge branch 'maint'

* maint:
Makefile: add compat/bswap.h to LIB_H

Makefile: add compat/bswap.h to LIB_HDmitry V. Levin Sun, 1 Nov 2009 23:09:05 +0000 (02:09 +0300)

Makefile: add compat/bswap.h to LIB_H

Starting with commit 51ea55190b6e72c77c96754c1bf2f149a4714848,
git-compat-util.h includes compat/bswap.h

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Revert "Don't create the $GIT_DIR/branches directory... Junio C Hamano Sat, 31 Oct 2009 18:16:50 +0000 (11:16 -0700)

Revert "Don't create the $GIT_DIR/branches directory on init"

This reverts commit 0cc5691a8b05a7eabdeef520c94b1bb3bcac7874.

There is not enough justification for doing this. We do not update
things in .git/branches and .git/remotes anymore, but still do read
information from there and will keep doing so.

Besides, this breaks quite a lot of tests in t55?? series.

fixup tr/stash-format mergeJunio C Hamano Sat, 31 Oct 2009 03:18:31 +0000 (20:18 -0700)

fixup tr/stash-format merge

Merge branch 'js/diff-verbose-submodule'Junio C Hamano Sat, 31 Oct 2009 03:16:26 +0000 (20:16 -0700)

Merge branch 'js/diff-verbose-submodule'

* js/diff-verbose-submodule:
add tests for git diff --submodule
Add the --submodule option to the diff option family

Merge branch 'jc/checkout-auto-track'Junio C Hamano Sat, 31 Oct 2009 03:07:53 +0000 (20:07 -0700)

Merge branch 'jc/checkout-auto-track'

* jc/checkout-auto-track:
git checkout --no-guess
DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
check_filename(): make verify_filename() callable without dying

Merge branch 'jn/show-normalized-refs'Junio C Hamano Sat, 31 Oct 2009 03:07:33 +0000 (20:07 -0700)

Merge branch 'jn/show-normalized-refs'

* jn/show-normalized-refs:
check-ref-format: simplify --print implementation
git check-ref-format --print
Add tests for git check-ref-format

Conflicts:
Documentation/git-check-ref-format.txt

Merge branch 'jc/maint-1.6.3-graft-trailing-space'Junio C Hamano Sat, 31 Oct 2009 03:07:08 +0000 (20:07 -0700)

Merge branch 'jc/maint-1.6.3-graft-trailing-space'

* jc/maint-1.6.3-graft-trailing-space:
info/grafts: allow trailing whitespaces at the end of line

Merge branch 'ak/bisect-reset-to-switch'Junio C Hamano Sat, 31 Oct 2009 03:07:00 +0000 (20:07 -0700)

Merge branch 'ak/bisect-reset-to-switch'

* ak/bisect-reset-to-switch:
bisect reset: Allow resetting to any commit, not just a branch

Merge branch 'tr/maint-roff-quote'Junio C Hamano Sat, 31 Oct 2009 03:05:54 +0000 (20:05 -0700)

Merge branch 'tr/maint-roff-quote'

* tr/maint-roff-quote:
Quote ' as \(aq in manpages

Merge branch 'ja/fetch-doc'Junio C Hamano Sat, 31 Oct 2009 03:05:47 +0000 (20:05 -0700)

Merge branch 'ja/fetch-doc'

* ja/fetch-doc:
Documentation/merge-options.txt: order options in alphabetical groups
Documentation/git-pull.txt: Add subtitles above included option files
Documentation/fetch-options.txt: order options alphabetically

Merge branch 'cb/doc-fetch-pull-merge'Junio C Hamano Sat, 31 Oct 2009 03:05:38 +0000 (20:05 -0700)

Merge branch 'cb/doc-fetch-pull-merge'

* cb/doc-fetch-pull-merge:
modernize fetch/merge/pull examples

Merge branch 'maint'Junio C Hamano Sat, 31 Oct 2009 00:19:07 +0000 (17:19 -0700)

Merge branch 'maint'

* maint:
clone: detect extra arguments
clone: fix help on options
push: fix typo in usage
More precise description of 'git describe --abbrev'

clone: detect extra argumentsJonathan Nieder Thu, 29 Oct 2009 08:10:30 +0000 (03:10 -0500)

clone: detect extra arguments

If git clone is given more than two non-option arguments, it
silently throws away all but the first one. Complain instead.

Discovered by comparing the new builtin clone to the old
git-clone.sh.

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

clone: fix help on optionsJunio C Hamano Fri, 30 Oct 2009 22:15:36 +0000 (15:15 -0700)

clone: fix help on options

Fix incorrect description of --recursive, and stop listing the historical
synonym --naked that is not advertised anywhere.

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

push: fix typo in usageJeff King Fri, 30 Oct 2009 15:04:53 +0000 (11:04 -0400)

push: fix typo in usage

Missing ")".

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

t915{0,1}: use $TEST_DIRECTORYJeff King Fri, 30 Oct 2009 20:10:17 +0000 (16:10 -0400)

t915{0,1}: use $TEST_DIRECTORY

Because --root can put our trash directories elsewhere,
using ".." may not always work.

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

Make t9150 and t9151 test scripts executableMichael J Gruber Thu, 29 Oct 2009 15:26:20 +0000 (16:26 +0100)

Make t9150 and t9151 test scripts executable

so that they can be run individually as
(cd t && ./t9150-svk-mergetickets.sh)
etc. just like all other test scripts.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

More precise description of 'git describe --abbrev'Gisle Aas Thu, 29 Oct 2009 21:29:35 +0000 (22:29 +0100)

More precise description of 'git describe --abbrev'

Also adds a note about why the output in the examples might give
different output today.

Signed-off-by: Gisle Aas <gisle@aas.no>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Don't create the $GIT_DIR/branches directory on initRobin Rosenberg Fri, 30 Oct 2009 17:20:28 +0000 (18:20 +0100)

Don't create the $GIT_DIR/branches directory on init

Git itself does not even look at this directory. Any tools that
actually needs it should create it itself.

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Make the MSVC projects use PDB/IDB files named after... Sebastian Schuberth Mon, 19 Oct 2009 16:40:47 +0000 (18:40 +0200)

Make the MSVC projects use PDB/IDB files named after the project

Instead of having all PDB files for all projects named "vc90.pdb", name them
after the respective project to make the relation more clear (and to avoid name
clashes when copying files around).

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Acked-by: Marius Storm-Olsen <mstormo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Use faster byte swapping when compiling with MSVCSebastian Schuberth Mon, 19 Oct 2009 16:37:05 +0000 (18:37 +0200)

Use faster byte swapping when compiling with MSVC

When compiling with MSVC on x86-compatible, use an intrinsic for byte swapping.
In contrast to the GCC path, we do not prefer inline assembly here as it is not
supported for the x64 platform.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Wed, 28 Oct 2009 18:21:46 +0000 (11:21 -0700)

Merge branch 'maint'

* maint:
help -a: do not unnecessarily look for a repository
Do not try to remove directories when removing old links
rebase -i: more graceful handling of invalid commands
help -i: properly error out if no info viewer can be found

commit: More generous accepting of RFC-2822 footer... David Brown Wed, 28 Oct 2009 17:13:44 +0000 (10:13 -0700)

commit: More generous accepting of RFC-2822 footer lines.

'git commit -s' will insert a blank line before the Signed-off-by
line at the end of the message, unless this last line is a
Signed-off-by line itself. Common use has other trailing lines
at the ends of commit text, in the style of RFC2822 headers.

Be more generous in considering lines to be part of this footer.
If the last paragraph of the commit message reasonably resembles
RFC-2822 formatted lines, don't insert that blank line.

The new Signed-off-by line is still only suppressed when the
author's existing Signed-off-by is the last line of the message.

Signed-off-by: David Brown <davidb@quicinc.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

bash completion: difftool accepts the same options... Markus Heidelberg Wed, 28 Oct 2009 09:45:38 +0000 (10:45 +0100)

bash completion: difftool accepts the same options as diff

So complete refs, files after the double-dash and some diff options that
make sense for difftool.

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

help -a: do not unnecessarily look for a repositoryJohannes Schindelin Fri, 4 Sep 2009 10:22:36 +0000 (12:22 +0200)

help -a: do not unnecessarily look for a repository

Although 'git help -a' actually doesn't need to be run inside a git
repository and uses no repository-specific information, it looks for a git
directory. On 'git <TAB><TAB>' the bash completion runs 'git help -a' and
unnecessary searching for a git directory can be annoying in auto-mount
environments. With this commit, 'git help' no longer searches for a
repository when run with the -a option.

Reported by Vincent Danjean through http://bugs.debian.org/539273

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

bash: complete more options for 'git rebase'Björn Gustavsson Sat, 17 Oct 2009 09:33:38 +0000 (11:33 +0200)

bash: complete more options for 'git rebase'

Complete all long options for 'git rebase' except --no-verify
(probably used very seldom) and the long options corresponding
to -v, -q, and -f.

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>

Merge branch 'maint-1.6.4' into maintJunio C Hamano Wed, 28 Oct 2009 07:03:24 +0000 (00:03 -0700)

Merge branch 'maint-1.6.4' into maint

* maint-1.6.4:
rebase -i: more graceful handling of invalid commands
help -i: properly error out if no info viewer can be found

Do not try to remove directories when removing old... Sebastian Schuberth Tue, 27 Oct 2009 11:23:33 +0000 (12:23 +0100)

Do not try to remove directories when removing old links

When building Git with MSVC on Windows, directories named after the Git alias
are created for the output files, e.g. there is a "git-merge-index" directory
next to the "git-merge-index.exe" executable in the build root. Previously,
"make all" just checked if "git-merge-index" and "git-merge-index.exe" are the
same file, and if not, tried to remove "git-merge-index". This fails in the
case of "git-merge-index" being a directory, which is why this is checked now.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

rebase -i: more graceful handling of invalid commandsJan Krüger Tue, 27 Oct 2009 14:58:14 +0000 (15:58 +0100)

rebase -i: more graceful handling of invalid commands

Currently, when there is an invalid command, the rest of the line is
still treated as if the command had been valid, i.e. rebase -i attempts
to produce a patch, using the next argument as a SHA1 name. If there is
no next argument or an invalid one, very confusing error messages
appear (the line was '.'; path to git-rebase-todo substituted):

Unknown command: .
fatal: ambiguous argument 'Please fix this in the file $somefile.':
unknown revision or path not in the working tree.
Use '--' to separate paths from revisions
fatal: Not a valid object name Please fix this in the file $somefile.
fatal: bad revision 'Please fix this in the file $somefile.'

Instead, verify the validity of the remaining line and error out earlier
if necessary.

Signed-off-by: Jan Krüger <jk@jk.gs>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

help -i: properly error out if no info viewer can be... Gerrit Pape Tue, 27 Oct 2009 13:31:33 +0000 (13:31 +0000)

help -i: properly error out if no info viewer can be found

With this commit, git help -i <cmd> prints an error message and exits
non-zero instead of being silent and exit code 0.

Reported by Trent W. Buck through
http://bugs.debian.org/537664

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

Merge git://git.bogomips.org/git-svnJunio C Hamano Tue, 27 Oct 2009 23:07:41 +0000 (16:07 -0700)

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

* git://git.bogomips.org/git-svn:
git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents
git-svn: add test data for SVN 1.5+ merge, with script.
git-svn: convert SVK merge tickets to extra parents
git-svn: allow test setup script to support PERL env. var
git-svn: add test data for SVK merge, with script.
git svn: fix fetch where glob is on the top-level URL

Merge git://repo.or.cz/git-guiJunio C Hamano Tue, 27 Oct 2009 21:55:37 +0000 (14:55 -0700)

Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
git-gui: adjust the minimum height of diff pane for shorter screen height
git-gui: fix use of uninitialized variable
git-gui: store wm state and fix wm geometry
git-gui: Ensure submodule path is quoted properly
git-gui: fix diff for partially staged submodule changes
git-gui: Update russian translation
git-gui: Limit display to a maximum number of files
git-gui: remove warning when deleting correctly merged remote branch
git-gui: Added Greek translation & glossary
git-gui: display summary when showing diff of a submodule

git-gui: adjust the minimum height of diff pane for... Vietor Liu Fri, 16 Oct 2009 09:41:26 +0000 (17:41 +0800)

git-gui: adjust the minimum height of diff pane for shorter screen height

When the main window is maximized, if the screen height is shorter (e.g.
Netbook screen 1024x600), both the partial commit pane and the status bar
are hidden. The diff pane is resizable, so that it can use less vertical
height, allowing the overall window to be shorter and still display both
the entire commit pane and status bar.

Signed-off-by: Vietor Liu <vietor@vxwo.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo... Sam Vilain Tue, 20 Oct 2009 02:42:03 +0000 (15:42 +1300)

git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents

This feature is long overdue; convert SVN's merge representation to git's
as revisions are imported. This works by converting the list of revisions
in each line of the svn:mergeinfo into git revision ranges, and then
checking the latest of each of these revision ranges for A) being new and
B) now being completely merged.

Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz>
Acked-by: Eric Wong <normalperson@yhbt.net>

git-svn: add test data for SVN 1.5+ merge, with script.Sam Vilain Tue, 20 Oct 2009 02:42:02 +0000 (15:42 +1300)

git-svn: add test data for SVN 1.5+ merge, with script.

Dump generated with SVN 1.5.1 (on lenny amd64). This test
should hopefully cover all but a few intermediate versions of
the svnmerge.py script.

Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz>
Acked-by: Eric Wong <normalperson@yhbt.net>

git-svn: convert SVK merge tickets to extra parentsSam Vilain Tue, 20 Oct 2009 02:42:01 +0000 (15:42 +1300)

git-svn: convert SVK merge tickets to extra parents

SVK is a simple case to start with, as its idea of merge parents
matches git's one. When a svk:merge ticket is encountered, check each
of the listed merged revisions to see if they are in the history of
this commit; if not, then we have encountered a merge - record it.

[ew: minor formatting cleanups]

Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz>
Acked-by: Eric Wong <normalperson@yhbt.net>

git-svn: allow test setup script to support PERL env... Sam Vilain Tue, 20 Oct 2009 02:42:00 +0000 (15:42 +1300)

git-svn: allow test setup script to support PERL env. var

Possibly the 'perl' in the PATH is not the one to be used for the tests;
let PERL set in the environment select it.

Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz>
Acked-by: Eric Wong <normalperson@yhbt.net>

git-svn: add test data for SVK merge, with script.Sam Vilain Tue, 20 Oct 2009 02:41:59 +0000 (15:41 +1300)

git-svn: add test data for SVK merge, with script.

Dump generated with SVK 2.0.2 and SVN 1.5.1 (on lenny amd64).

Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz>
Acked-by: Eric Wong <normalperson@yhbt.net>

git svn: fix fetch where glob is on the top-level URLEric Wong Fri, 23 Oct 2009 06:39:04 +0000 (23:39 -0700)

git svn: fix fetch where glob is on the top-level URL

In cases where the top-level URL we're tracking is the path we
glob against, we can once again track odd repositories that keep
branches/tags at the top level. This regression was introduced
in commit 6f5748e14cc5bb0a836b649fb8e2d6a5eb166f1d.

Thanks to Daniel Cordero for the original bug report and
bisection.

Signed-off-by: Eric Wong <normalperson@yhbt.net>

Update draft release notes to 1.6.6Junio C Hamano Mon, 26 Oct 2009 01:41:09 +0000 (18:41 -0700)

Update draft release notes to 1.6.6

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

Merge branch 'sb/gitweb-link-author'Junio C Hamano Mon, 26 Oct 2009 01:40:21 +0000 (18:40 -0700)

Merge branch 'sb/gitweb-link-author'

* sb/gitweb-link-author:
gitweb: linkify author/committer names with search

Merge branch 'jk/maint-cvsimport-pathname'Junio C Hamano Mon, 26 Oct 2009 01:40:21 +0000 (18:40 -0700)

Merge branch 'jk/maint-cvsimport-pathname'

* jk/maint-cvsimport-pathname:
cvsimport: fix relative argument filenames

Merge branch 'iv/tar-lzma-xz'Junio C Hamano Mon, 26 Oct 2009 01:40:21 +0000 (18:40 -0700)

Merge branch 'iv/tar-lzma-xz'

* iv/tar-lzma-xz:
import-tars: Add support for tarballs compressed with lzma, xz

Merge branch 'bg/clone-doc'Junio C Hamano Mon, 26 Oct 2009 01:40:20 +0000 (18:40 -0700)

Merge branch 'bg/clone-doc'

* bg/clone-doc:
git-clone.txt: Fix grammar and formatting

Merge branch 'jc/receive-pack-auto'Junio C Hamano Mon, 26 Oct 2009 01:40:20 +0000 (18:40 -0700)

Merge branch 'jc/receive-pack-auto'

* jc/receive-pack-auto:
receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
gc --auto --quiet: make the notice a bit less verboase

Merge branch 'jc/fsck-default-full'Junio C Hamano Mon, 26 Oct 2009 01:40:20 +0000 (18:40 -0700)

Merge branch 'jc/fsck-default-full'

* jc/fsck-default-full:
fsck: default to "git fsck --full"

Sync with 1.6.5.2Junio C Hamano Mon, 26 Oct 2009 01:38:56 +0000 (18:38 -0700)

Sync with 1.6.5.2

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

GIT 1.6.5.2 v1.6.5.2Junio C Hamano Mon, 26 Oct 2009 01:37:56 +0000 (18:37 -0700)

GIT 1.6.5.2

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

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

Merge branch 'maint'Junio C Hamano Sun, 25 Oct 2009 07:21:26 +0000 (00:21 -0700)

Merge branch 'maint'

* maint:
t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test
Work around option parsing bug in the busybox tar implementation

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>

Merge branch 'maint'Junio C Hamano Sat, 24 Oct 2009 05:40:18 +0000 (22:40 -0700)

Merge branch 'maint'

* maint:
Fix list of released versions in the toc document
Do not fail "describe --always" in a tag-less repository

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

add tests for git diff --submoduleJens Lehmann Fri, 23 Oct 2009 11:25:33 +0000 (13:25 +0200)

add tests for git diff --submodule

Copied from the submodule summary test and changed to reflect the
differences in the output of git diff --submodule.

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

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>

Quote ' as \(aq in manpagesThomas Rast Thu, 22 Oct 2009 08:19:06 +0000 (10:19 +0200)

Quote ' as \(aq in manpages

The docbook/xmlto toolchain insists on quoting ' as \'. This does
achieve the quoting goal, but modern 'man' implementations turn the
apostrophe into a unicode "proper" apostrophe (given the right
circumstances), breaking code examples in many of our manpages.

Quote them as \(aq instead, which is an "apostrophe quote" as per the
groff_char manpage.

Unfortunately, as Anders Kaseorg kindly pointed out, this is not
portable beyond groff, so we add an extra Makefile variable GNU_ROFF
which you need to enable to get the new quoting.

Thanks also to Miklos Vajna for documentation.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/merge-options.txt: order options in alpha... Jari Aalto Thu, 22 Oct 2009 19:25:20 +0000 (22:25 +0300)

Documentation/merge-options.txt: order options in alphabetical groups

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/git-pull.txt: Add subtitles above include... Jari Aalto Thu, 22 Oct 2009 14:14:57 +0000 (17:14 +0300)

Documentation/git-pull.txt: Add subtitles above included option files

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
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>

Merge branch 'maint'Junio C Hamano Thu, 22 Oct 2009 00:33:15 +0000 (17:33 -0700)

Merge branch 'maint'

* maint:
Document `delta` attribute in "git help attributes".
Mark files in t/t5100 as UTF-8
Remove a left-over file from t/t5100

Merge branch 'gb/maint-gitweb-esc-param'Junio C Hamano Thu, 22 Oct 2009 00:32:59 +0000 (17:32 -0700)

Merge branch 'gb/maint-gitweb-esc-param'

* gb/maint-gitweb-esc-param:
gitweb: fix esc_param

blame: make sure that the last line ends in an LFJohannes Schindelin Tue, 20 Oct 2009 03:06:28 +0000 (22:06 -0500)

blame: make sure that the last line ends in an LF

This is convenient when parsing multiple the blame of multiple files,
for example:

git ls-files -z --exclude-standard -- "*.[ch]" |
xargs --null -n 1 git blame -p > output

and then analyzing the 'output' file using a seperate script.

Currently the parsing is difficult when not all files have a newline
at EOF, this patch ensures that even such files have a newline at the
end of the blame output.

Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
CC: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-clone.txt: Fix grammar and formattingBjörn Gustavsson Tue, 20 Oct 2009 20:38:38 +0000 (22:38 +0200)

git-clone.txt: Fix grammar and formatting

Add the missing definite article ("the") in several places.

Change "note to..." to "note for...", since "note to" means that
that the note is addressed to someone (source: Google search).

Change "progressbar" to "progress bar" (source: Wikipedia).

Format git commands, options, and file names consistently using
back quotes (i.e. a fixed font in the resulting HTML document).

Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

import-tars: Add support for tarballs compressed with... Ingmar Vanhassel Tue, 20 Oct 2009 10:29:32 +0000 (12:29 +0200)

import-tars: Add support for tarballs compressed with lzma, xz

Also handle the extensions .tlz and .txz, aliases for .tar.lzma and
.tar.xz respectively.

Signed-off-by: Ingmar Vanhassel <ingmar@exherbo.org>
Liked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

receive-pack: run "gc --auto --quiet" and optionally... Junio C Hamano Tue, 20 Oct 2009 21:56:40 +0000 (14:56 -0700)

receive-pack: run "gc --auto --quiet" and optionally "update-server-info"

Introduce two new configuration variables, receive.autogc (defaults to
true) and receive.updateserverinfo (defaults to false). When these are
set, receive-pack runs "gc --auto --quiet" and "update-server-info"
respectively after it finishes receiving data from "git push" and updating
refs.

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

gc --auto --quiet: make the notice a bit less verboaseJunio C Hamano Wed, 21 Oct 2009 22:26:10 +0000 (15:26 -0700)

gc --auto --quiet: make the notice a bit less verboase

When "gc --auto --quiet" decides there is something to do, it tells the
user what it is doing, as it is going to make the user wait for a bit.

But the message was a bit too long.

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

git checkout --no-guessJunio C Hamano Sun, 18 Oct 2009 07:49:23 +0000 (00:49 -0700)

git checkout --no-guess

Porcelains may want to make sure their calls to "git checkout" will
reliably fail regardless of the presense of random remote tracking
branches by the new DWIMmery introduced.

Luckily all existing in-tree callers have extra checks to make sure they
feed local branch name when they want to switch, or they explicitly ask to
detach HEAD at the given commit, so there is no need to add this option
for them.

As this is strictly script-only option, do not even bother to document it,
and do bother to hide it from "git checkout -h".

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

Documentation/fetch-options.txt: order options alphabet... Jari Aalto Wed, 21 Oct 2009 20:07:49 +0000 (23:07 +0300)

Documentation/fetch-options.txt: order options alphabetically

git-fetch.{1,html} will be helped with this patch

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

modernize fetch/merge/pull examplesClemens Buchacher Wed, 21 Oct 2009 17:21:23 +0000 (19:21 +0200)

modernize fetch/merge/pull examples

The "git pull" documentation has examples which follow an outdated
style. Update the examples to use "git merge" where appropriate and
move the examples to the corresponding manpages.

Furthermore,

- show that pull is equivalent to fetch and merge, which is still a
frequently asked question,

- explain the default fetch refspec.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
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>

fsck: default to "git fsck --full"Junio C Hamano Tue, 20 Oct 2009 18:46:55 +0000 (11:46 -0700)

fsck: default to "git fsck --full"

Linus and other git developers from the early days trained their fingers
to type the command, every once in a while even without thinking, to check
the consistency of the repository back when the lower core part of the git
was still being developed. Developers who wanted to make sure that git
correctly dealt with packfiles could deliberately trigger their creation
and checked them after they were created carefully, but loose objects are
the ones that are written by various commands from random codepaths. It
made some technical sense to have a mode that checked only loose objects
from the debugging point of view for that reason.

Even for git developers, there no longer is any reason to type "git fsck"
every five minutes these days, worried that some newly created objects
might be corrupt due to recent change to git.

The reason we did not make "--full" the default is probably we trust our
filesystems a bit too much. At least, we trusted filesystems more than we
trusted the lower core part of git that was under development.

Once a packfile is created and we always use it read-only, there didn't
seem to be much point in suspecting that the underlying filesystems or
disks may corrupt them in such a way that is not caught by the SHA-1
checksum over the entire packfile and per object checksum. That trust in
the filesystems might have been a good tradeoff between fsck performance
and reliability on platforms git was initially developed on and for, but
it may not be true anymore as we run on many more platforms these days.

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

Merge branch 'maint'Junio C Hamano Tue, 20 Oct 2009 07:13:13 +0000 (00:13 -0700)

Merge branch 'maint'

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

gitweb: linkify author/committer names with searchStephen Boyd Fri, 16 Oct 2009 04:14:59 +0000 (21:14 -0700)

gitweb: linkify author/committer names with search

It's nice to search for an author by merely clicking on their name in
gitweb. This is usually faster than selecting the name, copying the
selection, pasting it into the search box, selecting between
author/committer and then hitting enter.

Linkify the avatar icon in log/shortlog view because the icon is directly
adjacent to the name and thus more related. The same is not true
when in commit/tag view where the icon is farther away.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
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>

Add the --submodule option to the diff option familyJohannes Schindelin Mon, 19 Oct 2009 12:38:32 +0000 (14:38 +0200)

Add the --submodule option to the diff option family

When you use the option --submodule=log you can see the submodule
summaries inlined in the diff, instead of not-quite-helpful SHA-1 pairs.

The format imitates what "git submodule summary" shows.

To do that, <path>/.git/objects/ is added to the alternate object
databases (if that directory exists).

This option was requested by Jens Lehmann at the GitTogether in Berlin.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

stash list: drop the default limit of 10 stashesThomas Rast Mon, 19 Oct 2009 15:48:12 +0000 (17:48 +0200)

stash list: drop the default limit of 10 stashes

'git stash list' had an undocumented limit of 10 stashes, unless other
git-log arguments were specified. This surprised at least one user,
but possibly served to cut the output below a screenful without using
a pager.

Since the last commit, 'git stash list' will fire up a pager according
to the same rules as the 'git log' it calls, so we can drop the limit.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>