diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2012-06-13 23:28:51 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2012-06-13 23:28:51 +0100 |
| commit | a21bb1aa33e9887c06852db62526895df6091736 (patch) | |
| tree | 6e05069971f04fb91f36d91818f78a62de93c1b1 /src/diff.h | |
| parent | 96ef3d84629ef72fb662d95abbab3de634921678 (diff) | |
| parent | 86ea6ceda75274621b7d5c3023c5b04da3ab677e (diff) | |
| download | libgit2-a21bb1aa33e9887c06852db62526895df6091736.tar.gz | |
Merge remote-tracking branch 'source/development' into development
Diffstat (limited to 'src/diff.h')
| -rw-r--r-- | src/diff.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/diff.h b/src/diff.h index ac2457956..6cc854fbd 100644 --- a/src/diff.h +++ b/src/diff.h @@ -20,7 +20,7 @@ enum { GIT_DIFFCAPS_HAS_SYMLINKS = (1 << 0), /* symlinks on platform? */ GIT_DIFFCAPS_ASSUME_UNCHANGED = (1 << 1), /* use stat? */ - GIT_DIFFCAPS_TRUST_EXEC_BIT = (1 << 2), /* use st_mode exec bit? */ + GIT_DIFFCAPS_TRUST_MODE_BITS = (1 << 2), /* use st_mode? */ GIT_DIFFCAPS_TRUST_CTIME = (1 << 3), /* use st_ctime? */ GIT_DIFFCAPS_USE_DEV = (1 << 4), /* use st_dev? */ }; @@ -36,5 +36,8 @@ struct git_diff_list { uint32_t diffcaps; }; +extern void git_diff__cleanup_modes( + uint32_t diffcaps, uint32_t *omode, uint32_t *nmode); + #endif |