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

Fix checkout to know about TYPECHANGE diffs

Browse Source
This commit is contained in:
Russell Belfer 2012-09-28 14:32:33 -07:00
parent bc16fd3ebf
commit fbec2fb991
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/checkout.c
View File

@ -178,6 +178,7 @@ static int checkout_diff_fn(
break;
case GIT_DELTA_MODIFIED:
case GIT_DELTA_TYPECHANGE:
if (!(opts->checkout_strategy & GIT_CHECKOUT_OVERWRITE_MODIFIED)) {
if ((opts->skipped_notify_cb != NULL)
@ -291,7 +292,8 @@ int git_checkout_index(
if ((git_repository__ensure_not_bare(repo, "checkout")) < 0)
return GIT_EBAREREPO;
diff_opts.flags = GIT_DIFF_INCLUDE_UNTRACKED;
diff_opts.flags = GIT_DIFF_INCLUDE_UNTRACKED |
GIT_DIFF_DONT_SPLIT_TYPECHANGE;
if (opts && opts->paths.count > 0)
diff_opts.pathspec = opts->paths;