diff options
| author | Russell Belfer <rb@github.com> | 2012-09-28 14:32:33 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2012-10-09 11:54:01 -0700 |
| commit | fbec2fb99112d5fbac1367afd99cf039e6b3e48b (patch) | |
| tree | ef21500bc05826d8625e19f5b34032e9e072d1f9 /src | |
| parent | bc16fd3ebf8727900f2b8c2f44cb14fd03f80bcc (diff) | |
| download | libgit2-fbec2fb99112d5fbac1367afd99cf039e6b3e48b.tar.gz | |
Fix checkout to know about TYPECHANGE diffs
Diffstat (limited to 'src')
| -rw-r--r-- | src/checkout.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/checkout.c b/src/checkout.c index 55130aa28..819994718 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -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; |