From 93145bfb1584295fe975886dfb2e25f571a719ae Mon Sep 17 00:00:00 2001
From: Pedro Cunha <pkunha@gmail.com>
Date: Wed, 20 Nov 2013 20:21:14 +0000
Subject: [PATCH] git outstanding features does not chop branch info
Also forces git log to be one-line so bypasses users who have custom log
output configuration
---
bin/git-outstanding-features | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/git-outstanding-features b/bin/git-outstanding-features
index 9216449..013cf09 100755
--- a/bin/git-outstanding-features
+++ b/bin/git-outstanding-features
@@ -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