git/t, branch v2.4.0

Merge branch 'tb/connect-ipv6-parse-fix'

2015-04-20T22:28:33Z

An earlier update to the parser that disects an address broke an address, followed by a colon, followed by an empty string (instead of the port number). * tb/connect-ipv6-parse-fix: connect.c: ignore extra colon after hostname

Merge branch 'va/fix-git-p4-tests'

2015-04-20T22:28:32Z

Test fixes for git-p4. * va/fix-git-p4-tests: t9814: guarantee only one source exists in git-p4 copy tests git-p4: fix copy detection test t9814: fix broken shell syntax in git-p4 rename test

Merge branch 'jc/update-instead-into-void'

2015-04-14T18:49:10Z

A push into an unborn branch, with "receive.denyCurrentBranch" set to "updateInstead", did not check out the working tree as expected. * jc/update-instead-into-void: push-to-deploy: allow pushing into an unborn branch and updating it

t9814: guarantee only one source exists in git-p4 copy tests

2015-04-13T03:25:17Z

By using a tree with multiple identical files and allowing copy detection to choose any one of them, the check in the test is unnecessarily complex. We can simplify by: * Modify source file (file2) before copying the file. * Check that only file2 is the source in the output of "p4 filelog". * Remove all "case" statements and replace them with simple tests to check that source is "file2". Signed-off-by: Vitor Antunes Acked-by: Luke Diamand Signed-off-by: Junio C Hamano

connect.c: ignore extra colon after hostname

2015-04-09T04:00:53Z

Ignore an extra ':' at the end of the hostname in URL's like "ssh://example.com:/path/to/repo" The colon is meant to separate a port number from the hostname. If the port is empty, the colon should be ignored, see RFC 3986. It had been working for URLs with ssh:// scheme, but was unintentionally broken in 86ceb3, "allow ssh://user@[2001:db8::1]/repo.git" Reported-by: Reid Woodbury Jr. Signed-off-by: Torsten Bögershausen Signed-off-by: Junio C Hamano

push-to-deploy: allow pushing into an unborn branch and updating it

2015-04-02T05:40:10Z

Setting receive.denycurrentbranch to updateinstead and pushing into the current branch, when the working tree and the index is truly clean, is supposed to reset the working tree and the index to match the tree of the pushed commit. This did not work when pushing into an unborn branch. The code that drives push-to-checkout hook needs no change, as the interface is defined so that hook can decide what to do when the push is coming to an unborn branch and take an appropriate action since the beginning. Acked-by: Johannes Schindelin Signed-off-by: Junio C Hamano

git-p4: fix copy detection test

2015-03-28T15:55:54Z

File file11 is copied from file2 and diff-tree correctly reports this file as its the source. But it is possible that the diff-tree algorithm detects file10, which was also copied from file2, as the origin of the new file. This fix uses a case statement to support both files as the source of file11, as was done in other tests in this file. Signed-off-by: Vitor Antunes Signed-off-by: Junio C Hamano

t9814: fix broken shell syntax in git-p4 rename test

2015-03-28T15:55:27Z

An update to the tests in 2.1 era introduced a broken case statements that lack closing esac. Signed-off-by: Vitor Antunes Signed-off-by: Junio C Hamano

Merge branch 'jk/test-chain-lint'

2015-03-26T18:57:14Z

People often forget to chain the commands in their test together with &&, leaving a failure from an earlier command in the test go unnoticed. The new GIT_TEST_CHAIN_LINT mechanism allows you to catch such a mistake more easily. * jk/test-chain-lint: (36 commits) t9001: drop save_confirm helper t0020: use test_* helpers instead of hand-rolled messages t: simplify loop exit-code status variables t: fix some trivial cases of ignored exit codes in loops t7701: fix ignored exit code inside loop t3305: fix ignored exit code inside loop t0020: fix ignored exit code inside loops perf-lib: fix ignored exit code inside loop t6039: fix broken && chain t9158, t9161: fix broken &&-chain in git-svn tests t9104: fix test for following larger parents t4104: drop hand-rolled error reporting t0005: fix broken &&-chains t7004: fix embedded single-quotes t0050: appease --chain-lint t9001: use test_when_finished t4117: use modern test_* helpers t6034: use modern test_* helpers t1301: use modern test_* helpers t0020: use modern test_* helpers ...

Merge branch 'tg/test-index-v4'

2015-03-25T19:54:27Z

A test fix. * tg/test-index-v4: t1700: make test pass with index-v4