git/t, branch v2.3.8

Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3

2015-05-11T21:34:01Z

Documentation fix. * mm/usage-log-l-can-take-regex: log -L: improve error message on malformed argument Documentation: change -L: to -L:

Merge branch 'jc/diff-no-index-d-f' into maint-2.3

2015-05-11T21:34:00Z

The usual "git diff" when seeing a file turning into a directory showed a patchset to remove the file and create all files in the directory, but "git diff --no-index" simply refused to work. Also, when asked to compare a file and a directory, imitate POSIX "diff" and compare the file with the file with the same name in the directory, instead of refusing to run. * jc/diff-no-index-d-f: diff-no-index: align D/F handling with that of normal Git diff-no-index: DWIM "diff D F" into "diff D/F F"

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

2015-04-27T19:23:54Z

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

Merge branch 'jk/test-annoyances' into maint

2015-04-21T19:12:24Z

Test fixes. * jk/test-annoyances: t5551: make EXPENSIVE test cheaper t5541: move run_with_cmdline_limit to test-lib.sh t: pass GIT_TRACE through Apache t: redirect stderr GIT_TRACE to descriptor 4 t: translate SIGINT to an exit

log -L: improve error message on malformed argument

2015-04-20T18:06:10Z

The old message did not mention the :regex:file form. To avoid overly long lines, split the message into two lines (in case item->string is long, it will be the only part truncated in a narrow terminal). Signed-off-by: Matthieu Moy 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

Merge branch 'tg/test-index-v4' into maint

2015-03-28T16:33:14Z

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

Merge branch 'ct/prompt-untracked-fix' into maint

2015-03-28T16:33:12Z

The prompt script (in contrib/) did not show the untracked sign when working in a subdirectory without any untracked files. * ct/prompt-untracked-fix: git prompt: use toplevel to find untracked files

Merge branch 'jk/fetch-pack' into maint

2015-03-28T16:33:08Z

"git fetch" that fetches a commit using the allow-tip-sha1-in-want extension could have failed to fetch all the requested refs. * jk/fetch-pack: fetch-pack: remove dead assignment to ref->new_sha1 fetch_refs_via_pack: free extra copy of refs filter_ref: make a copy of extra "sought" entries filter_ref: avoid overwriting ref->old_sha1 with garbage

Merge branch 'jk/prune-with-corrupt-refs' into maint

2015-03-28T16:33:06Z

"git prune" used to largely ignore broken refs when deciding which objects are still being used, which could spread an existing small damage and make it a larger one. * jk/prune-with-corrupt-refs: refs.c: drop curate_packed_refs repack: turn on "ref paranoia" when doing a destructive repack prune: turn on ref_paranoia flag refs: introduce a "ref paranoia" flag t5312: test object deletion code paths in a corrupted repository