diff options
| -rwxr-xr-x | git-p4.py | 2 | ||||
| -rwxr-xr-x | t/t9807-git-p4-submit.sh | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -549,7 +549,7 @@ def currentGitBranch(): # on a detached head return None else: - return read_pipe(["git", "name-rev", "HEAD"]).split(" ")[1].strip() + return read_pipe(["git", "symbolic-ref", "HEAD"]).strip()[11:] def isValidGitDir(path): if (os.path.exists(path + "/HEAD") diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh index 4e625fad07..643258500b 100755 --- a/t/t9807-git-p4-submit.sh +++ b/t/t9807-git-p4-submit.sh @@ -139,7 +139,7 @@ test_expect_success 'submit with master branch name from argv' ' ) ' -test_expect_failure 'allow submit from branch with same revision but different name' ' +test_expect_success 'allow submit from branch with same revision but different name' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( |