Skip to content

Commit

Permalink
git outstanding features does not chop branch info
Browse files Browse the repository at this point in the history
Also forces git log to be one-line so bypasses users who have custom log
output configuration
  • Loading branch information
Pedro Cunha committed Nov 20, 2013
1 parent 829b69b commit 93145bf
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions bin/git-outstanding-features
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ class App < Git::Whistles::App
super
parse_args!(args)

merges = `git log --merges --first-parent #{options.from} ^#{options.to} | grep 'Merge pull request'`
merges = `git log --merges --first-parent --oneline #{options.from} ^#{options.to} | grep 'Merge pull request'`
return if merges.nil?

output = []
merges.lines.each do |merge|
merge.match(/(#\d+).*from.*\/(.*)/)
output << $1 + ' ' + $2
merge.match /(#\d+).*from(.*)/
output << $1.strip + ' ' + $2.strip
end

puts options.oneline ? output.join(', ') : output
Expand Down

0 comments on commit 93145bf

Please sign in to comment.