X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=diffcore.h;h=fcd00bf27aee4e1f2823f05ab3dba1d3c70a509d;hb=971ecbd1f8d1468951274d01103f80dd7d32d110;hp=66687c3fe5ea4552cff2b864b73696460ca40b1e;hpb=868cfe09237430d9d24f17ce2f16c03d4c39b58a;p=git.git diff --git a/diffcore.h b/diffcore.h index 66687c3fe..fcd00bf27 100644 --- a/diffcore.h +++ b/diffcore.h @@ -42,7 +42,9 @@ 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 */ + unsigned dirty_submodule : 2; /* For submodules: its work tree is dirty */ +#define DIRTY_SUBMODULE_UNTRACKED 1 +#define DIRTY_SUBMODULE_MODIFIED 2 struct userdiff_driver *driver; /* data should be considered "binary"; -1 means "don't know yet" */