[PATCH] builtin/describe.c: ignore untracked changes in submodules
- From
Brandon Casey <casey@nrlssc.navy.mil>
- Date
- Sep 9, 2010, 19:12 UTC
- Message-ID
- <CC-1wlyJRzGfkPwn1Ra8d4Ot7mMnUGxYChGZHdqp-lQ5URlUFhNp4Ilyrh4bGk1dWF6drZXvim0@cipher.nrlssc.navy.mil>
From: Brandon Casey <drafnel@gmail.com>
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 <casey@nrlssc.navy.mil> --- 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