gitweb.git
Sync with 1.6.6.1Junio C Hamano Wed, 20 Jan 2010 22:01:28 +0000 (14:01 -0800)

Sync with 1.6.6.1

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

Git 1.6.6.1 v1.6.6.1Junio C Hamano Wed, 20 Jan 2010 21:29:21 +0000 (13:29 -0800)

Git 1.6.6.1

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

Merge branch 'bg/maint-remote-update-default' into... Junio C Hamano Wed, 20 Jan 2010 21:23:59 +0000 (13:23 -0800)

Merge branch 'bg/maint-remote-update-default' into maint

* bg/maint-remote-update-default:
Fix "git remote update" with remotes.defalt set

Merge branch 'sb/maint-octopus' into maintJunio C Hamano Wed, 20 Jan 2010 21:02:24 +0000 (13:02 -0800)

Merge branch 'sb/maint-octopus' into maint

* sb/maint-octopus:
octopus: remove dead code
octopus: reenable fast-forward merges
octopus: make merge process simpler to follow

Conflicts:
git-merge-octopus.sh

Merge branch 'bg/maint-add-all-doc' into maintJunio C Hamano Wed, 20 Jan 2010 21:01:33 +0000 (13:01 -0800)

Merge branch 'bg/maint-add-all-doc' into maint

* bg/maint-add-all-doc:
git-rm doc: Describe how to sync index & work tree
git-add/rm doc: Consistently back-quote
Documentation: 'git add -A' can remove files

Merge branch 'maint-1.6.5' into maintJunio C Hamano Wed, 20 Jan 2010 21:01:19 +0000 (13:01 -0800)

Merge branch 'maint-1.6.5' into maint

* maint-1.6.5:
Git 1.6.5.8
Fix mis-backport of t7002
bash completion: factor submodules into dirty state
reset: unbreak hard resets with GIT_WORK_TREE

Conflicts:
Documentation/git.txt
GIT-VERSION-GEN
RelNotes

Git 1.6.5.8 v1.6.5.8Junio C Hamano Wed, 20 Jan 2010 20:44:59 +0000 (12:44 -0800)

Git 1.6.5.8

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

Merge branch 'jk/maint-1.6.5-reset-hard' into maint... Junio C Hamano Wed, 20 Jan 2010 20:22:58 +0000 (12:22 -0800)

Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5

* jk/maint-1.6.5-reset-hard:
reset: unbreak hard resets with GIT_WORK_TREE

Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule... Junio C Hamano Wed, 20 Jan 2010 20:22:54 +0000 (12:22 -0800)

Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into maint-1.6.5

* tr/maint-1.6.5-bash-prompt-show-submodule-changes:
bash completion: factor submodules into dirty state

Merge branch 'dp/maint-1.6.5-fast-import-non-commit... Junio C Hamano Wed, 20 Jan 2010 20:17:24 +0000 (12:17 -0800)

Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint-1.6.5

* dp/maint-1.6.5-fast-import-non-commit-tag:
fast-import: tag may point to any object type

Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into... Junio C Hamano Wed, 20 Jan 2010 20:16:46 +0000 (12:16 -0800)

Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint-1.6.5

* jm/maint-1.6.5-grep-NUL-terminate:
grep: NUL terminate input from a file

Merge branch 'maint'Junio C Hamano Wed, 20 Jan 2010 00:57:10 +0000 (16:57 -0800)

Merge branch 'maint'

* maint:
bisect: fix singular/plural grammar nit

Makefile: honor NO_CURL when setting REMOTE_CURL_*... Johannes Sixt Tue, 19 Jan 2010 15:39:12 +0000 (16:39 +0100)

Makefile: honor NO_CURL when setting REMOTE_CURL_* variables

Previously, these variables were set before there was a chance to set
NO_CURL.

This made a difference only during 'make install', because by installing
$(REMOTE_CURL_ALIASES), the rule tries to access $(REMOTE_CURL_PRIMARY),
which was never installed. On Windows, this fails; on Unix, stale symbolic
links are created.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Acked-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

bisect: fix singular/plural grammar nitDavid Ripton Tue, 19 Jan 2010 15:13:33 +0000 (07:13 -0800)

bisect: fix singular/plural grammar nit

Remove the trailing 's' from "revisions" and "steps" when there is
only one.

Signed-off-by: David Ripton <dripton@ripton.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano Tue, 19 Jan 2010 05:37:12 +0000 (21:37 -0800)

Merge branch 'maint-1.6.4' into maint-1.6.5

* maint-1.6.4:
Fix mis-backport of t7002
base85: Make the code more obvious instead of explaining the non-obvious
base85: encode_85() does not use the decode table
base85 debug code: Fix length byte calculation
checkout -m: do not try to fall back to --merge from an unborn branch
branch: die explicitly why when calling "git branch [-a|-r] branchname".
textconv: stop leaking file descriptors
commit: --cleanup is a message option
git count-objects: handle packs bigger than 4G
t7102: make the test fail if one of its check fails

Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano Tue, 19 Jan 2010 05:37:06 +0000 (21:37 -0800)

Merge branch 'maint-1.6.3' into maint-1.6.4

* maint-1.6.3:
base85: Make the code more obvious instead of explaining the non-obvious
base85: encode_85() does not use the decode table
base85 debug code: Fix length byte calculation
checkout -m: do not try to fall back to --merge from an unborn branch
branch: die explicitly why when calling "git branch [-a|-r] branchname".
textconv: stop leaking file descriptors
commit: --cleanup is a message option
git count-objects: handle packs bigger than 4G
t7102: make the test fail if one of its check fails

Conflicts:
builtin-commit.c

Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano Tue, 19 Jan 2010 05:29:47 +0000 (21:29 -0800)

Merge branch 'maint-1.6.2' into maint-1.6.3

* maint-1.6.2:
base85: Make the code more obvious instead of explaining the non-obvious
base85: encode_85() does not use the decode table
base85 debug code: Fix length byte calculation
checkout -m: do not try to fall back to --merge from an unborn branch
branch: die explicitly why when calling "git branch [-a|-r] branchname".
textconv: stop leaking file descriptors
commit: --cleanup is a message option
git count-objects: handle packs bigger than 4G
t7102: make the test fail if one of its check fails

Conflicts:
diff.c

Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4Junio C Hamano Tue, 19 Jan 2010 05:18:41 +0000 (21:18 -0800)

Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4

* commit 'v1.6.4.4-8-g8de6518':
Fix mis-backport of t7002

Fix mis-backport of t7002Junio C Hamano Tue, 19 Jan 2010 05:14:41 +0000 (21:14 -0800)

Fix mis-backport of t7002

The original patch that became cfe370c (grep: do not segfault when -f is
used, 2009-10-16), was made against "maint" or newer branch back then, but
the fix addressed the issue that was present as far as in 1.6.4 series.

The maintainer backported the patch to the 1.6.4 maintenance branch, but
failed to notice that the new tests assumed the setup done by the script
in "maint", which did quite a lot more than the same test script in 1.6.4
series, and the output didn't match the expected result.

This should fix it.

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

Update draft release notes to 1.7.0Junio C Hamano Tue, 19 Jan 2010 02:16:50 +0000 (18:16 -0800)

Update draft release notes to 1.7.0

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

Merge branch 'maint'Junio C Hamano Tue, 19 Jan 2010 02:16:19 +0000 (18:16 -0800)

Merge branch 'maint'

* maint:
Update draft release notes to 1.6.6.1
grep: NUL terminate input from a file
fast-import: tag may point to any object type

Update draft release notes to 1.6.6.1Junio C Hamano Tue, 19 Jan 2010 02:16:15 +0000 (18:16 -0800)

Update draft release notes to 1.6.6.1

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

Merge branch 'dp/maint-1.6.5-fast-import-non-commit... Junio C Hamano Tue, 19 Jan 2010 02:15:12 +0000 (18:15 -0800)

Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint

* dp/maint-1.6.5-fast-import-non-commit-tag:
fast-import: tag may point to any object type

Merge branch 'jc/rerere'Junio C Hamano Tue, 19 Jan 2010 02:13:01 +0000 (18:13 -0800)

Merge branch 'jc/rerere'

* jc/rerere:
Teach --[no-]rerere-autoupdate option to merge, revert and friends

Merge branch 'pc/uninteresting-submodule-disappear... Junio C Hamano Tue, 19 Jan 2010 02:12:57 +0000 (18:12 -0800)

Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'

* pc/uninteresting-submodule-disappear-upon-switch-branches:
Remove empty directories when checking out a commit with fewer submodules

Merge branch 'nd/include-termios-for-osol'Junio C Hamano Tue, 19 Jan 2010 02:12:53 +0000 (18:12 -0800)

Merge branch 'nd/include-termios-for-osol'

* nd/include-termios-for-osol:
Add missing #include to support TIOCGWINSZ on Solaris

Merge branch 'js/windows'Junio C Hamano Tue, 19 Jan 2010 02:12:49 +0000 (18:12 -0800)

Merge branch 'js/windows'

* js/windows:
Do not use date.c:tm_to_time_t() from compat/mingw.c
MSVC: Windows-native implementation for subset of Pthreads API
MSVC: Fix an "incompatible pointer types" compiler warning
Windows: avoid the "dup dance" when spawning a child process
Windows: simplify the pipe(2) implementation
Windows: boost startup by avoiding a static dependency on shell32.dll
Windows: disable Python

Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into... Junio C Hamano Tue, 19 Jan 2010 01:03:34 +0000 (17:03 -0800)

Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint

* jm/maint-1.6.5-grep-NUL-terminate:
grep: NUL terminate input from a file

grep: NUL terminate input from a fileJim Meyering Mon, 18 Jan 2010 21:55:07 +0000 (22:55 +0100)

grep: NUL terminate input from a file

Internally "git grep" runs regexec(3) that expects its input string
to be NUL terminated. When searching inside blob data, read_sha1_file()
automatically gives such a buffer, but builtin-grep.c forgot to put
the NUL at the end, even though it allocated enough space for it.

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

Update draft release notes to 1.7.0Junio C Hamano Mon, 18 Jan 2010 00:47:48 +0000 (16:47 -0800)

Update draft release notes to 1.7.0

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

Merge branch 'tc/test-locate-httpd'Junio C Hamano Mon, 18 Jan 2010 00:00:13 +0000 (16:00 -0800)

Merge branch 'tc/test-locate-httpd'

* tc/test-locate-httpd:
t/lib-http.sh: Restructure finding of default httpd location

Merge branch 'jh/commit-status'Junio C Hamano Mon, 18 Jan 2010 00:00:07 +0000 (16:00 -0800)

Merge branch 'jh/commit-status'

* jh/commit-status:
t7502: test commit.status, --status and --no-status
commit: support commit.status, --status, and --no-status

Conflicts:
Documentation/git-commit.txt
builtin-commit.c

Merge branch 'jn/makefile'Junio C Hamano Sun, 17 Jan 2010 23:59:44 +0000 (15:59 -0800)

Merge branch 'jn/makefile'

* jn/makefile:
Makefile: consolidate .FORCE-* targets
Makefile: learn to generate listings for targets requiring special flags
Makefile: use target-specific variable to pass flags to cc
Makefile: regenerate assembler listings when asked

Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'Junio C Hamano Sun, 17 Jan 2010 23:59:40 +0000 (15:59 -0800)

Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'

* jc/maint-1.6.1-checkout-m-custom-merge:
checkout -m path: fix recreating conflicts

Conflicts:
t/t7201-co.sh

Merge branch 'tc/clone-v-progress'Junio C Hamano Sun, 17 Jan 2010 23:58:58 +0000 (15:58 -0800)

Merge branch 'tc/clone-v-progress'

* tc/clone-v-progress:
clone: use --progress to force progress reporting
clone: set transport->verbose when -v/--verbose is used
git-clone.txt: reword description of progress behaviour
check stderr with isatty() instead of stdout when deciding to show progress

Conflicts:
transport.c

Merge branch 'tc/smart-http-restrict'Junio C Hamano Sun, 17 Jan 2010 23:58:23 +0000 (15:58 -0800)

Merge branch 'tc/smart-http-restrict'

* tc/smart-http-restrict:
Test t5560: Fix test when run with dash
Smart-http tests: Test http-backend without curl or a webserver
Smart-http tests: Break test t5560-http-backend into pieces
Smart-http tests: Improve coverage in test t5560
Smart-http: check if repository is OK to export before serving it

Merge branch 'jk/run-command-use-shell'Junio C Hamano Sun, 17 Jan 2010 23:58:15 +0000 (15:58 -0800)

Merge branch 'jk/run-command-use-shell'

* jk/run-command-use-shell:
t4030, t4031: work around bogus MSYS bash path conversion
diff: run external diff helper with shell
textconv: use shell to run helper
editor: use run_command's shell feature
run-command: optimize out useless shell calls
run-command: convert simple callsites to use_shell
t0021: use $SHELL_PATH for the filter script
run-command: add "use shell" option

Merge branch 'sr/gfi-options'Junio C Hamano Sun, 17 Jan 2010 23:58:11 +0000 (15:58 -0800)

Merge branch 'sr/gfi-options'

* sr/gfi-options:
fast-import: add (non-)relative-marks feature
fast-import: allow for multiple --import-marks= arguments
fast-import: test the new option command
fast-import: add option command
fast-import: add feature command
fast-import: put marks reading in its own function
fast-import: put option parsing code in separate functions

Update COPYING with GPLv2 with new FSF addressJunio C Hamano Sat, 16 Jan 2010 05:38:34 +0000 (21:38 -0800)

Update COPYING with GPLv2 with new FSF address

The mailing address of FSF changed quite a while ago. Also the expansion
of the acronym LGPL (which we don't use) is "Lesser GPL" not "Library GPL"
these days in recent copies of GPLv2. Update the copy we have with a
fresh download of <http://www.gnu.org/licenses/gpl-2.0.txt>.

This incidentally removes form-feeds in the text we retained for all these
years.

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

Do not use date.c:tm_to_time_t() from compat/mingw.cJohannes Sixt Fri, 15 Jan 2010 20:12:21 +0000 (21:12 +0100)

Do not use date.c:tm_to_time_t() from compat/mingw.c

To implement gettimeofday(), a broken-down UTC time was requested from the
system using GetSystemTime(), then tm_to_time_t() was used to convert it
to a time_t because it does not look at the current timezone, which
mktime() would do.

Use GetSystemTimeAsFileTime() and a different conversion path to avoid this
back-reference from the compatibility layer to the generic code.

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

MSVC: Windows-native implementation for subset of Pthre... Andrzej K. Haczewski Fri, 15 Jan 2010 20:12:20 +0000 (21:12 +0100)

MSVC: Windows-native implementation for subset of Pthreads API

This patch implements native to Windows subset of pthreads API used by Git.
It allows to remove Pthreads for Win32 dependency for MSVC, msysgit and
Cygwin.

[J6t: If the MinGW build was built as part of the msysgit build
environment, then threading was already enabled because the
pthreads-win32 package is available in msysgit. With this patch, we can now
enable threaded code unconditionally.]

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

Merge branch 'maint'Junio C Hamano Sun, 17 Jan 2010 01:30:18 +0000 (17:30 -0800)

Merge branch 'maint'

* maint:
Fix uninitialized variable in get_refs_via_rsync().
Document git-blame triple -C option

Merge branch 'cc/reset-more'Junio C Hamano Sun, 17 Jan 2010 01:18:01 +0000 (17:18 -0800)

Merge branch 'cc/reset-more'

* cc/reset-more:
t7111: fix bad HEAD in tests with unmerged entries

MSVC: Fix an "incompatible pointer types" compiler... Ramsay Jones Fri, 15 Jan 2010 20:12:19 +0000 (21:12 +0100)

MSVC: Fix an "incompatible pointer types" compiler warning

In particular, the following warning is issued while compiling
compat/msvc.c:

...mingw.c(223) : warning C4133: 'function' : incompatible \
types - from '_stati64 *' to '_stat64 *'

which relates to a call of _fstati64() in the mingw_fstat()
function definition.

This is caused by various layers of macro magic and attempts to
avoid macro redefinition compiler warnings. For example, the call
to _fstati64() mentioned above is actually a call to _fstat64(),
and expects a pointer to a struct _stat64 rather than the struct
_stati64 which is passed to mingw_fstat().

The definition of struct _stati64 given in compat/msvc.h had the
same "shape" as the definition of struct _stat64, so the call to
_fstat64() does not actually cause any runtime errors, but the
structure types are indeed incompatible.

In order to avoid the compiler warning, we add declarations for the
mingw_lstat() and mingw_fstat() functions and supporting macros to
msvc.h, suppressing the corresponding declarations in mingw.h, so
that we can use the appropriate structure type (and function) names
from the msvc headers.

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

Windows: avoid the "dup dance" when spawning a child... Johannes Sixt Fri, 15 Jan 2010 20:12:18 +0000 (21:12 +0100)

Windows: avoid the "dup dance" when spawning a child process

When stdin, stdout, or stderr must be redirected for a child process that
on Windows is spawned using one of the spawn() functions of Microsoft's
C runtime, then there is no choice other than to

1. make a backup copy of fd 0,1,2 with dup
2. dup2 the redirection source fd into 0,1,2
3. spawn
4. dup2 the backup back into 0,1,2
5. close the backup copy and the redirection source

We used this idiom as well -- but we are not using the spawn() functions
anymore!

Instead, we have our own implementation. We had hardcoded that stdin,
stdout, and stderr of the child process were inherited from the parent's
fds 0, 1, and 2. But we can actually specify any fd.

With this patch, the fds to inherit are passed from start_command()'s
WIN32 section to our spawn implementation. This way, we can avoid the
backup copies of the fds.

The backup copies were a bug waiting to surface: The OS handles underlying
the dup()ed fds were inherited by the child process (but were not
associated with a file descriptor in the child). Consequently, the file or
pipe represented by the OS handle remained open even after the backup copy
was closed in the parent process until the child exited.

Since our implementation of pipe() creates non-inheritable OS handles, we
still dup() file descriptors in start_command() because dup() happens to
create inheritable duplicates. (A nice side effect is that the fd cleanup
in start_command is the same for Windows and Unix and remains unchanged.)

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

Windows: simplify the pipe(2) implementationJohannes Sixt Fri, 15 Jan 2010 20:12:17 +0000 (21:12 +0100)

Windows: simplify the pipe(2) implementation

Our implementation of pipe() must create non-inheritable handles for the
reason that when a child process is started, there is no opportunity to
close the unneeded pipe ends in the child (on POSIX this is done between
fork() and exec()).

Previously, we used the _pipe() function provided by Microsoft's C runtime
(which creates inheritable handles) and then turned the handles into
non-inheritable handles using the DuplicateHandle() API.

Simplify the procedure by using the CreatePipe() API, which can create
non-inheritable handles right from the beginning.

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

Windows: boost startup by avoiding a static dependency... Johannes Sixt Fri, 15 Jan 2010 20:12:16 +0000 (21:12 +0100)

Windows: boost startup by avoiding a static dependency on shell32.dll

This DLL is only needed to invoke the browser in a "git help" call. By
looking up the only function that we need at runtime, we can avoid the
startup costs of this DLL.

DLL usage can be profiled with Microsoft's Dependency Walker. For example,
a call to "git diff-files" loaded

before: 19 DLLs
after: 9 DLLs

As a result, the runtime of 'make -j2 test' went down from 16:00min
to 12:40min on one of my boxes.

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

Windows: disable PythonErik Faye-Lund Fri, 15 Jan 2010 20:12:15 +0000 (21:12 +0100)

Windows: disable Python

Python is not commonly installed on Windows machines, so
we should disable it there by default.

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

t7111: fix bad HEAD in tests with unmerged entriesChristian Couder Sat, 16 Jan 2010 09:20:26 +0000 (10:20 +0100)

t7111: fix bad HEAD in tests with unmerged entries

When testing what happens on unmerged entries, the HEAD is the
commit we are starting from before the merge that fails and create
the unmerged entries. It is not the commit before.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix uninitialized variable in get_refs_via_rsync().Richard Weinberger Thu, 14 Jan 2010 23:28:59 +0000 (00:28 +0100)

Fix uninitialized variable in get_refs_via_rsync().

This fixes a crash when cloning via rsync://.

Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Test t5560: Fix test when run with dashTarmigan Casebolt Fri, 15 Jan 2010 06:44:02 +0000 (22:44 -0800)

Test t5560: Fix test when run with dash

A command invocation preceded by variable assignments, i.e.

VAR1=VAL1 VAR2=VAL2 ... command args

are implemented by dash and ksh in such a way not to export these
variables, and keep the values after the command finishes, when the
command is a shell function. POSIX.1 "2.9.5 Function Definition Command"
specifies this behaviour.

Many shells however treat this construct the same way as they are calling
external commands. They export the variables during the duration of
command, and resets their values after command returns.

The test relied on the behaviour of the latter kind.

Reported-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Tarmigan Casebolt <tarmigan+git@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Document git-blame triple -C optionRamkumar Ramachandra Fri, 8 Jan 2010 18:48:07 +0000 (00:18 +0530)

Document git-blame triple -C option

Lift the explanation of -CCC option in the source to the documentation.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

fast-import: tag may point to any object typeDmitry Potapov Thu, 14 Jan 2010 04:44:19 +0000 (07:44 +0300)

fast-import: tag may point to any object type

If you tried to export the official git repository, and then to import it
back then git-fast-import would die complaining that "Mark :1 not a commit".

Accordingly to a generated crash file, Mark 1 is not a commit but a blob,
which is pointed by junio-gpg-pub tag. Because git-tag allows to create such
tags, git-fast-import should import them.

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

Merge branch 'jc/checkout-merge-base'Junio C Hamano Wed, 13 Jan 2010 20:31:13 +0000 (12:31 -0800)

Merge branch 'jc/checkout-merge-base'

* jc/checkout-merge-base:
rebase -i: teach --onto A...B syntax
rebase: fix --onto A...B parsing and add tests
"rebase --onto A...B" replays history on the merge base between A and B
"checkout A...B" switches to the merge base between A and B

Merge branch 'rs/maint-archive-match-pathspec'Junio C Hamano Wed, 13 Jan 2010 20:31:01 +0000 (12:31 -0800)

Merge branch 'rs/maint-archive-match-pathspec'

* rs/maint-archive-match-pathspec:
archive: complain about path specs that don't match anything

Merge branch 'il/vcs-helper'Junio C Hamano Wed, 13 Jan 2010 20:30:39 +0000 (12:30 -0800)

Merge branch 'il/vcs-helper'

* il/vcs-helper:
Reset possible helper before reusing remote structure
Remove special casing of http, https and ftp
Support remote archive from all smart transports
Support remote helpers implementing smart transports
Support taking over transports
Refactor git transport options parsing
Pass unknown protocols to external protocol handlers
Support mandatory capabilities
Add remote helper debug mode

Conflicts:
Documentation/git-remote-helpers.txt
transport-helper.c

Merge branch 'cc/reset-more'Junio C Hamano Wed, 13 Jan 2010 19:58:56 +0000 (11:58 -0800)

Merge branch 'cc/reset-more'

* cc/reset-more:
t7111: check that reset options work as described in the tables
Documentation: reset: add some missing tables
Fix bit assignment for CE_CONFLICTED
"reset --merge": fix unmerged case
reset: use "unpack_trees()" directly instead of "git read-tree"
reset: add a few tests for "git reset --merge"
Documentation: reset: add some tables to describe the different options
reset: improve mixed reset error message when in a bare repo

Merge branch 'nd/sparse'Junio C Hamano Wed, 13 Jan 2010 19:58:34 +0000 (11:58 -0800)

Merge branch 'nd/sparse'

* nd/sparse: (25 commits)
t7002: test for not using external grep on skip-worktree paths
t7002: set test prerequisite "external-grep" if supported
grep: do not do external grep on skip-worktree entries
commit: correctly respect skip-worktree bit
ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
tests: rename duplicate t1009
sparse checkout: inhibit empty worktree
Add tests for sparse checkout
read-tree: add --no-sparse-checkout to disable sparse checkout support
unpack-trees(): ignore worktree check outside checkout area
unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
unpack-trees.c: generalize verify_* functions
unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
Introduce "sparse checkout"
dir.c: export excluded_1() and add_excludes_from_file_1()
excluded_1(): support exclude files in index
unpack-trees(): carry skip-worktree bit over in merged_entry()
Read .gitignore from index if it is skip-worktree
Avoid writing to buffer in add_excludes_from_file_1()
...

Conflicts:
.gitignore
Documentation/config.txt
Documentation/git-update-index.txt
Makefile
entry.c
t/t7002-grep.sh

t7502: test commit.status, --status and --no-statusJunio C Hamano Wed, 13 Jan 2010 08:12:54 +0000 (00:12 -0800)

t7502: test commit.status, --status and --no-status

Make sure that the status information:

- is shown as before without configuration nor command line option;

- is shown if commit.status is set to true and no command line option
is given, or --status is explicitly given;

- is not shown if commit.status is set to false and no command line
option is given, or --no-status is explicitly given.

Also make sure that the way lines taken from the custom --template appear
in the log message editor is not changed at all.

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

commit: support commit.status, --status, and --no-statusJames P. Howard, II Mon, 7 Dec 2009 22:45:27 +0000 (17:45 -0500)

commit: support commit.status, --status, and --no-status

A new configuration variable commit.status, and new command line
options --status, and --no-status control whether or not the git
status information is included in the commit message template
when using an editor to prepare the commit message. It does not
affect the effects of a user's commit.template settings.

Signed-off-by: James P. Howard, II <jh@jameshoward.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Tue, 12 Jan 2010 23:48:38 +0000 (15:48 -0800)

Merge branch 'maint'

* maint:
remote-curl: Fix Accept header for smart HTTP connections
grep: -L should show empty files
rebase--interactive: Ignore comments and blank lines in peek_next_command

lockfile: show absolute filename in unable_to_lock_messageMatthieu Moy Thu, 7 Jan 2010 14:54:10 +0000 (15:54 +0100)

lockfile: show absolute filename in unable_to_lock_message

When calling a git command from a subdirectory and a file locking fails,
the user will get a path relative to the root of the worktree, which is
invalid from the place where the command is ran. Make it easy for the
user to know which file it is.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

hg-to-git: fix COMMITTER type-oBart Trojanowski Sat, 9 Jan 2010 00:54:39 +0000 (19:54 -0500)

hg-to-git: fix COMMITTER type-o

This script passes the author and committer to git-commit via environment
variables, but it was missing the seccond T of COMMITTER in a few places.

Signed-off-by: Bart Trojanowski <bart@jukie.net>
Acked-by: Stelian Pop <stelian@popies.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

remote-curl: Fix Accept header for smart HTTP connectionsShawn O. Pearce Tue, 12 Jan 2010 17:54:04 +0000 (09:54 -0800)

remote-curl: Fix Accept header for smart HTTP connections

We actually expect to see an application/x-git-upload-pack-result
but we lied and said we Accept *-response. This was a typo on my
part when I was writing the code.

Fortunately the wrong Accept header had no real impact, as the
deployed git-http-backend servers were not testing the Accept
header before they returned their content.

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

grep: -L should show empty filesJunio C Hamano Tue, 12 Jan 2010 08:22:23 +0000 (00:22 -0800)

grep: -L should show empty files

The -L (--files-without-match) option is supposed to show paths that
produced no matches. When running the internal grep on work tree files,
however, we had an optimization to just return on zero-sized files,
without doing anything.

This optimization doesn't matter too much in practice (a tracked empty
file must be rare, or there is something wrong with your project); to
produce results consistent with GNU grep, we should stop the optimization
and show empty files as not having the given pattern.

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

push: spell 'Note about fast-forwards' section name... Matthieu Moy Mon, 11 Jan 2010 21:09:44 +0000 (22:09 +0100)

push: spell 'Note about fast-forwards' section name correctly in error message.

The error message in case of non-fast forward points to 'git push
--help', but used to talk about a section 'non-fast-forward', while the
actual section name is 'Note about fast-forwards'.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

rebase--interactive: Ignore comments and blank lines... Michael Haggerty Mon, 11 Jan 2010 15:56:45 +0000 (16:56 +0100)

rebase--interactive: Ignore comments and blank lines in peek_next_command

Previously, blank lines and/or comments within a series of
squash/fixup commands would confuse "git rebase -i" into thinking that
the series was finished. It would therefore require the user to edit
the commit message for the squash/fixup commits seen so far. Then,
after continuing, it would ask the user to edit the commit message
again.

Ignore comments and blank lines within a group of squash/fixup
commands, allowing them to be processed in one go.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Add missing #include to support TIOCGWINSZ on SolarisNguyễn Thái Ngọc Duy Mon, 11 Jan 2010 10:41:01 +0000 (17:41 +0700)

Add missing #include to support TIOCGWINSZ on Solaris

On Linux TIOCGWINSZ is defined somehwere in ioctl.h, which is already
included. On Solaris we also need to include termios.h. Without this
term_columns() in help.c will think TIOCGWINSZ is not supported and
always return 80 columns.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Remove empty directories when checking out a commit... Peter Collingbourne Mon, 11 Jan 2010 02:59:54 +0000 (02:59 +0000)

Remove empty directories when checking out a commit with fewer submodules

Change the unlink_entry function to use rmdir to remove submodule
directories. Currently we try to use unlink, which will never succeed.

Of course rmdir will only succeed for empty (i.e. not checked out)
submodule directories. Behaviour if a submodule is checked out stays
essentially the same: print a warning message and keep the submodule
directory.

Signed-off-by: Peter Collingbourne <peter@pcc.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'tr/http-updates'Junio C Hamano Sun, 10 Jan 2010 16:53:04 +0000 (08:53 -0800)

Merge branch 'tr/http-updates'

* tr/http-updates:
Remove http.authAny
Allow curl to rewind the RPC read buffer
Add an option for using any HTTP authentication scheme, not only basic
http: maintain curl sessions

Merge branch 'jk/maint-1.6.5-reset-hard'Junio C Hamano Sun, 10 Jan 2010 16:52:53 +0000 (08:52 -0800)

Merge branch 'jk/maint-1.6.5-reset-hard'

* jk/maint-1.6.5-reset-hard:
reset: unbreak hard resets with GIT_WORK_TREE

Merge branch 'jk/push-to-delete'Junio C Hamano Sun, 10 Jan 2010 16:52:45 +0000 (08:52 -0800)

Merge branch 'jk/push-to-delete'

* jk/push-to-delete:
builtin-push: add --delete as syntactic sugar for :foo

Merge branch 'mm/config-path'Junio C Hamano Sun, 10 Jan 2010 16:52:41 +0000 (08:52 -0800)

Merge branch 'mm/config-path'

* mm/config-path:
builtin-config: add --path option doing ~ and ~user expansion.

Merge branch 'pm/cvs-environ'Junio C Hamano Sun, 10 Jan 2010 16:52:37 +0000 (08:52 -0800)

Merge branch 'pm/cvs-environ'

* pm/cvs-environ:
CVS Server: Support reading base and roots from environment

Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule... Junio C Hamano Sun, 10 Jan 2010 16:52:32 +0000 (08:52 -0800)

Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes'

* tr/maint-1.6.5-bash-prompt-show-submodule-changes:
bash completion: factor submodules into dirty state

Merge branch 'bg/maint-remote-update-default'Junio C Hamano Sun, 10 Jan 2010 16:52:24 +0000 (08:52 -0800)

Merge branch 'bg/maint-remote-update-default'

* bg/maint-remote-update-default:
Fix "git remote update" with remotes.defalt set

Merge branch 'mm/diag-path-in-treeish'Junio C Hamano Sun, 10 Jan 2010 16:52:10 +0000 (08:52 -0800)

Merge branch 'mm/diag-path-in-treeish'

* mm/diag-path-in-treeish:
Detailed diagnosis when parsing an object name fails.

Merge branch 'fc/opt-quiet-gc-reset'Junio C Hamano Sun, 10 Jan 2010 16:52:06 +0000 (08:52 -0800)

Merge branch 'fc/opt-quiet-gc-reset'

* fc/opt-quiet-gc-reset:
General --quiet improvements

Merge branch 'maint'Junio C Hamano Sun, 10 Jan 2010 08:52:04 +0000 (00:52 -0800)

Merge branch 'maint'

* maint:
base85: Make the code more obvious instead of explaining the non-obvious
base85: encode_85() does not use the decode table
base85 debug code: Fix length byte calculation
Documentation: tiny git config manual tweaks
Documentation: git gc packs refs by default now
checkout -m: do not try to fall back to --merge from an unborn branch

Merge branch 'maint-1.6.2' into maintJunio C Hamano Sun, 10 Jan 2010 08:51:54 +0000 (00:51 -0800)

Merge branch 'maint-1.6.2' into maint

* maint-1.6.2:
base85: Make the code more obvious instead of explaining the non-obvious
base85: encode_85() does not use the decode table
base85 debug code: Fix length byte calculation
checkout -m: do not try to fall back to --merge from an unborn branch

Conflicts:
diff.c

Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano Sun, 10 Jan 2010 08:49:47 +0000 (00:49 -0800)

Merge branch 'maint-1.6.1' into maint-1.6.2

* maint-1.6.1:
base85: Make the code more obvious instead of explaining the non-obvious
base85: encode_85() does not use the decode table
base85 debug code: Fix length byte calculation
checkout -m: do not try to fall back to --merge from an unborn branch
branch: die explicitly why when calling "git branch [-a|-r] branchname".
textconv: stop leaking file descriptors
commit: --cleanup is a message option
git count-objects: handle packs bigger than 4G
t7102: make the test fail if one of its check fails

Conflicts:
diff.c

Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano Sun, 10 Jan 2010 08:48:47 +0000 (00:48 -0800)

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
base85: Make the code more obvious instead of explaining the non-obvious
base85: encode_85() does not use the decode table
base85 debug code: Fix length byte calculation
checkout -m: do not try to fall back to --merge from an unborn branch
branch: die explicitly why when calling "git branch [-a|-r] branchname".

daemon: consider only address in kill_some_child()Erik Faye-Lund Sat, 9 Jan 2010 14:13:28 +0000 (15:13 +0100)

daemon: consider only address in kill_some_child()

kill_some_child() compares the entire sockaddr_storage
structure (with the pad-bits zeroed out) when trying to
find out if connections originate from the same host.
However, sockaddr_storage contains the port-number for
the connection (which varies between connections), so
the comparison always fails.

Change the code so we only consider the host-address,
by introducing the addrcmp()-function that inspects
the address family and compare as appropriate.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

help: fix configured help format taking over command... Christian Couder Sat, 9 Jan 2010 05:10:05 +0000 (06:10 +0100)

help: fix configured help format taking over command line one

Since commit 7c3baa9 (help -a: do not unnecessarily look for a
repository, 2009-09-04), the help format that is passed as a
command line option is not used if an help format has been
configured. This patch fixes that.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

string-list: rename the include guard to STRING_LIST_HThiago Farina Fri, 8 Jan 2010 22:45:08 +0000 (17:45 -0500)

string-list: rename the include guard to STRING_LIST_H

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

t7111: check that reset options work as described in... Christian Couder Fri, 8 Jan 2010 04:45:10 +0000 (05:45 +0100)

t7111: check that reset options work as described in the tables

Some previous patches added some tables to the "git reset"
documentation. These tables describe the behavior of "git reset"
depending on the option it is passed and the state of the files
in the working tree, the index, HEAD and the target commit.

This patch adds some tests to make sure that the tables describe
the behavior of "git reset".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

base85: Make the code more obvious instead of explainin... Andreas Gruenbacher Fri, 8 Jan 2010 13:40:00 +0000 (14:40 +0100)

base85: Make the code more obvious instead of explaining the non-obvious

Here is another cleanup ...

Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

base85: encode_85() does not use the decode tableAndreas Gruenbacher Fri, 8 Jan 2010 16:22:18 +0000 (17:22 +0100)

base85: encode_85() does not use the decode table

Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

base85 debug code: Fix length byte calculationAndreas Gruenbacher Fri, 8 Jan 2010 13:39:58 +0000 (14:39 +0100)

base85 debug code: Fix length byte calculation

Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: tiny git config manual tweaksJonathan Nieder Sun, 10 Jan 2010 03:01:21 +0000 (21:01 -0600)

Documentation: tiny git config manual tweaks

As a verb, 'setup' is spelled 'set up'. “diff commands such as
diff-files” scans better without a comma. Clarify that shallow
and deep are special non-boolean values for format.thread rather
than boolean values with some other name.

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

Documentation: git gc packs refs by default nowJonathan Nieder Sun, 10 Jan 2010 02:59:41 +0000 (20:59 -0600)

Documentation: git gc packs refs by default now

In commit 56752391 (Make "git gc" pack all refs by default,
2007-05-24), 'git gc' was changed to run pack-refs by default

Versions before v1.5.1.2 cannot clone repos with packed refs over
http, and versions before v1.4.4 cannot handled packed refs at
all, but more recent git should have no problems. Try to make
this more clear in the git-config manual.

The analagous passage in git-gc.txt was updated already with
commit fe2128a (Change git-gc documentation to reflect
gc.packrefs implementation., 2008-01-09).

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

Reset possible helper before reusing remote structureIlari Liusvaara Sat, 9 Jan 2010 17:28:12 +0000 (19:28 +0200)

Reset possible helper before reusing remote structure

If one had multiple URLs configured for remote with previous one
having forced helper but the subsequent one not, like:

url = foo::bar://baz
url = ssh://example/example.git

Then the subsequent URL is passed to foo helper, which isn't
correct. Fix it to be parsed normally by resetting foreign VCS
name before parsing the URL protocol.

Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Describe second batch for 1.7.0 in draft release notesJunio C Hamano Thu, 7 Jan 2010 23:47:32 +0000 (15:47 -0800)

Describe second batch for 1.7.0 in draft release notes

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

Merge branch 'js/filter-branch-prime'Junio C Hamano Thu, 7 Jan 2010 23:40:30 +0000 (15:40 -0800)

Merge branch 'js/filter-branch-prime'

* js/filter-branch-prime:
filter-branch: remove an unnecessary use of 'git read-tree'

Merge branch 'sb/maint-octopus'Junio C Hamano Thu, 7 Jan 2010 23:40:21 +0000 (15:40 -0800)

Merge branch 'sb/maint-octopus'

* sb/maint-octopus:
octopus: remove dead code
octopus: reenable fast-forward merges
octopus: make merge process simpler to follow

Conflicts:
git-merge-octopus.sh

Merge branch 'mg/tag-d-show'Junio C Hamano Thu, 7 Jan 2010 23:38:50 +0000 (15:38 -0800)

Merge branch 'mg/tag-d-show'

* mg/tag-d-show:
tag -d: print sha1 of deleted tag

Merge branch 'so/cvsserver-update'Junio C Hamano Thu, 7 Jan 2010 23:38:11 +0000 (15:38 -0800)

Merge branch 'so/cvsserver-update'

* so/cvsserver-update:
cvsserver: make the output of 'update' more compatible with cvs.

Merge branch 'bg/maint-add-all-doc'Junio C Hamano Thu, 7 Jan 2010 23:37:57 +0000 (15:37 -0800)

Merge branch 'bg/maint-add-all-doc'

* bg/maint-add-all-doc:
git-rm doc: Describe how to sync index & work tree
git-add/rm doc: Consistently back-quote
Documentation: 'git add -A' can remove files

git-rm doc: Describe how to sync index & work treeBjörn Gustavsson Mon, 7 Dec 2009 18:35:42 +0000 (19:35 +0100)

git-rm doc: Describe how to sync index & work tree

Newcomers to git that want to remove from the index only the
files that have disappeared from the working tree will probably
look for a way to do that in the documentation for 'git rm'.

Therefore, describe how that can be done (even though it involves
other commands than 'git rm'). Based on a suggestion by Junio,
but re-arranged and rewritten to better fit into the style of
command reference.

While at it, change a single occurrence of "work tree" to "working
tree" for consistency.

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

Merge branch 'mv/commit-date'Junio C Hamano Thu, 7 Jan 2010 23:35:55 +0000 (15:35 -0800)

Merge branch 'mv/commit-date'

* mv/commit-date:
Document date formats accepted by parse_date()
builtin-commit: add --date option