[gitg] Do not force index changes when amending
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg] Do not force index changes when amending
- Date: Sun, 7 Jul 2013 15:04:04 +0000 (UTC)
commit 6a0b35aca16eda60bc4c5465e928b09865485dce
Author: Jesse van den Kieboom <jessevdk gmail com>
Date: Sun Jul 7 16:46:49 2013 +0200
Do not force index changes when amending
libgitg/gitg-stage.vala | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/libgitg/gitg-stage.vala b/libgitg/gitg-stage.vala
index c8b4259..442fcd0 100644
--- a/libgitg/gitg-stage.vala
+++ b/libgitg/gitg-stage.vala
@@ -320,9 +320,10 @@ public class Stage : Object
Ggit.OId? ret = null;
bool skip_hooks = (options & StageCommitOptions.SKIP_HOOKS) != 0;
+ bool amend = (options & StageCommitOptions.AMEND) != 0;
yield thread_index((index) => {
- if (!has_index_changes())
+ if (!amend && !has_index_changes())
{
throw new StageError.NOTHING_TO_COMMIT("Nothing to commit");
}
@@ -361,8 +362,6 @@ public class Stage : Object
Ggit.OId[] parents;
- var amend = (options & StageCommitOptions.AMEND) != 0;
-
if (headoid == null)
{
parents = new Ggit.OId[] {};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]