From: Julia Beliaeva Date: Wed, 16 Nov 2016 16:13:38 +0000 (+0300) Subject: [git] refs parser can recognize lines like HEAD -> refs/heads/master in git log output X-Git-Tag: rubymine/171.1024~1 X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=53f6d25eed36863f217ba7d891916931c07e41de [git] refs parser can recognize lines like HEAD -> refs/heads/master in git log output --- diff --git a/plugins/git4idea/tests/git4idea/test/RefParser.java b/plugins/git4idea/tests/git4idea/test/RefParser.java index 1f6ccf9c1fb1..61062b95ddc6 100644 --- a/plugins/git4idea/tests/git4idea/test/RefParser.java +++ b/plugins/git4idea/tests/git4idea/test/RefParser.java @@ -48,7 +48,7 @@ class RefParser { String strHash = input.substring(0, firstSpaceIndex); Hash hash = HashImpl.build(strHash); String refPaths = input.substring(firstSpaceIndex + 2, input.length() - 1); - String[] longRefPaths = refPaths.split(", "); + String[] longRefPaths = refPaths.split("(, )|( -> )"); List refs = new ArrayList<>(); for (String longRefPatch : longRefPaths) { VcsRef ref = createRef(hash, longRefPatch, root);