diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-22 16:08:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-22 16:08:10 -0800 |
| commit | c6ec7efdd4c63f5c53184651cb05748e7bc71075 (patch) | |
| tree | 4f9d0de8273ca2d608e172367b167c0b1774b05c /diffcore.h | |
| parent | Merge branch 'il/remote-updates' (diff) | |
| parent | Performance optimization for detection of modified submodules (diff) | |
| download | git-c6ec7efdd4c63f5c53184651cb05748e7bc71075.tar.gz git-c6ec7efdd4c63f5c53184651cb05748e7bc71075.zip | |
Merge branch 'jl/submodule-diff'
* jl/submodule-diff:
Performance optimization for detection of modified submodules
git status: Show uncommitted submodule changes too when enabled
Teach diff that modified submodule directory is dirty
Show submodules as modified when they contain a dirty work tree
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/diffcore.h b/diffcore.h index 5b634585e8..66687c3fe5 100644 --- a/diffcore.h +++ b/diffcore.h @@ -42,6 +42,7 @@ struct diff_filespec { #define DIFF_FILE_VALID(spec) (((spec)->mode) != 0) unsigned should_free : 1; /* data should be free()'ed */ unsigned should_munmap : 1; /* data should be munmap()'ed */ + unsigned dirty_submodule : 1; /* For submodules: its work tree is dirty */ struct userdiff_driver *driver; /* data should be considered "binary"; -1 means "don't know yet" */ |