diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-26 22:53:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-26 22:53:13 -0800 |
| commit | d539de9f25920f099e4e56b0acbb4ebf246ff0f4 (patch) | |
| tree | 8453048a2a8f5a8a84d66e5c8dfd4784bdec49b6 /submodule.c | |
| parent | 3fa7c3da379bb47a0e7a52ffc13cb366add880a2 (diff) | |
| parent | 721ceec1ad12625e90b395fd0be0fae9049ebc22 (diff) | |
| download | git-d539de9f25920f099e4e56b0acbb4ebf246ff0f4.tar.gz | |
Merge branch 'jl/diff-submodule-ignore'
* jl/diff-submodule-ignore:
Teach diff --submodule that modified submodule directory is dirty
git diff: Don't test submodule dirtiness with --ignore-submodules
Make ce_uptodate() trustworthy again
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/submodule.c b/submodule.c index f657bee379..ca0527fbcb 100644 --- a/submodule.c +++ b/submodule.c @@ -36,6 +36,7 @@ static int add_submodule_odb(const char *path) void show_submodule_summary(FILE *f, const char *path, unsigned char one[20], unsigned char two[20], + unsigned dirty_submodule, const char *del, const char *add, const char *reset) { struct rev_info rev; @@ -85,6 +86,8 @@ void show_submodule_summary(FILE *f, const char *path, if (!fast_backward && !fast_forward) strbuf_addch(&sb, '.'); strbuf_addf(&sb, "%s", find_unique_abbrev(two, DEFAULT_ABBREV)); + if (dirty_submodule) + strbuf_add(&sb, "-dirty", 6); if (message) strbuf_addf(&sb, " %s\n", message); else |