user/sven/git.git, branch v1.6.6.2Git
https://git.stealer.net/cgit.cgi/user/sven/git.git/atom?h=v1.6.6.22010-02-10T21:44:11ZGit 1.6.6.22010-02-10T21:44:11ZJunio C Hamanogitster@pobox.com2010-02-10T21:44:11Zurn:sha1:4133fd25525022f99d2c7ba339618433bdd919fe
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'maint-1.6.5' into maint2010-02-10T21:42:48ZJunio C Hamanogitster@pobox.com2010-02-10T21:42:48Zurn:sha1:216d2e0f3f9ab672077d0aa7aa20e6e9c2ac8ff3
* maint-1.6.5:
t8003: check exit code of command and error message separately
t8003: check exit code of command and error message separately2010-02-10T21:42:29ZJunio C Hamanogitster@pobox.com2010-02-09T18:06:33Zurn:sha1:33f0ea42e12d3f54ef8ff53580649885c1503d05
Shell reports exit status only from the most downstream command
in a pipeline. In these tests, we want to make sure that the
command fails in a controlled way, and produces a correct error
message.
This issue was known by Jay who submitted the patch, and also was
pointed out by Hannes during the review process, but I forgot to
fix it up before applying. Sorry about that.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'sp/maint-fast-import-large-blob' into maint2010-02-10T21:32:20ZJunio C Hamanogitster@pobox.com2010-02-10T21:32:20Zurn:sha1:57ffc0e775b2a77f2e88cf1cfb6c0c259706fbea
* sp/maint-fast-import-large-blob:
fast-import: Stream very large blobs directly to pack
Merge branch 'gp/maint-cvsserver' into maint2010-02-10T21:02:52ZJunio C Hamanogitster@pobox.com2010-02-10T21:02:52Zurn:sha1:800d1fb0ab4bc9c1f4cd13f7cb7d8851f23a3e50
* gp/maint-cvsserver:
git-cvsserver: allow regex metacharacters in CVSROOT
Merge branch 'jc/maint-reflog-bad-timestamp' into maint2010-02-10T21:02:43ZJunio C Hamanogitster@pobox.com2010-02-10T21:02:43Zurn:sha1:410e99fadf25b65b70d9bf90fd8bd5a5d1ea3c8a
* jc/maint-reflog-bad-timestamp:
t0101: use a fixed timestamp when searching in the reflog
Update @{bogus.timestamp} fix not to die()
approxidate_careful() reports errorneous date string
Merge branch 'il/maint-xmallocz' into maint2010-02-10T21:02:16ZJunio C Hamanogitster@pobox.com2010-02-10T21:02:16Zurn:sha1:c329898abb167f05e37f3d0305e833127a26a4d0
* il/maint-xmallocz:
Fix integer overflow in unpack_compressed_entry()
Fix integer overflow in unpack_sha1_rest()
Fix integer overflow in patch_delta()
Add xmallocz()
Merge branch 'jh/maint-config-file-prefix' into maint2010-02-10T21:02:05ZJunio C Hamanogitster@pobox.com2010-02-10T21:02:05Zurn:sha1:b0e67fffb42059cc5dca6f58c376a2ffc5fb4520
* jh/maint-config-file-prefix:
builtin-config: Fix crash when using "-f <relative path>" from non-root dir
Merge branch 'nd/include-termios-for-osol' into maint2010-02-10T21:01:55ZJunio C Hamanogitster@pobox.com2010-02-10T21:01:55Zurn:sha1:2e9d7330aaadd06d828da52f73eeda7106ba4cb4
* nd/include-termios-for-osol:
Add missing #include to support TIOCGWINSZ on Solaris
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maint2010-02-10T20:54:15ZJunio C Hamanogitster@pobox.com2010-02-10T20:54:15Zurn:sha1:a42332c21723fde9f36b579f6b39a23aa1aac137
* jc/maint-1.6.1-checkout-m-custom-merge:
checkout -m path: fix recreating conflicts
Conflicts:
t/t7201-co.sh