diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-04-07 07:02:08 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-04-07 07:02:08 +0000 |
| commit | ba79c59f9f375fdbd9303d2cab7bac5df59746f7 (patch) | |
| tree | dda6201e6924e351604f9531e1542e8ec4a5f4b6 /lib | |
| parent | 25ec4a936607ee876e6a9b25a2344c29b3beb905 (diff) | |
| download | redmine-ba79c59f9f375fdbd9303d2cab7bac5df59746f7.tar.gz redmine-ba79c59f9f375fdbd9303d2cab7bac5df59746f7.zip | |
Garbage lines in the output of 'git branch' break git adapter (#31120).
Contributed by Chad Petersen.
git-svn-id: http://svn.redmine.org/redmine/trunk@18046 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/scm/adapters/git_adapter.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index 339a4e939..c8e5629e6 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -84,6 +84,7 @@ module Redmine git_cmd(cmd_args) do |io| io.each_line do |line| branch_rev = line.match('\s*(\*?)\s*(.*?)\s*([0-9a-f]{40}).*$') + next unless branch_rev bran = GitBranch.new(scm_iconv('UTF-8', @path_encoding, branch_rev[2])) bran.revision = branch_rev[3] bran.scmid = branch_rev[3] |