git, branch v1.7.2-rc3

Git 1.7.2-rc3

2010-07-14T16:42:24Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/read-tree-cache-tree-fix'

2010-07-14T16:34:23Z

* jc/read-tree-cache-tree-fix: Fix "read-tree -m A B" priming the cache-tree

Use dev_t for device id (st_dev) from stat in setup_git_directory_gently()

2010-07-14T14:57:08Z

The original declaration was int, which seems to cause trouble on my machine. It causes spurious "filesystem boundary" errors when running the testsuite. The cause seems to be $ stat -c%d . 2147549952 which is too large for a 32-bit int type. Using the correct type, dev_t, solves the issue. (Because I'm paranoid and forgetful, I checked -- yes, Unix v7 had dev_t.) Other uses of st_dev seem to be reasonably safe. fill_stat_cache_info truncates it to an 'unsigned int', but that value seems to be used only to validate the cache, and only if USE_STDEV is defined. Signed-off-by: Raja R Harinath Signed-off-by: Junio C Hamano

Merge branch 'maint'

2010-07-13T16:14:35Z

* maint: git fetch documentation: describe short '-p' synonym to '--prune' option format-patch: document the format.to configuration setting

git fetch documentation: describe short '-p' synonym to '--prune' option

2010-07-13T16:13:34Z

It's already implemented, just undocumented. Signed-off-by: Oren Held Signed-off-by: Junio C Hamano

format-patch: document the format.to configuration setting

2010-07-13T16:02:59Z

[jc: with simplification from Jonathan Nieder] Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano

test-lib: TAP compliance for skipping tests on request

2010-07-12T14:53:08Z

Make the output TAP compliant for tests skipped on request (GIT_SKIP_TESTS). Signed-off-by: Michael J Gruber Acked-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

test-lib: simplify GIT_SKIP_TESTS loop

2010-07-12T14:52:52Z

04ece59 (GIT_SKIP_TESTS: allow users to omit tests that are known to break, 2006-12-28) introduced GIT_SKIP_TESTS, and since then we have had two nested loops iterating over GIT_SKIP_TESTS with the same loop variable. Reduce this to one loop. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano

Merge branch 'maint'

2010-07-12T06:47:29Z

* maint: Documentation: Spelling fix in protocol-capabilities.txt checkout: accord documentation to what git does t0005: work around strange $? in ksh when program terminated by a signal

Documentation: Spelling fix in protocol-capabilities.txt

2010-07-10T00:36:28Z

Signed-off-by: Fredrik Skolmli Signed-off-by: Junio C Hamano