From c100c3cc30dd948c881abd96720ca4fb2ddbb82f Mon Sep 17 00:00:00 2001 From: Hiltjo Posthuma Date: Sun, 18 Nov 2018 18:06:41 +0100 Subject: [PATCH] detect filetype changes in diff (for example a normal file to symlink) --- stagit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stagit.c b/stagit.c index f43801d..8a7e7fc 100644 --- a/stagit.c +++ b/stagit.c @@ -114,7 +114,9 @@ commitinfo_getstats(struct commitinfo *ci) } git_diff_init_options(&opts, GIT_DIFF_OPTIONS_VERSION); - opts.flags |= GIT_DIFF_DISABLE_PATHSPEC_MATCH; + opts.flags |= GIT_DIFF_DISABLE_PATHSPEC_MATCH | + GIT_DIFF_IGNORE_SUBMODULES | + GIT_DIFF_INCLUDE_TYPECHANGE; if (git_diff_tree_to_tree(&(ci->diff), repo, ci->parent_tree, ci->commit_tree, &opts)) goto err;