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

do not use full path in diff-index

Browse Source 
Currently, diff_index passes the full relative path from the
repository root to the callback. In case of an addition, it passes
the tree entry instead of the index entry.

This change fixes the path used for addition, and it passes only
the basename of the path. This mimics the current behavior of
git_tree_diff.
This commit is contained in:
Clemens Buchacher 2011-12-29 15:03:38 +01:00
parent ee3f96d4e0
commit 1f783edf17
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/tree.c
View File

@ -959,15 +959,22 @@ static int cmp_tentry_ientry(git_tree_entry *tentry, git_index_entry *ientry)
return git_oid_cmp(&tentry->oid, &ientry->oid); return git_oid_cmp(&tentry->oid, &ientry->oid);
} }
static void make_tentry(git_tree_entry *tentry, git_index_entry *ientry, git_buf *buf) static void make_tentry(git_tree_entry *tentry, git_index_entry *ientry)
{ {
char *last_slash;
memset(tentry, 0x0, sizeof(git_tree_entry)); memset(tentry, 0x0, sizeof(git_tree_entry));
tentry->attr = ientry->mode; tentry->attr = ientry->mode;
last_slash = strrchr(ientry->path, '/');
if (last_slash)
last_slash++;
else
last_slash = ientry->path;
tentry->filename = last_slash;
git_oid_cpy(&tentry->oid, &ientry->oid); git_oid_cpy(&tentry->oid, &ientry->oid);
if (buf != NULL) { tentry->filename_len = strlen(tentry->filename);
tentry->filename = buf->ptr;
tentry->filename_len = buf->size;
}
} }
static int diff_index_cb(const char *root, git_tree_entry *tentry, void *data) static int diff_index_cb(const char *root, git_tree_entry *tentry, void *data)
@ -991,25 +998,24 @@ static int diff_index_cb(const char *root, git_tree_entry *tentry, void *data)
/* Like with 'git diff-index', the index is the right side*/ /* Like with 'git diff-index', the index is the right side*/
cmp = strcmp(git_buf_cstr(&fn_buf), ientry->path); cmp = strcmp(git_buf_cstr(&fn_buf), ientry->path);
git_buf_free(&fn_buf);
if (cmp == 0) { if (cmp == 0) {
cbdata->i++; cbdata->i++;
if (!cmp_tentry_ientry(tentry, ientry)) if (!cmp_tentry_ientry(tentry, ientry))
goto exit; goto exit;
/* modification */ /* modification */
make_tentry(&fake_entry, ientry, &fn_buf); make_tentry(&fake_entry, ientry);
if ((error = signal_modification(tentry, &fake_entry, cbdata->cb, cbdata->data)) < 0) if ((error = signal_modification(tentry, &fake_entry, cbdata->cb, cbdata->data)) < 0)
goto exit; goto exit;
} else if (cmp < 0) { } else if (cmp < 0) {
/* deletion */ /* deletion */
memcpy(&fake_entry, tentry, sizeof(git_tree_entry)); memcpy(&fake_entry, tentry, sizeof(git_tree_entry));
fake_entry.filename = fn_buf.ptr;
fake_entry.filename_len = fn_buf.size;
if ((error = signal_deletion(tentry, cbdata->cb, cbdata->data)) < 0) if ((error = signal_deletion(tentry, cbdata->cb, cbdata->data)) < 0)
goto exit; goto exit;
} else { } else {
/* addition */ /* addition */
cbdata->i++; cbdata->i++;
make_tentry(&fake_entry, ientry, &fn_buf); make_tentry(&fake_entry, ientry);
if ((error = signal_addition(&fake_entry, cbdata->cb, cbdata->data)) < 0) if ((error = signal_addition(&fake_entry, cbdata->cb, cbdata->data)) < 0)
goto exit; goto exit;
/* /*
@ -1022,7 +1028,6 @@ static int diff_index_cb(const char *root, git_tree_entry *tentry, void *data)
} }
exit: exit:
git_buf_free(&fn_buf);
return error; return error;
} }