git/t, branch v2.6.7

Merge branch 'jk/pending-keep-tag-name' into maint

2016-01-04T22:03:08Z

History traversal with "git log --source" that starts with an annotated tag failed to report the tag as "source", due to an old regression in the command line parser back in v2.2 days. * jk/pending-keep-tag-name: revision.c: propagate tag names from pending array

Merge branch 'jk/symbolic-ref-maint' into maint

2016-01-04T22:02:58Z

"git symbolic-ref" forgot to report a failure with its exit status. * jk/symbolic-ref-maint: t1401: test reflog creation for git-symbolic-ref symbolic-ref: propagate error code from create_symref()

t1401: test reflog creation for git-symbolic-ref

2015-12-21T20:06:31Z

The current code writes a reflog entry whenever we update a symbolic ref, but we never test that this is so. Let's add a test to make sure upcoming refactoring doesn't cause a regression. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

symbolic-ref: propagate error code from create_symref()

2015-12-21T20:03:03Z

If create_symref() fails, git-symbolic-ref will still exit with code 0, and our caller has no idea that the command did nothing. This appears to have been broken since the beginning of time (e.g., it is not a regression where create_symref() stopped calling die() or something similar). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

revision.c: propagate tag names from pending array

2015-12-17T18:47:56Z

When we unwrap a tag to find its commit for a traversal, we do not propagate the "name" field of the tag in the pending array (i.e., the ref name the user gave us in the first place) to the commit (instead, we use an empty string). This means that "git log --source" will never show the tag-name for commits we reach through it. This was broken in 2073949 (traverse_commit_list: support pending blobs/trees with paths, 2014-10-15). That commit tried to be careful and avoid propagating the path information for a tag (which would be nonsensical) to trees and blobs. But it should not have cut off the "name" field, which should carry forward to children. Note that this does mean that the "name" field will carry forward to blobs and trees, too. Whereas prior to 2073949, we always gave them an empty string. This is the right thing to do, but in practice no callers probably use it (since now we have an explicit separate "path" field, which was the point of 2073949). We add tests here not only for the broken case, but also a basic sanity test of "log --source" in general, which did not have any coverage in the test suite. Reported-by: Raymundo Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'ls/p4-keep-empty-commits' into maint

2015-12-15T17:34:19Z

"git p4" used to import Perforce CLs that touch only paths outside the client spec as empty commits. It has been corrected to ignore them instead, with a new configuration git-p4.keepEmptyCommits as a backward compatibility knob. * ls/p4-keep-empty-commits: git-p4: add option to keep empty commits

Merge branch 'cb/t3404-shellquote' into maint

2015-12-11T19:14:18Z

* cb/t3404-shellquote: t3404: fix quoting of redirect for some versions of bash

Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maint

2015-12-11T19:14:10Z

Because "test_when_finished" in our test framework queues the clean-up tasks to be done in a shell variable, it should not be used inside a subshell. Add a mechanism to allow 'bash' to catch such uses, and fix the ones that were found. * jk/test-lint-forbid-when-finished-in-subshell: test-lib-functions: detect test_when_finished in subshell t7800: don't use test_config in a subshell test-lib-functions: support "test_config -C ..." t5801: don't use test_when_finished in a subshell t7610: don't use test_config in a subshell

git-p4: add option to keep empty commits

2015-12-10T18:45:02Z

A changelist that contains only excluded files due to a client spec was imported as an empty commit. Fix that issue by ignoring these commits. Add option "git-p4.keepEmptyCommits" to make the previous behavior available. Signed-off-by: Lars Schneider Helped-by: Pete Harlan Acked-by: Luke Diamand Signed-off-by: Junio C Hamano

Merge branch 'sg/bash-prompt-dirty-orphan' into maint

2015-12-08T22:05:02Z

Produce correct "dirty" marker for shell prompts, even when we are on an orphan or an unborn branch. * sg/bash-prompt-dirty-orphan: bash prompt: indicate dirty index even on orphan branches bash prompt: remove a redundant 'git diff' option bash prompt: test dirty index and worktree while on an orphan branch