diff options
| author |  Luke Diamand <luke@diamand.org> | 2017-04-15 11:36:09 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-04-16 21:13:26 -0700 |
| commit | eff451101dcdc6fe023861c6c02a9bacc43f372e (patch) | |
| tree | 0b421a145c7ed74a7a2d3157d611a012d82bdfee /t | |
| parent | git-p4: add read_pipe_text() internal function (diff) | |
| download | tgif-eff451101dcdc6fe023861c6c02a9bacc43f372e.tar.xz | |
git-p4: don't use name-rev to get current branch
git-p4 was using "git name-rev" to find out the current branch.
That is not safe, since if multiple branches or tags point at
the same revision, the result obtained might not be what is
expected.
Instead use "git symbolic-ref".
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9807-git-p4-submit.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh index ae05816e09..3457d5db64 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 && ( |