kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

blame.c: rename "repo" argument to "r" 

The current naming convention for 'struct repository *' is 'r' for
temporary variables or arguments. I did not notice this. Since we're
updating blame.c again in the next patch, let's fix this.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Nguyễn Thái Ngọc Duy 2018-09-21 17:57:21 +02:00 committed by Junio C Hamano
parent 0734f209a9
commit a470beea39
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
blame.c
View File

@ -90,7 +90,7 @@ static struct blame_origin *get_origin(struct commit *commit, const char *path)






static void verify_working_tree_path(struct repository *repo, static void verify_working_tree_path(struct repository *r,
struct commit *work_tree, const char *path) struct commit *work_tree, const char *path)
{ {
struct commit_list *parents; struct commit_list *parents;
@ -102,15 +102,15 @@ static void verify_working_tree_path(struct repository *repo,
unsigned mode; unsigned mode;


if (!get_tree_entry(commit_oid, path, &blob_oid, &mode) && if (!get_tree_entry(commit_oid, path, &blob_oid, &mode) &&
oid_object_info(repo, &blob_oid, NULL) == OBJ_BLOB) oid_object_info(r, &blob_oid, NULL) == OBJ_BLOB)
return; return;
} }


pos = index_name_pos(repo->index, path, strlen(path)); pos = index_name_pos(r->index, path, strlen(path));
if (pos >= 0) if (pos >= 0)
; /* path is in the index */ ; /* path is in the index */
else if (-1 - pos < repo->index->cache_nr && else if (-1 - pos < r->index->cache_nr &&
!strcmp(repo->index->cache[-1 - pos]->name, path)) !strcmp(r->index->cache[-1 - pos]->name, path))
; /* path is in the index, unmerged */ ; /* path is in the index, unmerged */
else else
die("no such path '%s' in HEAD", path); die("no such path '%s' in HEAD", path);
@ -166,7 +166,7 @@ static void set_commit_buffer_from_strbuf(struct commit *c, struct strbuf *sb)
* Prepare a dummy commit that represents the work tree (or staged) item. * Prepare a dummy commit that represents the work tree (or staged) item.
* Note that annotating work tree item never works in the reverse. * Note that annotating work tree item never works in the reverse.
*/ */
static struct commit *fake_working_tree_commit(struct repository *repo, static struct commit *fake_working_tree_commit(struct repository *r,
struct diff_options *opt, struct diff_options *opt,
const char *path, const char *path,
const char *contents_from) const char *contents_from)
@ -183,7 +183,7 @@ static struct commit *fake_working_tree_commit(struct repository *repo,
unsigned mode; unsigned mode;
struct strbuf msg = STRBUF_INIT; struct strbuf msg = STRBUF_INIT;


read_index(repo->index); read_index(r->index);
time(&now); time(&now);
commit = alloc_commit_node(the_repository); commit = alloc_commit_node(the_repository);
commit->object.parsed = 1; commit->object.parsed = 1;
@ -195,7 +195,7 @@ static struct commit *fake_working_tree_commit(struct repository *repo,


parent_tail = append_parent(parent_tail, &head_oid); parent_tail = append_parent(parent_tail, &head_oid);
append_merge_parents(parent_tail); append_merge_parents(parent_tail);
verify_working_tree_path(repo, commit, path); verify_working_tree_path(r, commit, path);


origin = make_origin(commit, path); origin = make_origin(commit, path);


@ -253,7 +253,7 @@ static struct commit *fake_working_tree_commit(struct repository *repo,
if (strbuf_read(&buf, 0, 0) < 0) if (strbuf_read(&buf, 0, 0) < 0)
die_errno("failed to read from stdin"); die_errno("failed to read from stdin");
} }
convert_to_git(repo->index, path, buf.buf, buf.len, &buf, 0); convert_to_git(r->index, path, buf.buf, buf.len, &buf, 0);
origin->file.ptr = buf.buf; origin->file.ptr = buf.buf;
origin->file.size = buf.len; origin->file.size = buf.len;
pretend_object_file(buf.buf, buf.len, OBJ_BLOB, &origin->blob_oid); pretend_object_file(buf.buf, buf.len, OBJ_BLOB, &origin->blob_oid);
@ -264,28 +264,28 @@ static struct commit *fake_working_tree_commit(struct repository *repo,
* bits; we are not going to write this index out -- we just * bits; we are not going to write this index out -- we just
* want to run "diff-index --cached". * want to run "diff-index --cached".
*/ */
discard_index(repo->index); discard_index(r->index);
read_index(repo->index); read_index(r->index);


len = strlen(path); len = strlen(path);
if (!mode) { if (!mode) {
int pos = index_name_pos(repo->index, path, len); int pos = index_name_pos(r->index, path, len);
if (0 <= pos) if (0 <= pos)
mode = repo->index->cache[pos]->ce_mode; mode = r->index->cache[pos]->ce_mode;
else else
/* Let's not bother reading from HEAD tree */ /* Let's not bother reading from HEAD tree */
mode = S_IFREG | 0644; mode = S_IFREG | 0644;
} }
ce = make_empty_cache_entry(repo->index, len); ce = make_empty_cache_entry(r->index, len);
oidcpy(&ce->oid, &origin->blob_oid); oidcpy(&ce->oid, &origin->blob_oid);
memcpy(ce->name, path, len); memcpy(ce->name, path, len);
ce->ce_flags = create_ce_flags(0); ce->ce_flags = create_ce_flags(0);
ce->ce_namelen = len; ce->ce_namelen = len;
ce->ce_mode = create_ce_mode(mode); ce->ce_mode = create_ce_mode(mode);
add_index_entry(repo->index, ce, add_index_entry(r->index, ce,
ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE);


cache_tree_invalidate_path(repo->index, path); cache_tree_invalidate_path(r->index, path);


return commit; return commit;
} }
@ -520,14 +520,14 @@ static void queue_blames(struct blame_scoreboard *sb, struct blame_origin *porig
* *
* This also fills origin->mode for corresponding tree path. * This also fills origin->mode for corresponding tree path.
*/ */
static int fill_blob_sha1_and_mode(struct repository *repo, static int fill_blob_sha1_and_mode(struct repository *r,
struct blame_origin *origin) struct blame_origin *origin)
{ {
if (!is_null_oid(&origin->blob_oid)) if (!is_null_oid(&origin->blob_oid))
return 0; return 0;
if (get_tree_entry(&origin->commit->object.oid, origin->path, &origin->blob_oid, &origin->mode)) if (get_tree_entry(&origin->commit->object.oid, origin->path, &origin->blob_oid, &origin->mode))
goto error_out; goto error_out;
if (oid_object_info(repo, &origin->blob_oid, NULL) != OBJ_BLOB) if (oid_object_info(r, &origin->blob_oid, NULL) != OBJ_BLOB)
goto error_out; goto error_out;
return 0; return 0;
error_out: error_out: