Permalink
Browse files

fixed handling of branches with no parents

  • Loading branch information...
1 parent 03da4ec commit 3ff600a46062488b16647aff9b00368fdd17da7d @ddollar ddollar committed Jan 28, 2009
Showing with 1 addition and 1 deletion.
  1. +1 −1 git-wtf
View
@@ -125,7 +125,7 @@ $branches.each do |name, branch|
$branches[name][:parent] = begin
merge = branch[:merge]
remote = merge[:remote] == '.' ? $branches : $remotes[merge[:remote]]
- remote[merge[:branch]]
+ remote ? remote[merge[:branch]] : nil
end
end

0 comments on commit 3ff600a

Please sign in to comment.