[gitg] Override default commit message when amending

[Jesse van den Kieboom <jessevdk src gnome org>]

commit d3cffab88196b8949907dc1f333e595d87b588b1
Author: Jesse van den Kieboom <jessevdk gnome org>
Date:   Tue Dec 22 12:14:35 2015 +0100

    Override default commit message when amending

 gitg/commit/gitg-commit-dialog.vala |   13 +++++++++++--
 gitg/commit/gitg-commit.vala        |    2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/gitg/commit/gitg-commit-dialog.vala b/gitg/commit/gitg-commit-dialog.vala
index 2b8076e..7a5cafb 100644
--- a/gitg/commit/gitg-commit-dialog.vala
+++ b/gitg/commit/gitg-commit-dialog.vala
@@ -122,6 +122,11 @@ class Dialog : Gtk.Dialog
                }
        }
 
+       public string default_message
+       {
+               get; private set;
+       }
+
        public string message
        {
                owned get
@@ -641,7 +646,9 @@ class Dialog : Gtk.Dialog
                });
 
                update_highlight();
-               
+
+               default_message = "";
+
                try
                {
                        Ggit.Config config;
@@ -658,7 +665,9 @@ class Dialog : Gtk.Dialog
                                size_t len;
 
                                FileUtils.get_contents(path, out contents, out len);
-                               d_source_view_message.buffer.set_text(Gitg.Convert.utf8(contents, 
(ssize_t)len));
+
+                               default_message = Gitg.Convert.utf8(contents, (ssize_t)len).strip();
+                               d_source_view_message.buffer.set_text(default_message);
                        }
                }
                catch (Error e) {
diff --git a/gitg/commit/gitg-commit.vala b/gitg/commit/gitg-commit.vala
index e872363..1e95473 100644
--- a/gitg/commit/gitg-commit.vala
+++ b/gitg/commit/gitg-commit.vala
@@ -1220,7 +1220,7 @@ namespace GitgCommit
 
                                                if (commit != null)
                                                {
-                                                       if (dlg.message.strip() == "")
+                                                       if (dlg.message.strip() == dlg.default_message)
                                                        {
                                                                dlg.message = commit.get_message();
                                                        }