diff options
author | Vicent Martà <vicent@github.com> | 2013-05-15 15:47:46 -0700 |
---|---|---|
committer | Vicent Martà <vicent@github.com> | 2013-05-15 15:47:46 -0700 |
commit | 71596200443cdefb374750a1922dc9e1d0be7d53 (patch) | |
tree | ef793279cec76aae5b7a4c0aa0d36d770ac2fc1a /src/diff_tform.c | |
parent | 6957f73cc1d484dd6514596e73255e635db60f0f (diff) | |
parent | 72b3dd4a5ca2f6572e741c243cd973963d0ef419 (diff) | |
download | libgit2-71596200443cdefb374750a1922dc9e1d0be7d53.tar.gz |
Merge pull request #1588 from arrbee/fixes-for-checkout-and-diff
Bug fixes for checkout and diff
Diffstat (limited to 'src/diff_tform.c')
-rw-r--r-- | src/diff_tform.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/diff_tform.c b/src/diff_tform.c index e88525654..84650a37b 100644 --- a/src/diff_tform.c +++ b/src/diff_tform.c @@ -386,8 +386,12 @@ static int similarity_calc( /* TODO: apply wd-to-odb filters to file data if necessary */ - if (!(error = git_buf_joinpath( - &path, git_repository_workdir(diff->repo), file->path))) + if ((error = git_buf_joinpath( + &path, git_repository_workdir(diff->repo), file->path)) < 0) + return error; + + /* if path is not a regular file, just skip this item */ + if (git_path_isfile(path.ptr)) error = opts->metric->file_signature( &cache[file_idx], file, path.ptr, opts->metric->payload); @@ -398,8 +402,11 @@ static int similarity_calc( /* TODO: add max size threshold a la diff? */ - if ((error = git_blob_lookup(&blob, diff->repo, &file->oid)) < 0) - return error; + if (git_blob_lookup(&blob, diff->repo, &file->oid) < 0) { + /* if lookup fails, just skip this item in similarity calc */ + giterr_clear(); + return 0; + } blobsize = git_blob_rawsize(blob); if (!git__is_sizet(blobsize)) /* ? what to do ? */ |