diff_filespec: reorder dirty_submodule macro definitions
diff_filespec has a 2-bit "dirty_submodule" field and defines two flags as macros. Originally these were right next to each other, but a new field was accidentally added in between in commit 4682d85. This patch puts the field and its flags back together. Using an enum like: enum { DIRTY_SUBMODULE_UNTRACKED = 1, DIRTY_SUBMODULE_MODIFIED = 2 } dirty_submodule; would be more obvious, but it bloats the structure. Limiting the enum size like: } dirty_submodule : 2; might work, but it is not portable. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jan 16, 2014 at 20:19 UTC
b837f5d68da391f3a54817bb04f1e7ec04f9cdac
1 file changed
+1
-1
diffcore.h
+1
-1
@@ -43,9 +43,9 @@ struct diff_filespec {
43
unsigned should_free : 1; /* data should be free()'ed */
44
unsigned should_munmap : 1; /* data should be munmap()'ed */
45
unsigned dirty_submodule : 2; /* For submodules: its work tree is dirty */
46
- unsigned is_stdin : 1;
46
#define DIRTY_SUBMODULE_UNTRACKED 1
47
#define DIRTY_SUBMODULE_MODIFIED 2
48
+ unsigned is_stdin : 1;
49
unsigned has_more_entries : 1; /* only appear in combined diff */
50
struct userdiff_driver *driver;
51
/* data should be considered "binary"; -1 means "don't know yet" */