diff options
| author | Chad Versace <chad.versace@linux.intel.com> | 2014-11-09 20:51:52 -0800 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2014-11-09 20:52:43 -0800 |
| commit | 34bd1e85f30985007e0f6e20f1bd1b10f8209724 (patch) | |
| tree | cbe8525472826e0dc4970252192b6960eed46770 | |
| parent | ff8703f96b89431b846776de261ce4543ead17ad (diff) | |
| download | waffle-meta.tar.gz | |
waffle-merge: Insert missing space in commit messagesmeta
Fix "Mergebranch" -> "Merge branch". Regex had a bug.
| -rwxr-xr-x | bin/waffle-merge | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/waffle-merge b/bin/waffle-merge index 8407a6b..7003527 100755 --- a/bin/waffle-merge +++ b/bin/waffle-merge @@ -102,7 +102,7 @@ function wfl_cleanup_merge_msg { for p in "${prefixes_to_trim[@]}"; do # Trim prefix off of incoming merge refname. - sed_cmd+=(-e "s|^(Merge\|\*) (branch \|tag \|)'$p/([^']+)'|\1\2'\3'|") + sed_cmd+=(-e "s|^(Merge \|\* )(branch \|tag \|)'$p/([^']+)'|\1\2'\3'|") # Trim prefix off of HEAD's refname. sed_cmd+=(-e "s|^(Merge .* into )$p/|\1|") |