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 /revision.c | |
| parent | 16735ae0f8a8e2df5e54807fd0a5930eb97dcb7a (diff) | |
| parent | e3d42c4773bccebb50f01b108d20b06c6a11e615 (diff) | |
| download | git-c6ec7efdd4c63f5c53184651cb05748e7bc71075.tar.gz | |
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 'revision.c')
| -rw-r--r-- | revision.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/revision.c b/revision.c index f3b82d97bc..4e1a299bfb 100644 --- a/revision.c +++ b/revision.c @@ -268,7 +268,7 @@ static int tree_difference = REV_TREE_SAME; static void file_add_remove(struct diff_options *options, int addremove, unsigned mode, const unsigned char *sha1, - const char *fullpath) + const char *fullpath, unsigned dirty_submodule) { int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD; @@ -281,7 +281,8 @@ static void file_change(struct diff_options *options, unsigned old_mode, unsigned new_mode, const unsigned char *old_sha1, const unsigned char *new_sha1, - const char *fullpath) + const char *fullpath, + unsigned old_dirty_submodule, unsigned new_dirty_submodule) { tree_difference = REV_TREE_DIFFERENT; DIFF_OPT_SET(options, HAS_CHANGES); |