gitweb.git
Revert "unpack_trees(): skip trees that are the same... Junio C Hamano Tue, 15 Feb 2011 18:47:04 +0000 (10:47 -0800)

Revert "unpack_trees(): skip trees that are the same in all input"

This reverts commit 83c90314aa27ae3768c04375d02e4f3fb12b726d, which
seems to have broken merge to report conflicts when there should be
none.

configure: use AC_LANG_PROGRAM consistentlyRalf Wildenhues Sun, 2 Jan 2011 10:24:55 +0000 (11:24 +0100)

configure: use AC_LANG_PROGRAM consistently

Avoid warnings from Autoconf 2.68 about missing use of AC_LANG_PROGRAM
and friends.

Quoting autoconf-2.68/NEWS:

** The macros AC_PREPROC_IFELSE, AC_COMPILE_IFELSE, AC_LINK_IFELSE, and
AC_RUN_IFELSE now warn if the first argument failed to use
AC_LANG_SOURCE or AC_LANG_PROGRAM to generate the conftest file
contents. A new macro AC_LANG_DEFINES_PROVIDED exists if you have
a compelling reason why you cannot use AC_LANG_SOURCE but must
avoid the warning.

The underlying reason for that change is that AC_LANG_{SOURCE,PROGRAM}
take care to supply the previously computed set of #defines (and
include standard headers if so desired) for preprocessed languages
like C and C++.

In some cases, AC_LANG_PROGRAM is already used but not sufficiently
m4-quoted, so we just need to add another set of [quotes] to prevent
the autoconf warning from being triggered bogusly. Quoting all
arguments (except when calling special macros that need to be expanded
before recursion) is better style, anyway. These and more rules are
described in detail in 'info Autoconf "Programming in M4"'.

No change in the resulting config.mak.autogen after running
./configure intended.

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

string_list_append: always set util pointer to NULLJeff King Sat, 12 Feb 2011 05:18:51 +0000 (00:18 -0500)

string_list_append: always set util pointer to NULL

It is not immediately obvious that the util field may
contain random bytes after appending an item. Especially
since the string_list_insert* functions _do_ explicitly zero
the util pointer.

This does not appear to be a bug in any current git code, as
all callers either fill in the util field immediately or
never use it. However, it is worth it to be less surprising
to new users of the string-list API who may expect it to be
intialized to NULL.

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

correct type of EMPTY_TREE_SHA1_BINJonathan Nieder Mon, 7 Feb 2011 08:17:27 +0000 (02:17 -0600)

correct type of EMPTY_TREE_SHA1_BIN

Functions such as hashcmp that expect a binary SHA-1 value take
parameters of type "unsigned char *" to avoid accepting a textual
SHA-1 passed by mistake. Unfortunately, this means passing the string
literal EMPTY_TREE_SHA1_BIN requires an ugly cast. Tweak the
definition of EMPTY_TREE_SHA1_BIN to produce a value of more
convenient type.

In the future the definition might change to

extern const unsigned char empty_tree_sha1_bin[20];
#define EMPTY_TREE_SHA1_BIN empty_tree_sha1_bin

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

Obey p4 views when using client specIan Wienand Sat, 12 Feb 2011 00:33:48 +0000 (16:33 -0800)

Obey p4 views when using client spec

When using the p4 client spec, this attempts to obey the client's
output preferences.

For example, a view like

//depot/foo/branch/... //client/branch/foo/...
//depot/bar/branch/... //client/branch/bar/...

will result in a directory layout in the git tree of

branch/
branch/foo
branch/bar

p4 can do various other reordering that this change doesn't support,
but we should detect it and at least fail nicely.

Signed-off-by: Ian Wienand <ianw@vmware.com>
Acked-by: Pete Wyckoff <pw@padd.com>
Acked-by: Tor Arvid Lund <torarvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitignore: add test-mktemp to ignore listÆvar Arnfjörð Bjarmason Sat, 12 Feb 2011 23:21:17 +0000 (23:21 +0000)

gitignore: add test-mktemp to ignore list

Change the .gitignore to ignore test-mktemp which is built from
test-mktemp.c. Arnout Engelen added this in 6cf6bb3 (Improve error
messages when temporary file creation fails, 2010-12-18) but forgot
to add a corresponding entry to .gitignore.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

repo-config: add deprecation warningRené Scharfe Sat, 12 Feb 2011 13:24:10 +0000 (14:24 +0100)

repo-config: add deprecation warning

repo-config was deprecated in 5c66d0d4 on 2008-01-17. Warn the
remaining users that it has been replaced by config and is going to
be removed eventually.

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

Merge branch 'maint'Junio C Hamano Sat, 12 Feb 2011 00:01:47 +0000 (16:01 -0800)

Merge branch 'maint'

* maint:
Git 1.7.4.1
clone: fixup recurse_submodules option
svn-fe: warn about experimental status

Conflicts:
contrib/examples/git-revert.sh
contrib/svn-fe/svn-fe.txt

Git 1.7.4.1 v1.7.4.1Junio C Hamano Fri, 11 Feb 2011 22:39:55 +0000 (14:39 -0800)

Git 1.7.4.1

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

Merge branch 'jc/fsck-fixes' into maintJunio C Hamano Fri, 11 Feb 2011 22:26:10 +0000 (14:26 -0800)

Merge branch 'jc/fsck-fixes' into maint

* jc/fsck-fixes:
fsck: do not give up too early in fsck_dir()
fsck: drop unused parameter from traverse_one_object()

clone: fixup recurse_submodules optionChris Packham Thu, 10 Feb 2011 22:59:31 +0000 (11:59 +1300)

clone: fixup recurse_submodules option

The recurse_submodules option was added in ccdd3da6 to bring 'git clone'
into line with 'git fetch' and future commands. The correct option should
have been "recurse-submodules".

Signed-off-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

svn-fe: warn about experimental statusJonathan Nieder Fri, 11 Feb 2011 10:36:44 +0000 (04:36 -0600)

svn-fe: warn about experimental status

svn-fe is young and some coming cleanups might involve backward
incompatible UI changes. Add some words of warning to the manual so
early adopters that are not following the project closely don't get
burned.

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

Merge branch 'maint'Junio C Hamano Thu, 10 Feb 2011 22:45:55 +0000 (14:45 -0800)

Merge branch 'maint'

* maint:
compat: helper for detecting unsigned overflow

compat: helper for detecting unsigned overflowJonathan Nieder Mon, 11 Oct 2010 02:59:26 +0000 (21:59 -0500)

compat: helper for detecting unsigned overflow

The idiom (a + b < a) works fine for detecting that an unsigned
integer has overflowed, but a more explicit

unsigned_add_overflows(a, b)

might be easier to read.

Define such a macro, expanding roughly to ((a) < UINT_MAX - (b)).
Because the expansion uses each argument only once outside of sizeof()
expressions, it is safe to use with arguments that have side effects.

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

Merge branch 'tr/merge-unborn-clobber'Junio C Hamano Thu, 10 Feb 2011 00:41:17 +0000 (16:41 -0800)

Merge branch 'tr/merge-unborn-clobber'

* tr/merge-unborn-clobber:
Exhibit merge bug that clobbers index&WT

Conflicts:
t/t7607-merge-overwrite.sh

Merge branch 'jc/unpack-trees'Junio C Hamano Thu, 10 Feb 2011 00:41:17 +0000 (16:41 -0800)

Merge branch 'jc/unpack-trees'

* jc/unpack-trees:
unpack_trees(): skip trees that are the same in all input
unpack-trees.c: cosmetic fix

Conflicts:
unpack-trees.c

Merge branch 'jc/fsck-fixes'Junio C Hamano Thu, 10 Feb 2011 00:41:17 +0000 (16:41 -0800)

Merge branch 'jc/fsck-fixes'

* jc/fsck-fixes:
fsck: do not give up too early in fsck_dir()
fsck: drop unused parameter from traverse_one_object()

Merge branch 'tr/diff-words-test'Junio C Hamano Thu, 10 Feb 2011 00:41:17 +0000 (16:41 -0800)

Merge branch 'tr/diff-words-test'

* tr/diff-words-test:
t4034 (diff --word-diff): add a minimum Perl drier test vector
t4034 (diff --word-diff): style suggestions
userdiff: simplify word-diff safeguard
t4034: bulk verify builtin word regex sanity

Merge branch 'rr/fi-import-marks-if-exists'Junio C Hamano Thu, 10 Feb 2011 00:41:16 +0000 (16:41 -0800)

Merge branch 'rr/fi-import-marks-if-exists'

* rr/fi-import-marks-if-exists:
fast-import: Introduce --import-marks-if-exists

Merge branch 'jn/unpack-lstat-failure-report'Junio C Hamano Thu, 10 Feb 2011 00:41:16 +0000 (16:41 -0800)

Merge branch 'jn/unpack-lstat-failure-report'

* jn/unpack-lstat-failure-report:
unpack-trees: handle lstat failure for existing file
unpack-trees: handle lstat failure for existing directory

Merge branch 'ef/alias-via-run-command'Junio C Hamano Thu, 10 Feb 2011 00:41:16 +0000 (16:41 -0800)

Merge branch 'ef/alias-via-run-command'

* ef/alias-via-run-command:
alias: use run_command api to execute aliases

Merge branch 'cb/setup'Junio C Hamano Thu, 10 Feb 2011 00:41:16 +0000 (16:41 -0800)

Merge branch 'cb/setup'

* cb/setup:
setup: translate symlinks in filename when using absolute paths

Merge branch 'ae/better-template-failure-report'Junio C Hamano Thu, 10 Feb 2011 00:41:16 +0000 (16:41 -0800)

Merge branch 'ae/better-template-failure-report'

* ae/better-template-failure-report:
Improve error messages when temporary file creation fails

Merge branch 'jn/cherry-pick-strategy-option'Junio C Hamano Thu, 10 Feb 2011 00:41:16 +0000 (16:41 -0800)

Merge branch 'jn/cherry-pick-strategy-option'

* jn/cherry-pick-strategy-option:
cherry-pick/revert: add support for -X/--strategy-option

Merge branch 'maint-1.7.0' into maintJunio C Hamano Thu, 10 Feb 2011 00:40:12 +0000 (16:40 -0800)

Merge branch 'maint-1.7.0' into maint

* maint-1.7.0:
fast-import: introduce "feature notes" command
fast-import: clarify documentation of "feature" command

Conflicts:
Documentation/git-fast-import.txt

fast-import: introduce "feature notes" commandJonathan Nieder Wed, 9 Feb 2011 22:43:57 +0000 (16:43 -0600)

fast-import: introduce "feature notes" command

Here is a 'feature' command for streams to use to require support for
the notemodify (N) command.

When the 'feature' facility was introduced (v1.7.0-rc0~95^2~4,
2009-12-04), the notes import feature was old news (v1.6.6-rc0~21^2~8,
2009-10-09) and it was not obvious it deserved to be a named feature.
But now that is clear, since all major non-git fast-import backends
lack support for it.

Details: on git version with this patch applied, any "feature notes"
command in the features/options section at the beginning of a stream
will be treated as a no-op. On fast-import implementations without
the feature (and older git versions), the command instead errors out
with a message like

This version of fast-import does not support feature notes.

So by declaring use of notes at the beginning of a stream, frontends
can avoid wasting time and other resources when the backend does not
support notes. (This would be especially important for backends that
do not support rewinding history after a botched import.)

Improved-by: Thomas Rast <trast@student.ethz.ch>
Improved-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

fast-import: clarify documentation of "feature" commandJonathan Nieder Sun, 28 Nov 2010 19:43:57 +0000 (13:43 -0600)

fast-import: clarify documentation of "feature" command

The "feature" command allows streams to specify options for the import
that must not be ignored. Logically, they are part of the stream,
even though technically most supported features are synonyms to
command-line options.

Make this more obvious by being more explicit about how the analogy
between most "feature" commands and command-line options works. Treat
the feature (import-marks) that does not fit this analogy separately.

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

Documentation/merge subtree How-To: fix typoUwe Kleine-König Wed, 9 Feb 2011 09:04:43 +0000 (10:04 +0100)

Documentation/merge subtree How-To: fix typo

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

pull: Document the "--[no-]recurse-submodules" optionsJens Lehmann Mon, 7 Feb 2011 22:24:54 +0000 (23:24 +0100)

pull: Document the "--[no-]recurse-submodules" options

In commits be254a0ea9 and 7dce19d374 the handling of the new fetch options
"--[no-]recurse-submodules" had been added to git-pull.sh. But they were
not documented as the pull options they now are, so let's fix that.

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

quote.h: simplify the inclusionJonathan Nieder Wed, 5 Jan 2011 00:36:34 +0000 (18:36 -0600)

quote.h: simplify the inclusion

Attempting to include quote.h without first including strbuf.h results
in warnings:

./quote.h:33:33: warning: ‘struct strbuf’ declared inside parameter list
./quote.h:33:33: warning: its scope is only this definition or declaration, which is probably not what you want
./quote.h:34:34: warning: ‘struct strbuf’ declared inside parameter list
...

Add a toplevel declaration for struct strbuf to avoid this.

While at it, stop including system headers from quote.h. git source
files already need to include git-compat-util.h sooner to ensure the
appropriate feature test macros are defined.

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

sha1_object_info: examine cached_object store tooNguyễn Thái Ngọc Duy Sat, 5 Feb 2011 14:03:02 +0000 (21:03 +0700)

sha1_object_info: examine cached_object store too

Cached object store was added in d66b37b (Add pretend_sha1_file()
interface. - 2007-02-04) as a way to temporarily inject some objects
to object store.

But only read_sha1_file() knows about this store. While it will return
an object from this store, sha1_object_info() will happily say
"object not found".

Teach sha1_object_info() about the cached store for consistency.

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

sha1_file.c: move find_cached_object up so sha1_object_... Nguyễn Thái Ngọc Duy Sat, 5 Feb 2011 14:03:01 +0000 (21:03 +0700)

sha1_file.c: move find_cached_object up so sha1_object_info can use it

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

Add const to parse_{commit,tag}_buffer()Nguyễn Thái Ngọc Duy Sat, 5 Feb 2011 10:52:20 +0000 (17:52 +0700)

Add const to parse_{commit,tag}_buffer()

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

diff: support --cached on unborn branchesNguyễn Thái Ngọc Duy Thu, 3 Feb 2011 06:23:34 +0000 (13:23 +0700)

diff: support --cached on unborn branches

"git diff --cached" (without revision) used to mean "git diff --cached
HEAD" (i.e. the user was too lazy to type HEAD). This "correctly"
failed when there was no commit yet. But was that correctness useful?

This patch changes the definition of what particular command means.
It is a request to show what _would_ be committed without further "git
add". The internal implementation is the same "git diff --cached HEAD"
when HEAD exists, but when there is no commit yet, it compares the index
with an empty tree object to achieve the desired result.

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

gitweb: Mention optional Perl modules in INSTALLJakub Narebski Thu, 3 Feb 2011 23:20:48 +0000 (00:20 +0100)

gitweb: Mention optional Perl modules in INSTALL

Some optional additional Perl modules are required for some of extra
features. Mention those in gitweb/INSTALL.

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

post-receive-email: suppress error if description file... Sitaram Chamarty Thu, 3 Feb 2011 01:00:32 +0000 (06:30 +0530)

post-receive-email: suppress error if description file missing

Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t7407: fix line endings for mingw buildPat Thoyts Thu, 3 Feb 2011 15:31:44 +0000 (15:31 +0000)

t7407: fix line endings for mingw build

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t4120-apply-popt: help systems with core.filemode=falseJohannes Sixt Thu, 3 Feb 2011 15:31:43 +0000 (15:31 +0000)

t4120-apply-popt: help systems with core.filemode=false

A test case verifies that filemode-only patches work as expected. Help
systems where "test -x" does not work by applying the test patch also to
the index, where the effects can be verified even on such systems.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t3509: use unconstrained initial test to setup repository.Pat Thoyts Thu, 3 Feb 2011 15:31:42 +0000 (15:31 +0000)

t3509: use unconstrained initial test to setup repository.

The first test did not run on msysGit due to the SYMLINKS constraint and
so subsequent tests failed because the test repository was not initialized.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

start_command: flush buffers in the WIN32 code path... Johannes Sixt Fri, 4 Feb 2011 08:41:58 +0000 (09:41 +0100)

start_command: flush buffers in the WIN32 code path as well

The POSIX code path did The Right Thing already, but we have to do the same
on Windows.

This bug caused failures in t5526-fetch-submodules, where the output of
'git fetch --recurse-submodules' was in the wrong order.

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

bundle: Use OFS_DELTA in bundle filesShawn O. Pearce Sun, 6 Feb 2011 00:58:53 +0000 (16:58 -0800)

bundle: Use OFS_DELTA in bundle files

git-bundle first appeared in 2e0afafe ("Add git-bundle") in Feb 2007,
and first shipped in Git 1.5.1.

However, OFS_DELTA is an even earlier invention, coming about in
eb32d236 ("introduce delta objects with offset to base") in Sep 2006,
and first shipped in Git 1.4.4.5.

OFS_DELTA is smaller, about 3.2%-5% smaller, and is typically faster
to access than REF_DELTA because the exact location of the delta base
is available after parsing the object header. Since all bundle aware
versions of Git are also OFS_DELTA aware, just make it the default.

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>

Merge branch 'jl/fetch-submodule-recursive' into maintJunio C Hamano Mon, 31 Jan 2011 18:05:57 +0000 (10:05 -0800)

Merge branch 'jl/fetch-submodule-recursive' into maint

* jl/fetch-submodule-recursive:
t5526: Fix wrong argument order in "git config"

t5526: Fix wrong argument order in "git config"Jens Lehmann Mon, 31 Jan 2011 16:51:25 +0000 (17:51 +0100)

t5526: Fix wrong argument order in "git config"

This fixes a typo where the "git config" arguments "-f" and "--unset" were
swapped leading to the creation of a "--unset" file.

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

Git 1.7.4 v1.7.4Junio C Hamano Sun, 30 Jan 2011 19:53:13 +0000 (11:53 -0800)

Git 1.7.4

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

fsck: do not give up too early in fsck_dir()Junio C Hamano Wed, 26 Jan 2011 21:01:54 +0000 (13:01 -0800)

fsck: do not give up too early in fsck_dir()

When there is a random garbage file whose name happens to be 38-byte
long in a .git/objects/??/ directory, the loop terminated prematurely
without marking all the other files that it hasn't checked in the
readdir() loop.

Treat such a file just like any other garbage file, and do not break out
of the readdir() loop.

While at it, replace repeated sprintf() calls to a single one outside the
loop.

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

fsck: drop unused parameter from traverse_one_object()Junio C Hamano Wed, 26 Jan 2011 20:46:55 +0000 (12:46 -0800)

fsck: drop unused parameter from traverse_one_object()

Also add comments to seemingly unsafe pointer dereferences, that
are all safe.

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

Don't pass "--xhtml" to hightlight in gitweb.perl script.Adam Tkac Thu, 27 Jan 2011 12:51:51 +0000 (13:51 +0100)

Don't pass "--xhtml" to hightlight in gitweb.perl script.

The "--xhtml" option is supported only in highlight < 3.0. There is no option
to enforce (X)HTML output format compatible with both highlight < 3.0 and
highlight >= 3.0. However default output format is HTML so we don't need to
explicitly specify it.

Signed-off-by: Adam Tkac <atkac@redhat.com>
Helped-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Thu, 27 Jan 2011 18:27:49 +0000 (10:27 -0800)

Merge branch 'maint'

* maint:
rebase -i: clarify in-editor documentation of "exec"
tests: sanitize more git environment variables
fast-import: treat filemodify with empty tree as delete
rebase: give a better error message for bogus branch
rebase: use explicit "--" with checkout

Conflicts:
t/t9300-fast-import.sh

rebase -i: clarify in-editor documentation of "exec"Jonathan Nieder Fri, 21 Jan 2011 00:36:24 +0000 (18:36 -0600)

rebase -i: clarify in-editor documentation of "exec"

The hints in the current "instruction sheet" template look like so:

# Rebase 3f14246..a1d7e01 onto 3f14246
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x <cmd>, exec <cmd> = Run a shell command <cmd>, and stop if it fails
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#

This does not make it clear that the format of each line is

<insn> <commit id> <explanatory text that will be printed>

but the reader will probably infer that from the automatically
generated pick examples above it.

What about the "exec" instruction? By analogy, I might imagine that
the format of that line is "exec <command> <explanatory text>", and
the "x <cmd>" hint does not address that question (at first I read it
as taking an argument <cmd> that is the name of a shell). Meanwhile,
the mention of <cmd> makes the hints harder to scan as a table.

So remove the <cmd> and add some words to remind the reader that
"exec" runs a command named by the rest of the line. To make room, it
is left to the manpage to explain that that command is run using
$SHELL and that nonzero status from that command will pause the
rebase.

Wording from Junio.

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

tests: sanitize more git environment variablesJeff King Wed, 26 Jan 2011 20:33:32 +0000 (15:33 -0500)

tests: sanitize more git environment variables

These variables should generally not be set in one's
environment, but they do get set by rebase, which means
doing an interactive rebase like:

pick abcd1234 foo
exec make test

will cause false negatives in the test suite.

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

Merge branch 'jn/fast-import-empty-tree-removal' into... Junio C Hamano Thu, 27 Jan 2011 18:23:53 +0000 (10:23 -0800)

Merge branch 'jn/fast-import-empty-tree-removal' into maint

* jn/fast-import-empty-tree-removal:
fast-import: treat filemodify with empty tree as delete

fast-import: treat filemodify with empty tree as deleteJonathan Nieder Thu, 27 Jan 2011 06:07:49 +0000 (00:07 -0600)

fast-import: treat filemodify with empty tree as delete

Normal git processes do not allow one to build a tree with an empty
subtree entry without trying hard at it. This is in keeping with the
general UI philosophy: git tracks content, not empty directories.

v1.7.3-rc0~75^2 (2010-06-30) changed that by making it easy to include
an empty subtree in fast-import's active commit:

M 040000 4b825dc642cb6eb9a060e54bf8d69288fbee4904 subdir

One can trigger this by reading an empty tree (for example, the tree
corresponding to an empty root commit) and trying to move it to a
subtree. It is better and more closely analogous to 'git read-tree
--prefix' to treat such commands as requests to remove the subtree.

Noticed-by: David Barr <david.barr@cordelta.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

rebase: give a better error message for bogus branchJeff King Thu, 27 Jan 2011 00:27:11 +0000 (19:27 -0500)

rebase: give a better error message for bogus branch

When you give a non-existent branch to git-rebase, it spits
out the usage. This can be confusing, since you may
understand the usage just fine, but simply have made a
mistake in the branch name.

Before:

$ git rebase origin bogus
Usage: git rebase ...

After:

$ git rebase origin bogus
fatal: no such branch: bogus
Usage: git rebase ...

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

rebase: use explicit "--" with checkoutJeff King Thu, 27 Jan 2011 00:26:59 +0000 (19:26 -0500)

rebase: use explicit "--" with checkout

In the case of a ref/pathname conflict, checkout will
already do the right thing and checkout the ref. However,
for a non-existant ref, this has two advantages:

1. If a file with that pathname exists, rebase will
refresh the file from the index and then rebase the
current branch instead of producing an error.

2. If no such file exists, the error message using an
explicit "--" is better:

# before
$ git rebase -i origin bogus
error: pathspec 'bogus' did not match any file(s) known to git.
Could not checkout bogus

# after
$ git rebase -i origin bogus
fatal: invalid reference: bogus
Could not checkout bogus

The problems seem to be trigger-able only through "git
rebase -i", as regular git-rebase checks the validity of the
branch parameter as a ref very early on. However, it doesn't
hurt to be defensive.

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

Git 1.7.4-rc3 v1.7.4-rc3Junio C Hamano Mon, 24 Jan 2011 19:00:00 +0000 (11:00 -0800)

Git 1.7.4-rc3

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

Merge branch 'as/userdiff-pascal'Junio C Hamano Mon, 24 Jan 2011 18:54:12 +0000 (10:54 -0800)

Merge branch 'as/userdiff-pascal'

* as/userdiff-pascal:
userdiff: match Pascal class methods

Merge branch 'jn/setup-fixes'Junio C Hamano Mon, 24 Jan 2011 18:53:09 +0000 (10:53 -0800)

Merge branch 'jn/setup-fixes'

* jn/setup-fixes:
t1510: fix typo in the comment of a test
Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecase
Subject: setup: officially support --work-tree without --git-dir
tests: compress the setup tests
tests: cosmetic improvements to the repo-setup test
t/README: hint about using $(pwd) rather than $PWD in tests
Fix expected values of setup tests on Windows

t1510: fix typo in the comment of a testJonathan Nieder Sat, 22 Jan 2011 20:02:48 +0000 (14:02 -0600)

t1510: fix typo in the comment of a test

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

Documentation updates for 'GIT_WORK_TREE without GIT_DI... Junio C Hamano Sun, 23 Jan 2011 23:49:41 +0000 (15:49 -0800)

Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecase

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

Subject: setup: officially support --work-tree without... Jonathan Nieder Wed, 19 Jan 2011 12:42:30 +0000 (06:42 -0600)

Subject: setup: officially support --work-tree without --git-dir

The original intention of --work-tree was to allow people to work in a
subdirectory of their working tree that does not have an embedded .git
directory. Because their working tree, which their $cwd was in, did not
have an embedded .git, they needed to use $GIT_DIR to specify where it is,
and because this meant there was no way to discover where the root level
of the working tree was, so we needed to add $GIT_WORK_TREE to tell git
where it was.

However, this facility has long been (mis)used by people's scripts to
start git from a working tree _with_ an embedded .git directory, let git
find .git directory, and then pretend as if an unrelated directory were
the associated working tree of the .git directory found by the discovery
process. It happens to work in simple cases, and is not worth causing
"regression" to these scripts.

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

Documentation: do not treat reset --keep as a special... Jonathan Nieder Fri, 21 Jan 2011 18:37:34 +0000 (12:37 -0600)

Documentation: do not treat reset --keep as a special case

The current treatment of "git reset --keep" emphasizes how it
differs from --hard (treatment of local changes) and how it breaks
down into plumbing (git read-tree -m -u HEAD <commit> followed by git
update-ref HEAD <commit>). This can discourage people from using
it, since it might seem to be a complex or niche option.

Better to emphasize what the --keep flag is intended for --- moving
the index and worktree from one commit to another, like "git checkout"
would --- so the reader can make a more informed decision about the
appropriate situations in which to use it.

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

Correctly report corrupted objectsBjörn Steinbrink Thu, 20 Jan 2011 20:12:20 +0000 (21:12 +0100)

Correctly report corrupted objects

The errno check added in commit 3ba7a06 "A loose object is not corrupt
if it cannot be read due to EMFILE" only checked for whether errno is
not ENOENT and thus incorrectly treated "no error" as an error
condition.

Because of that, it never reached the code path that would report that
the object is corrupted and instead caused funny errors like:

fatal: failed to read object 333c4768ce595793fdab1ef3a036413e2a883853: Success

So we have to extend the check to cover the case in which the object
file was successfully read, but its contents are corrupted.

Reported-by: Will Palmer <wmpalmer@gmail.com>
Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

tests: compress the setup testsJonathan Nieder Wed, 19 Jan 2011 12:40:51 +0000 (06:40 -0600)

tests: compress the setup tests

New test helpers:

- setup_repo, to initialize a repository or gitfile pointing to a
repository, with core.bare and core.worktree set as specified;

- try_case, to run setup from a given directory and validate the
result, with GIT_DIR and GIT_WORK_TREE set as specified;

- try_repo, to initialize a repository and call "try_case" from the
toplevel and a subdirectory;

- run_wt_tests, to run a battery of tests that check for sane
behavior when GIT_WORK_TREE is set to various positions relative to
the .git dir and cwd.

Use these helpers to make the test shorter, less repetitive, and (one
hopes) easier to understand and modify.

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

tests: cosmetic improvements to the repo-setup testJonathan Nieder Wed, 19 Jan 2011 12:38:22 +0000 (06:38 -0600)

tests: cosmetic improvements to the repo-setup test

Give an overview in "sh t1510-repo-setup.sh --help" output.
Waste some vertical and horizontal space for clearer code.

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

Merge branch 'maint'Junio C Hamano Wed, 19 Jan 2011 16:33:54 +0000 (08:33 -0800)

Merge branch 'maint'

* maint:
exec_cmd: remove unused extern

exec_cmd: remove unused externErik Faye-Lund Mon, 10 Jan 2011 22:00:49 +0000 (23:00 +0100)

exec_cmd: remove unused extern

This definition was added by commit 77cb17e9, but it's left unused since
commit 511707d. Remove the left-over definition.

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

Merge branch 'jn/gitweb-no-logo' into maintJunio C Hamano Wed, 19 Jan 2011 16:26:47 +0000 (08:26 -0800)

Merge branch 'jn/gitweb-no-logo' into maint

* jn/gitweb-no-logo:
gitweb: make logo optional

Merge branch 'jk/diff-driver-binary-doc' into maintJunio C Hamano Wed, 19 Jan 2011 16:26:44 +0000 (08:26 -0800)

Merge branch 'jk/diff-driver-binary-doc' into maint

* jk/diff-driver-binary-doc:
docs: explain diff.*.binary option

Merge branch 'tr/submodule-relative-scp-url' into maintJunio C Hamano Wed, 19 Jan 2011 16:26:41 +0000 (08:26 -0800)

Merge branch 'tr/submodule-relative-scp-url' into maint

* tr/submodule-relative-scp-url:
submodule: fix relative url parsing for scp-style origin

Merge branch 'rj/maint-difftool-cygwin-workaround'... Junio C Hamano Wed, 19 Jan 2011 16:26:24 +0000 (08:26 -0800)

Merge branch 'rj/maint-difftool-cygwin-workaround' into maint

* rj/maint-difftool-cygwin-workaround:
difftool: Fix failure on Cygwin

Merge branch 'rj/maint-test-fixes' into maintJunio C Hamano Wed, 19 Jan 2011 16:26:17 +0000 (08:26 -0800)

Merge branch 'rj/maint-test-fixes' into maint

* rj/maint-test-fixes:
t9501-*.sh: Fix a test failure on Cygwin
lib-git-svn.sh: Add check for mis-configured web server variables
lib-git-svn.sh: Avoid setting web server variables unnecessarily
t9142: Move call to start_httpd into the setup test
t3600-rm.sh: Don't pass a non-existent prereq to test #15

Merge branch 'jn/maint-gitweb-pathinfo-fix' into maintJunio C Hamano Wed, 19 Jan 2011 16:26:04 +0000 (08:26 -0800)

Merge branch 'jn/maint-gitweb-pathinfo-fix' into maint

* jn/maint-gitweb-pathinfo-fix:
gitweb: Fix handling of whitespace in generated links

Merge branch 'ak/describe-exact' into maintJunio C Hamano Wed, 19 Jan 2011 16:25:52 +0000 (08:25 -0800)

Merge branch 'ak/describe-exact' into maint

* ak/describe-exact:
describe: Delay looking up commits until searching for an inexact match
describe: Store commit_names in a hash table by commit SHA1
describe: Do not use a flex array in struct commit_name
describe: Use for_each_rawref

Merge branch 'jn/maint-fast-import-object-reuse' into... Junio C Hamano Wed, 19 Jan 2011 16:25:46 +0000 (08:25 -0800)

Merge branch 'jn/maint-fast-import-object-reuse' into maint

* jn/maint-fast-import-object-reuse:
fast-import: insert new object entries at start of hash bucket

Merge branch 'jn/submodule-b-current' into maintJunio C Hamano Wed, 19 Jan 2011 16:25:41 +0000 (08:25 -0800)

Merge branch 'jn/submodule-b-current' into maint

* jn/submodule-b-current:
git submodule: Remove now obsolete tests before cloning a repo
git submodule -b ... of current HEAD fails

Merge branch 'jc/maint-svn-info-test-fix' into maintJunio C Hamano Wed, 19 Jan 2011 16:25:38 +0000 (08:25 -0800)

Merge branch 'jc/maint-svn-info-test-fix' into maint

* jc/maint-svn-info-test-fix:
t9119: do not compare "Text Last Updated" line from "svn info"

Merge branch 'nd/maint-relative' into maintJunio C Hamano Wed, 19 Jan 2011 16:25:31 +0000 (08:25 -0800)

Merge branch 'nd/maint-relative' into maint

* nd/maint-relative:
get_cwd_relative(): do not misinterpret root path

Documentation/fast-import: put explanation of M 040000... Jonathan Nieder Sun, 16 Jan 2011 02:22:35 +0000 (20:22 -0600)

Documentation/fast-import: put explanation of M 040000 <dataref> "" in context

Omit needless words ("Additionally ... <path> may also" is redundant).
While at it, place the explanation of this special case after the
general rules for paths to provide the reader with some context.

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

svndump.c: Fix a printf format compiler warningRamsay Jones Tue, 11 Jan 2011 18:17:21 +0000 (18:17 +0000)

svndump.c: Fix a printf format compiler warning

In particular, on systems that define uint32_t as an unsigned long,
gcc complains as follows:

CC vcs-svn/svndump.o
vcs-svn/svndump.c: In function `svndump_read':
vcs-svn/svndump.c:215: warning: int format, uint32_t arg (arg 2)

In order to suppress the warning we use the C99 format specifier
macro PRIu32 from <inttypes.h>.

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

remote-ext: do not segfault for blank linesJonathan Nieder Sun, 16 Jan 2011 03:49:40 +0000 (21:49 -0600)

remote-ext: do not segfault for blank lines

Instead of stripping space characters past the beginning of the
line and overflowing a buffer, stop at the beginning of the line
(mimicking the corresponding fix in remote-fd).

The argument to isspace does not need to be cast explicitly because
git isspace takes care of that already.

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

Documentation/fast-import: capitalize beginning of... Jonathan Nieder Sun, 16 Jan 2011 02:16:05 +0000 (20:16 -0600)

Documentation/fast-import: capitalize beginning of sentence

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

t4034 (diff --word-diff): add a minimum Perl drier... Junio C Hamano Tue, 18 Jan 2011 17:43:43 +0000 (09:43 -0800)

t4034 (diff --word-diff): add a minimum Perl drier test vector

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

t4034 (diff --word-diff): style suggestionsJonathan Nieder Tue, 11 Jan 2011 21:49:57 +0000 (15:49 -0600)

t4034 (diff --word-diff): style suggestions

Rearrange code to be easier to browse:

- first data
- then functions
- then test assertions

Mark up inline test vectors as

cat >vector <<-\EOF
data
data
EOF

for visual scannability. Use words like "set up" for tests that set
up for other tests, to make it obvious which tests are safe to skip.
Use repeated function calls instead of a loop for the
language-specific tests, so the invocations can be easily tweaked
individually (for example if one starts to fail).

This means if you add a new subdirectory to t4034/, it will not be
automatically used. I think that's worth it for the added
explicitness.

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

userdiff: simplify word-diff safeguardJonathan Nieder Tue, 11 Jan 2011 21:48:50 +0000 (15:48 -0600)

userdiff: simplify word-diff safeguard

git's diff-words support has a detail that can be a little dangerous:
any text not matched by a given language's tokenization pattern is
treated as whitespace and changes in such text would go unnoticed.
Therefore each of the built-in regexes allows a special token type
consisting of a single non-whitespace character [^[:space:]].

To make sure UTF-8 sequences remain human readable, the builtin
regexes also have a special token type for runs of bytes with the high
bit set. In English, non-ASCII characters are usually isolated so
this is analogous to the [^[:space:]] pattern, except it matches a
single _multibyte_ character despite use of the C locale.

Unfortunately it is easy to make typos or forget entirely to include
these catch-all token types when adding support for new languages (see
v1.7.3.5~16, userdiff: fix typo in ruby and python word regexes,
2010-12-18). Avoid this by including them automatically within the
PATTERNS and IPATTERN macros.

While at it, change the UTF-8 sequence token type to match exactly one
non-ASCII multi-byte character, rather than an arbitrary run of them.

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

t4034: bulk verify builtin word regex sanityThomas Rast Sat, 18 Dec 2010 16:17:54 +0000 (17:17 +0100)

t4034: bulk verify builtin word regex sanity

The builtin word regexes should be tested with some simple examples
against simple issues. Do this in bulk.

Mainly due to a lack of language knowledge and inspiration, most of
the test cases (cpp, csharp, java, objc, pascal, php, python, ruby)
are directly based off a C operator precedence table to verify that
all operators are split correctly. This means that they are probably
incomplete or inaccurate except for 'cpp' itself.

Still, they are good enough to already have uncovered a typo in the
python and ruby patterns.

'fortran' is based on my anecdotal knowledge of the DO10I parsing
rules, and thus probably useless. The rest (bibtex, html, tex) are an
ad-hoc test of what I consider important splits in those languages.

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

fast-import: Introduce --import-marks-if-existsRamkumar Ramachandra Sat, 15 Jan 2011 06:31:46 +0000 (12:01 +0530)

fast-import: Introduce --import-marks-if-exists

When a frontend uses a marks file to ensure its state persists between
runs, it may represent "clean slate" when bootstrapping with "no marks
yet". In such a case, feeding the last state with --import-marks and
saving the state after the current run with --export-marks would be a
natural thing to do.

The --import-marks option however errors out when the specified marks file
doesn't exist; this makes bootstrapping a bit difficult. The location of
the marks file becomes backend-dependent when --relative-marks is in
effect, and the frontend cannot check for the existence of the file in
such a case.

The --import-marks-if-exists option does the same thing as --import-marks
but does not flag an error if the named file does not exist yet to help
these frontends.

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

ll-merge: simplify opts == NULL caseJonathan Nieder Sun, 16 Jan 2011 01:08:42 +0000 (19:08 -0600)

ll-merge: simplify opts == NULL case

As long as sizeof(struct ll_merge_options) is small, there is not
much reason not to keep a copy of the default merge options in the BSS
section. In return, we get clearer code and one less stack frame in
the opts == NULL case.

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

Git 1.7.4-rc2 v1.7.4-rc2Junio C Hamano Thu, 13 Jan 2011 19:42:01 +0000 (11:42 -0800)

Git 1.7.4-rc2

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

Merge branch 'jn/gitweb-no-logo'Junio C Hamano Thu, 13 Jan 2011 19:39:18 +0000 (11:39 -0800)

Merge branch 'jn/gitweb-no-logo'

* jn/gitweb-no-logo:
gitweb: make logo optional

Merge branch 'jn/perl-funcname'Junio C Hamano Thu, 13 Jan 2011 19:38:05 +0000 (11:38 -0800)

Merge branch 'jn/perl-funcname'

* jn/perl-funcname:
userdiff/perl: catch BEGIN/END/... and POD as headers
diff: funcname and word patterns for perl

Merge branch 'sr/gitweb-hilite-more'Junio C Hamano Thu, 13 Jan 2011 19:36:12 +0000 (11:36 -0800)

Merge branch 'sr/gitweb-hilite-more'

* sr/gitweb-hilite-more:
gitweb: remove unnecessary test when closing file descriptor
gitweb: add extensions to highlight feature map

Merge branch 'rj/svn-test'Junio C Hamano Thu, 13 Jan 2011 19:36:05 +0000 (11:36 -0800)

Merge branch 'rj/svn-test'

* rj/svn-test:
lib-git-svn.sh: Move web-server handling code into separate function

Merge branch 'rj/test-fixes'Junio C Hamano Thu, 13 Jan 2011 19:35:28 +0000 (11:35 -0800)

Merge branch 'rj/test-fixes'

* rj/test-fixes:
t4135-*.sh: Skip the "backslash" tests on cygwin
t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
t6038-*.sh: Pass the -b (--binary) option to sed on cygwin

Conflicts:
t/t3032-merge-recursive-options.sh

Merge branch 'jk/diff-driver-binary-doc'Junio C Hamano Thu, 13 Jan 2011 19:34:56 +0000 (11:34 -0800)

Merge branch 'jk/diff-driver-binary-doc'

* jk/diff-driver-binary-doc:
docs: explain diff.*.binary option

Merge branch 'jn/t9010-work-around-broken-svnadmin'Junio C Hamano Thu, 13 Jan 2011 19:34:52 +0000 (11:34 -0800)

Merge branch 'jn/t9010-work-around-broken-svnadmin'

* jn/t9010-work-around-broken-svnadmin:
t9010: svnadmin can fail even if available

Merge branch 'tr/submodule-relative-scp-url'Junio C Hamano Thu, 13 Jan 2011 19:34:39 +0000 (11:34 -0800)

Merge branch 'tr/submodule-relative-scp-url'

* tr/submodule-relative-scp-url:
submodule: fix relative url parsing for scp-style origin

RelNotes/1.7.4: minor fixesMichael J Gruber Thu, 13 Jan 2011 09:35:34 +0000 (10:35 +0100)

RelNotes/1.7.4: minor fixes

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

t0000: quote TAP snippets in test codeThomas Rast Thu, 13 Jan 2011 11:30:23 +0000 (12:30 +0100)

t0000: quote TAP snippets in test code

t0000 contains two snippets of actual test output. This causes
problems when passing -v to the test[*]: the test infrastructure
echoes the tests before running them, and the TAP parser then sees
this test output and concludes that two tests failed and that the TAP
output was badly formatted.

Guard against this by quoting the output in the source.

[*] either by running 'make smoke' with GIT_TEST_OPTS=-v, or with
prove ./t0000-basic.sh :: -v

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

unpack-trees: handle lstat failure for existing fileJonathan Nieder Thu, 13 Jan 2011 02:28:09 +0000 (20:28 -0600)

unpack-trees: handle lstat failure for existing file

When check_leading_path notices a file in the way of a new entry to be
checked out, verify_absent uses (1) the mode to determine whether it
is a directory (2) the rest of the stat information to check if this
is actually an old entry, disguised by a change in filename (e.g.,
README -> Readme) that is significant to git but insignificant to the
underlying filesystem. If lstat fails, these checks are performed
with an uninitialied stat structure, producing essentially random
results.

Better to just error out when lstat fails.

The easiest way to reproduce this is to remove a file after the
check_leading_path call and before the lstat in verify_absent. An
lstat failure other than ENOENT in check_leading_path would also
trigger the same code path.

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

unpack-trees: handle lstat failure for existing directoryJonathan Nieder Thu, 13 Jan 2011 02:26:36 +0000 (20:26 -0600)

unpack-trees: handle lstat failure for existing directory

When check_leading_path notices no file in the way of the new entry to
be checked out, verify_absent checks whether there is a directory
there or nothing at all. If that lstat call fails (for example due to
ENOMEM), it assumes ENOENT, meaning a directory with untracked files
would be clobbered in that case.

Check errno after calling lstat, and for conditions other than ENOENT,
just error out.

This is a theoretical race condition. lstat has to succeed moments
before it fails for there to be trouble.

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