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>
Nguyễn Thái Ngọc Duy committed
Sep 21, 2018 at 17:57 UTC
a470beea39b91a0604aed9b99184df45c1d962d1
1 file changed
+18
-18
blame.c
+18
-18
@@ -90,7 +90,7 @@ static struct blame_origin *get_origin(struct commit *commit, const char *path)
90
91
92
93
-static void verify_working_tree_path(struct repository *repo,
93
+static void verify_working_tree_path(struct repository *r,
94
struct commit *work_tree, const char *path)
95
{
96
struct commit_list *parents;
@@ -102,15 +102,15 @@ static void verify_working_tree_path(struct repository *repo,
102
unsigned mode;
103
104
if (!get_tree_entry(commit_oid, path, &blob_oid, &mode) &&
105
- oid_object_info(repo, &blob_oid, NULL) == OBJ_BLOB)
105
+ oid_object_info(r, &blob_oid, NULL) == OBJ_BLOB)
106
return;
107
}
108
109
- pos = index_name_pos(repo->index, path, strlen(path));
109
+ pos = index_name_pos(r->index, path, strlen(path));
110
if (pos >= 0)
111
; /* path is in the index */
112
- else if (-1 - pos < repo->index->cache_nr &&
113
- !strcmp(repo->index->cache[-1 - pos]->name, path))
112
+ else if (-1 - pos < r->index->cache_nr &&
113
+ !strcmp(r->index->cache[-1 - pos]->name, path))
114
; /* path is in the index, unmerged */
115
else
116
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)
166
* Prepare a dummy commit that represents the work tree (or staged) item.
167
* Note that annotating work tree item never works in the reverse.
168
*/
169
-static struct commit *fake_working_tree_commit(struct repository *repo,
169
+static struct commit *fake_working_tree_commit(struct repository *r,
170
struct diff_options *opt,
171
const char *path,
172
const char *contents_from)
@@ -183,7 +183,7 @@ static struct commit *fake_working_tree_commit(struct repository *repo,
183
unsigned mode;
184
struct strbuf msg = STRBUF_INIT;
185
186
- read_index(repo->index);
186
+ read_index(r->index);
187
time(&now);
188
commit = alloc_commit_node(the_repository);
189
commit->object.parsed = 1;
@@ -195,7 +195,7 @@ static struct commit *fake_working_tree_commit(struct repository *repo,
195
196
parent_tail = append_parent(parent_tail, &head_oid);
197
append_merge_parents(parent_tail);
198
- verify_working_tree_path(repo, commit, path);
198
+ verify_working_tree_path(r, commit, path);
199
200
origin = make_origin(commit, path);
201
@@ -253,7 +253,7 @@ static struct commit *fake_working_tree_commit(struct repository *repo,
253
if (strbuf_read(&buf, 0, 0) < 0)
254
die_errno("failed to read from stdin");
255
}
256
- convert_to_git(repo->index, path, buf.buf, buf.len, &buf, 0);
256
+ convert_to_git(r->index, path, buf.buf, buf.len, &buf, 0);
257
origin->file.ptr = buf.buf;
258
origin->file.size = buf.len;
259
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,
264
* bits; we are not going to write this index out -- we just
265
* want to run "diff-index --cached".
266
*/
267
- discard_index(repo->index);
268
- read_index(repo->index);
267
+ discard_index(r->index);
268
+ read_index(r->index);
269
270
len = strlen(path);
271
if (!mode) {
272
- int pos = index_name_pos(repo->index, path, len);
272
+ int pos = index_name_pos(r->index, path, len);
273
if (0 <= pos)
274
- mode = repo->index->cache[pos]->ce_mode;
274
+ mode = r->index->cache[pos]->ce_mode;
275
else
276
/* Let's not bother reading from HEAD tree */
277
mode = S_IFREG | 0644;
278
}
279
- ce = make_empty_cache_entry(repo->index, len);
279
+ ce = make_empty_cache_entry(r->index, len);
280
oidcpy(&ce->oid, &origin->blob_oid);
281
memcpy(ce->name, path, len);
282
ce->ce_flags = create_ce_flags(0);
283
ce->ce_namelen = len;
284
ce->ce_mode = create_ce_mode(mode);
285
- add_index_entry(repo->index, ce,
285
+ add_index_entry(r->index, ce,
286
ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE);
287
288
- cache_tree_invalidate_path(repo->index, path);
288
+ cache_tree_invalidate_path(r->index, path);
289
290
return commit;
291
}
@@ -520,14 +520,14 @@ static void queue_blames(struct blame_scoreboard *sb, struct blame_origin *porig
520
*
521
* This also fills origin->mode for corresponding tree path.
522
*/
523
-static int fill_blob_sha1_and_mode(struct repository *repo,
523
+static int fill_blob_sha1_and_mode(struct repository *r,
524
struct blame_origin *origin)
525
{
526
if (!is_null_oid(&origin->blob_oid))
527
return 0;
528
if (get_tree_entry(&origin->commit->object.oid, origin->path, &origin->blob_oid, &origin->mode))
529
goto error_out;
530
- if (oid_object_info(repo, &origin->blob_oid, NULL) != OBJ_BLOB)
530
+ if (oid_object_info(r, &origin->blob_oid, NULL) != OBJ_BLOB)
531
goto error_out;
532
return 0;
533
error_out: