git/t, branch v2.3.0

Merge branch 'js/t1050'

2015-01-22T21:46:45Z

* js/t1050: t1050-large: generate large files without dd

Merge branch 'jh/empty-notes'

2015-01-22T21:42:37Z

* jh/empty-notes: Fix unclosed here document in t3301.sh

Fix unclosed here document in t3301.sh

2015-01-22T20:23:42Z

Commit 908a3203632a02568df230c0fccf9a2cd8da24e6 introduced indentation to here documents in t3301.sh. However in one place <<-EOF was missing -, which broke this test when run with mksh-50d. This commit fixes it. Signed-off-by: Kacper Kornet Acked-by: Johan Herland Signed-off-by: Junio C Hamano

Merge branch 'jk/colors'

2015-01-20T23:57:22Z

* jk/colors: parse_color: fix return value for numeric color values 0-8

parse_color: fix return value for numeric color values 0-8

2015-01-20T23:56:03Z

When commit 695d95d refactored the color parsing, it missed a "return 0" when parsing literal numbers 0-8 (which represent basic ANSI colors), leading us to report these colors as an error. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

t1050-large: generate large files without dd

2015-01-14T21:08:12Z

For some unknown reason, the dd on my Windows box segfaults randomly, but since recently, it does so much more often than it used to, which makes running the test suite burdensome. Use printf to write large files instead of dd. To emphasize that three of the large blobs are exact copies, use cp to allocate them. The new code makes the files a bit smaller, and they are not sparse anymore, but the tests do not depend on these properties. We do not want to use test-genrandom here (which is used to generate large files elsewhere in t1050), so that the files can be compressed well (which keeps the run-time short). The files are now large text files, not binary files. But since they are larger than core.bigfilethreshold they are diagnosed as binary by Git. For this reason, the 'git diff' tests that check the output for "Binary files differ" still pass. Signed-off-by: Johannes Sixt Reviewed-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'rc/for-each-ref-tracking'

2015-01-14T20:39:02Z

* rc/for-each-ref-tracking: for-each-ref: always check stat_tracking_info()'s return value

Merge branch 'rh/test-color-avoid-terminfo-in-original-home'

2015-01-14T20:36:45Z

We try to see if "tput" gives a useful result before switching TERM to dumb and moving HOME to point to our fake location for stability of the tests, and then use the command when coloring the output from the tests, but there is no guarantee "tput" works after switching HOME. * rh/test-color-avoid-terminfo-in-original-home: test-lib.sh: do tests for color support after changing HOME test-lib: use 'test ...' instead of '[ ... ]'

Merge branch 'rh/hide-prompt-in-ignored-directory'

2015-01-14T20:34:01Z

* rh/hide-prompt-in-ignored-directory: git-prompt.sh: allow to hide prompt for ignored pwd git-prompt.sh: if pc mode, immediately set PS1 to a plain prompt

Merge branch 'jk/prune-packed-server-info'

2015-01-14T20:30:27Z

Fix recent breakage in Git 2.2 that started creating info/refs and objects/info/packs files with permission bits tighter than user's umask. * jk/prune-packed-server-info: update-server-info: create info/* with mode 0666 t1301: set umask in reflog sharedrepository=group test