From aba99ff88684b08488532a6316de57b2c2e135f2 Mon Sep 17 00:00:00 2001
From: Justin Worthe <justin@worthe-it.co.za>
Date: Sun, 27 Aug 2017 17:08:44 +0200
Subject: master: Excluded adding branch name in some situations

---
 src/bin/prepare-commit-msg.rs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/bin/prepare-commit-msg.rs b/src/bin/prepare-commit-msg.rs
index 64ddd65..970435f 100644
--- a/src/bin/prepare-commit-msg.rs
+++ b/src/bin/prepare-commit-msg.rs
@@ -15,8 +15,8 @@ fn main() {
     
     let current_branch = get_current_branch();
     
-    match (current_branch, commit_filename) {
-        (Ok(branch), Some(filename)) => {
+    match (current_branch, commit_filename, commit_source) {
+        (Ok(branch), Some(filename), None) => {
             let write_result = prepend_branch_name(branch, filename);
             match write_result {
                 Ok(_) => {},
@@ -26,11 +26,16 @@ fn main() {
                 }
             };
         },
-        (Err(e), _) => {
+        (_, _, Some(_)) => {
+            // do nothing silently. This comes up on merge commits,
+            // ammendment commits, if a message was specified on the
+            // cli.
+        }
+        (Err(e), _, _) => {
             eprintln!("Failed to find current branch. {}", e);
             process::exit(1);
         },
-        (_, None) => {
+        (_, None, _) => {
             eprintln!("Commit file was not provided");
             process::exit(2);
         }
-- 
cgit v1.2.3