Thread (2 messages) flat view 2 messages, 2 authors, 2016-08-13
STALE3677d

[PATCH] builtin/describe.c: ignore untracked changes in submodules

From: Brandon Casey <hidden>
Date: 2016-06-15 22:49:31
Subsystem: the rest · Maintainer: Linus Torvalds

From: Brandon Casey <redacted>

Since 'git describe' does not append -dirty to the version string it
produces when untracked files exist in the working directory of the main
repository, it should not do so for submodules either.

Add --ignore-submodules=untracked to the call to diff-index which is used
to decide whether or not the '-dirty' string is necessary.

Signed-off-by: Brandon Casey <redacted>
---
 builtin/describe.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/builtin/describe.c b/builtin/describe.c
index 43caff2..6c4f15b 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -29,7 +29,8 @@ static const char *dirty;
 
 /* diff-index command arguments to check if working tree is dirty. */
 static const char *diff_index_args[] = {
-	"diff-index", "--quiet", "HEAD", "--", NULL
+	"diff-index", "--quiet", "--ignore-submodules=untracked", "HEAD",
+	"--", NULL
 };
 
 
-- 
1.7.2.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help