diff options
| author |  Luke Diamand <luke@diamand.org> | 2018-10-15 12:14:07 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-10-16 13:28:49 +0900 |
| commit | 088131273b7e781174eb1cffb7d4e0eb51066cba (patch) | |
| tree | 4c53c5dfb2610c6825b5beca6aa0c0696154accd /t/t9002-column.sh | |
| parent | git-p4: do not fail in verbose mode for missing 'fileSize' key (diff) | |
| download | tgif-088131273b7e781174eb1cffb7d4e0eb51066cba.tar.xz | |
git-p4: unshelve into refs/remotes/p4-unshelved, not refs/remotes/p4/unshelved
The branch detection code looks for branches under refs/remotes/p4/...
and can end up getting confused if there are unshelved changes in
there as well. This happens in the function p4BranchesInGit().
Instead, put the unshelved changes into refs/remotes/p4-unshelved/<N>.
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9002-column.sh')
0 files changed, 0 insertions, 0 deletions