Commit Diff


commit - bcb49d15e041ddffb59397d2fe851fdb1729b005
commit + 0d8ff7d595e6abb49387494684cd73113df880c0
blob - 228ca70ffc0b36c025622f32cdfdcb86916d687c
blob + 7de4b717192b41fe48ef99cde61a4849e8c35e94
--- got/got.c
+++ got/got.c
@@ -2425,8 +2425,7 @@ cmd_blame(int argc, char *argv[])
 	}
 	bca.repo = repo;
 
-	error = got_blame_incremental(in_repo_path, commit_id, repo,
-	    blame_cb, &bca);
+	error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca);
 	if (error)
 		goto done;
 done:
blob - 6075cadbd177e1802679c7353515bf4ceebb51d0
blob + 9258c77dafa469d8dbc168725c3a4ac31456e981
--- include/got_blame.h
+++ include/got_blame.h
@@ -31,7 +31,7 @@
  * If the callback returns any other error, the blame operation will be
  * aborted and the callback's error is returned from this function.
  */
-const struct got_error *got_blame_incremental(const char *,
+const struct got_error *got_blame(const char *,
     struct got_object_id *, struct got_repository *,
     const struct got_error *(*cb)(void *, int, int, struct got_object_id *),
     void *);
blob - 87b1810be0ffe85d28132828f6ba556ebda2d7bd
blob + d7a5a560a572e11ce47c89a95d7c14bc30483ee8
--- lib/blame.c
+++ lib/blame.c
@@ -412,7 +412,7 @@ done:
 }
 
 const struct got_error *
-got_blame_incremental(const char *path, struct got_object_id *commit_id,
+got_blame(const char *path, struct got_object_id *commit_id,
     struct got_repository *repo,
     const struct got_error *(*cb)(void *, int, int, struct got_object_id *),
     void *arg)
blob - 6f4b6076ae0d011c28278b2e69626ade8a7f8b2e
blob + a4136fea5133d35c4c4b1acc1e44ae5886cf894f
--- tog/tog.c
+++ tog/tog.c
@@ -3132,7 +3132,7 @@ blame_thread(void *arg)
 	struct tog_blame_cb_args *a = ta->cb_args;
 	int errcode;
 
-	err = got_blame_incremental(ta->path, a->commit_id, ta->repo,
+	err = got_blame(ta->path, a->commit_id, ta->repo,
 	    blame_cb, ta->cb_args);
 
 	errcode = pthread_mutex_lock(&tog_mutex);