diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:45:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:45:03 -0800 |
| commit | e049109ef11be4e164c6f0426fb77c9c7a1ab647 (patch) | |
| tree | 9dac08e47724ecfe383331b49685c707aa4e2453 /diffcore.h | |
| parent | Merge branch 'ef/mingw-write' (diff) | |
| parent | diff_filespec: use only 2 bits for is_binary flag (diff) | |
| download | git-e049109ef11be4e164c6f0426fb77c9c7a1ab647.tar.gz git-e049109ef11be4e164c6f0426fb77c9c7a1ab647.zip | |
Merge branch 'jk/diff-filespec-cleanup'
* jk/diff-filespec-cleanup:
diff_filespec: use only 2 bits for is_binary flag
diff_filespec: reorder is_binary field
diff_filespec: drop xfrm_flags field
diff_filespec: drop funcname_pattern_ident field
diff_filespec: reorder dirty_submodule macro definitions
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/diffcore.h b/diffcore.h index 1c16c8595b..79de8cf28d 100644 --- a/diffcore.h +++ b/diffcore.h @@ -29,10 +29,8 @@ struct diff_filespec { char *path; void *data; void *cnt_data; - const char *funcname_pattern_ident; unsigned long size; int count; /* Reference count */ - int xfrm_flags; /* for use by the xfrm */ int rename_used; /* Count of rename users */ unsigned short mode; /* file mode */ unsigned sha1_valid : 1; /* if true, use sha1 and trust mode; @@ -43,13 +41,13 @@ struct diff_filespec { unsigned should_free : 1; /* data should be free()'ed */ unsigned should_munmap : 1; /* data should be munmap()'ed */ unsigned dirty_submodule : 2; /* For submodules: its work tree is dirty */ - unsigned is_stdin : 1; #define DIRTY_SUBMODULE_UNTRACKED 1 #define DIRTY_SUBMODULE_MODIFIED 2 + unsigned is_stdin : 1; unsigned has_more_entries : 1; /* only appear in combined diff */ - struct userdiff_driver *driver; /* data should be considered "binary"; -1 means "don't know yet" */ - int is_binary; + int is_binary : 2; + struct userdiff_driver *driver; }; extern struct diff_filespec *alloc_filespec(const char *); |