git, branch v1.7.3-rc0

Merge branch 'maint'

2010-09-06T07:12:04Z

* maint: tag.c: whitespace breakages fix Fix whitespace issue in object.c t5505: add missing &&

Merge branch 'xx/trivial' into maint

2010-09-06T07:11:59Z

* xx/trivial: tag.c: whitespace breakages fix Fix whitespace issue in object.c t5505: add missing &&

tag.c: whitespace breakages fix

2010-09-06T05:32:05Z

Signed-off-by: Junio C Hamano

Fix whitespace issue in object.c

2010-09-06T05:12:29Z

Change some expanded tabs (spaces) to tabs in object.c. Signed-off-by: Jared Hance Signed-off-by: Junio C Hamano

t5505: add missing &&

2010-09-06T05:10:22Z

Signed-off-by: Jens Lehmann Signed-off-by: Junio C Hamano

Merge branch 'jl/submodule-ignore-diff'

2010-09-04T15:17:09Z

* jl/submodule-ignore-diff: checkout: Use submodule.*.ignore settings from .git/config and .gitmodules checkout: Add test for diff.ignoreSubmodules checkout: respect diff.ignoreSubmodules setting Conflicts: builtin/checkout.c

Merge branch 'ab/test-2'

2010-09-04T15:15:36Z

* ab/test-2: (51 commits) tests: factor HOME=$(pwd) in test-lib.sh test-lib: use subshell instead of cd $new && .. && cd $old tests: simplify "missing PREREQ" message t/t0000-basic.sh: Run the passing TODO test inside its own test-lib test-lib: Allow overriding of TEST_DIRECTORY test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../ test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../ test: Introduce $GIT_BUILD_DIR cvs tests: do not touch test CVS repositories shipped with source t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite t/t7105-reset-patch.sh: Add a PERL prerequisite t/t9001-send-email.sh: convert setup code to tests t/t9001-send-email.sh: change from skip_all=* to prereq skip t/t9001-send-email.sh: Remove needless PROG=* assignment t/t9600-cvsimport.sh: change from skip_all=* to prereq skip lib-patch-mode tests: change from skip_all=* to prereq skip t/t3701-add-interactive.sh: change from skip_all=* to prereq skip tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh t/Makefile: Create test-results dir for smoke target ... Conflicts: t/t6035-merge-dir-to-symlink.sh

Merge branch 'js/detached-stash'

2010-09-04T05:45:58Z

* js/detached-stash: t3903: fix broken test_must_fail calls detached-stash: update Documentation detached-stash: tests of git stash with stash-like arguments detached-stash: simplify git stash show detached-stash: simplify git stash branch detached-stash: refactor git stash pop implementation detached-stash: simplify stash_drop detached-stash: simplify stash_apply detached-stash: work around git rev-parse failure to detect bad log refs detached-stash: introduce parse_flags_and_revs function

Merge branch 'js/maint-reflog-beyond-horizon'

2010-09-04T05:24:29Z

* js/maint-reflog-beyond-horizon: t1503: fix broken test_must_fail calls rev-parse: tests git rev-parse --verify master@{n}, for various n sha1_name.c: use warning in preference to fprintf(stderr rev-parse: exit with non-zero status if ref@{n} is not valid.

Merge branch 'dg/local-mod-error-messages'

2010-09-04T05:23:49Z

* dg/local-mod-error-messages: t7609-merge-co-error-msgs: test non-fast forward case too. Move "show_all_errors = 1" to setup_unpack_trees_porcelain() setup_unpack_trees_porcelain: take the whole options struct as parameter Move set_porcelain_error_msgs to unpack-trees.c and rename it Conflicts: merge-recursive.c