proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-05 15:33:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1074 from edubart/ignore_diff_filemode

Browse Source 
Add option to ignore file mode in diffs
This commit is contained in:
Vicent Martí 2012-11-15 10:31:11 -08:00
commit 4a0c7f56ab
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/git2/diff.h
View File

@ -86,6 +86,8 @@ typedef enum {
* mode set to tree. Note: the tree SHA will not be available. * mode set to tree. Note: the tree SHA will not be available.
*/ */
GIT_DIFF_INCLUDE_TYPECHANGE_TREES = (1 << 16), GIT_DIFF_INCLUDE_TYPECHANGE_TREES = (1 << 16),
/** Ignore file mode changes */
GIT_DIFF_IGNORE_FILEMODE = (1 << 17),
} git_diff_option_t; } git_diff_option_t;
/** /**

3
src/diff.c
View File

@ -267,6 +267,9 @@ static git_diff_list *git_diff_list_alloc(
memcpy(&diff->opts, opts, sizeof(git_diff_options)); memcpy(&diff->opts, opts, sizeof(git_diff_options));
if(opts->flags & GIT_DIFF_IGNORE_FILEMODE)
diff->diffcaps = diff->diffcaps & ~GIT_DIFFCAPS_TRUST_MODE_BITS;
/* pathspec init will do nothing for empty pathspec */ /* pathspec init will do nothing for empty pathspec */
if (git_pathspec_init(&diff->pathspec, &opts->pathspec, &diff->pool) < 0) if (git_pathspec_init(&diff->pathspec, &opts->pathspec, &diff->pool) < 0)
goto fail; goto fail;