Merge branch 'hn/create-reflog-simplify' into hn/reftable-coverity-fixes

gitster · gitster · commit 4e26066009ef · 2021-12-07T12:45:15.000-08:00
* hn/create-reflog-simplify:
  refs: drop force_create argument of create_reflog API
diff --git a/builtin/checkout.c b/builtin/checkout.c
@@ -874,7 +874,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
 				int ret;
 				struct strbuf err = STRBUF_INIT;
 
-				ret = safe_create_reflog(refname, 1, &err);
+				ret = safe_create_reflog(refname, &err);
 				if (ret) {
 					fprintf(stderr, _("Can not do reflog for '%s': %s\n"),
 						opts->new_orphan_branch, err.buf);
diff --git a/refs.c b/refs.c
@@ -2366,16 +2366,15 @@ int reflog_exists(const char *refname)
 }
 
 int refs_create_reflog(struct ref_store *refs, const char *refname,
-		       int force_create, struct strbuf *err)
+		       struct strbuf *err)
 {
-	return refs->be->create_reflog(refs, refname, force_create, err);
+	return refs->be->create_reflog(refs, refname, err);
 }
 
-int safe_create_reflog(const char *refname, int force_create,
-		       struct strbuf *err)
+int safe_create_reflog(const char *refname, struct strbuf *err)
 {
 	return refs_create_reflog(get_main_ref_store(the_repository), refname,
-				  force_create, err);
+				  err);
 }
 
 int refs_delete_reflog(struct ref_store *refs, const char *refname)
diff --git a/refs.h b/refs.h
@@ -417,8 +417,8 @@ int refs_pack_refs(struct ref_store *refs, unsigned int flags);
  * Setup reflog before using. Fill in err and return -1 on failure.
  */
 int refs_create_reflog(struct ref_store *refs, const char *refname,
-		       int force_create, struct strbuf *err);
-int safe_create_reflog(const char *refname, int force_create, struct strbuf *err);
+		       struct strbuf *err);
+int safe_create_reflog(const char *refname, struct strbuf *err);
 
 /** Reads log for the value of ref during at_time. **/
 int read_ref_at(struct ref_store *refs,
diff --git a/refs/debug.c b/refs/debug.c
@@ -339,11 +339,10 @@ static int debug_reflog_exists(struct ref_store *ref_store, const char *refname)
 }
 
 static int debug_create_reflog(struct ref_store *ref_store, const char *refname,
-			       int force_create, struct strbuf *err)
+			       struct strbuf *err)
 {
 	struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store;
-	int res = drefs->refs->be->create_reflog(drefs->refs, refname,
-						 force_create, err);
+	int res = drefs->refs->be->create_reflog(drefs->refs, refname, err);
 	trace_printf_key(&trace_refs, "create_reflog: %s: %d\n", refname, res);
 	return res;
 }
diff --git a/refs/files-backend.c b/refs/files-backend.c
@@ -1671,15 +1671,14 @@ static int log_ref_setup(struct files_ref_store *refs,
 	return -1;
 }
 
-static int files_create_reflog(struct ref_store *ref_store,
-			       const char *refname, int force_create,
+static int files_create_reflog(struct ref_store *ref_store, const char *refname,
 			       struct strbuf *err)
 {
 	struct files_ref_store *refs =
 		files_downcast(ref_store, REF_STORE_WRITE, "create_reflog");
 	int fd;
 
-	if (log_ref_setup(refs, refname, force_create, &fd, err))
+	if (log_ref_setup(refs, refname, 1, &fd, err))
 		return -1;
 
 	if (fd >= 0)
diff --git a/refs/packed-backend.c b/refs/packed-backend.c
@@ -1629,8 +1629,7 @@ static int packed_reflog_exists(struct ref_store *ref_store,
 }
 
 static int packed_create_reflog(struct ref_store *ref_store,
-			       const char *refname, int force_create,
-			       struct strbuf *err)
+				const char *refname, struct strbuf *err)
 {
 	BUG("packed reference store does not support reflogs");
 }
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
@@ -592,7 +592,7 @@ typedef int for_each_reflog_ent_reverse_fn(struct ref_store *ref_store,
 					   void *cb_data);
 typedef int reflog_exists_fn(struct ref_store *ref_store, const char *refname);
 typedef int create_reflog_fn(struct ref_store *ref_store, const char *refname,
-			     int force_create, struct strbuf *err);
+			     struct strbuf *err);
 typedef int delete_reflog_fn(struct ref_store *ref_store, const char *refname);
 typedef int reflog_expire_fn(struct ref_store *ref_store,
 			     const char *refname,
diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c
@@ -182,11 +182,10 @@ static int cmd_reflog_exists(struct ref_store *refs, const char **argv)
 static int cmd_create_reflog(struct ref_store *refs, const char **argv)
 {
 	const char *refname = notnull(*argv++, "refname");
-	int force_create = arg_flags(*argv++, "force-create");
 	struct strbuf err = STRBUF_INIT;
 	int ret;
 
-	ret = refs_create_reflog(refs, refname, force_create, &err);
+	ret = refs_create_reflog(refs, refname, &err);
 	if (err.len)
 		puts(err.buf);
 	return ret;
diff --git a/t/t1405-main-ref-store.sh b/t/t1405-main-ref-store.sh
@@ -108,7 +108,7 @@ test_expect_success 'delete_reflog(HEAD)' '
 '
 
 test_expect_success 'create-reflog(HEAD)' '
-	$RUN create-reflog HEAD 1 &&
+	$RUN create-reflog HEAD &&
 	git reflog exists HEAD
 '
 
diff --git a/t/t1406-submodule-ref-store.sh b/t/t1406-submodule-ref-store.sh
@@ -92,7 +92,7 @@ test_expect_success 'delete_reflog() not allowed' '
 '
 
 test_expect_success 'create-reflog() not allowed' '
-	test_must_fail $RUN create-reflog HEAD 1
+	test_must_fail $RUN create-reflog HEAD
 '
 
 test_done

Original file line number	Diff line number	Diff line change
`@@ -2366,16 +2366,15 @@ int reflog_exists(const char *refname)`
`2366`	`2366`	`}`
`2367`	`2367`
`2368`	`2368`	`int refs_create_reflog(struct ref_store refs, const char refname,`
`2369`		`- int force_create, struct strbuf *err)`
	`2369`	`+ struct strbuf *err)`
`2370`	`2370`	`{`
`2371`		`- return refs->be->create_reflog(refs, refname, force_create, err);`
	`2371`	`+ return refs->be->create_reflog(refs, refname, err);`
`2372`	`2372`	`}`
`2373`	`2373`
`2374`		`-int safe_create_reflog(const char *refname, int force_create,`
`2375`		`- struct strbuf *err)`
	`2374`	`+int safe_create_reflog(const char refname, struct strbuf err)`
`2376`	`2375`	`{`
`2377`	`2376`	`return refs_create_reflog(get_main_ref_store(the_repository), refname,`
`2378`		`- force_create, err);`
	`2377`	`+ err);`
`2379`	`2378`	`}`
`2380`	`2379`
`2381`	`2380`	`int refs_delete_reflog(struct ref_store refs, const char refname)`
Original file line number	Diff line number	Diff line change
`@@ -339,11 +339,10 @@ static int debug_reflog_exists(struct ref_store ref_store, const char refname)`
`339`	`339`	`}`
`340`	`340`
`341`	`341`	`static int debug_create_reflog(struct ref_store ref_store, const char refname,`
`342`		`- int force_create, struct strbuf *err)`
	`342`	`+ struct strbuf *err)`
`343`	`343`	`{`
`344`	`344`	`struct debug_ref_store drefs = (struct debug_ref_store )ref_store;`
`345`		`- int res = drefs->refs->be->create_reflog(drefs->refs, refname,`
`346`		`- force_create, err);`
	`345`	`+ int res = drefs->refs->be->create_reflog(drefs->refs, refname, err);`
`347`	`346`	`trace_printf_key(&trace_refs, "create_reflog: %s: %d\n", refname, res);`
`348`	`347`	`return res;`
`349`	`348`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1629,8 +1629,7 @@ static int packed_reflog_exists(struct ref_store *ref_store,`
`1629`	`1629`	`}`
`1630`	`1630`
`1631`	`1631`	`static int packed_create_reflog(struct ref_store *ref_store,`
`1632`		`- const char *refname, int force_create,`
`1633`		`- struct strbuf *err)`
	`1632`	`+ const char refname, struct strbuf err)`
`1634`	`1633`	`{`
`1635`	`1634`	`BUG("packed reference store does not support reflogs");`
`1636`	`1635`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ test_expect_success 'delete_reflog(HEAD)' '`
`108`	`108`	`'`
`109`	`109`
`110`	`110`	`test_expect_success 'create-reflog(HEAD)' '`
`111`		`- $RUN create-reflog HEAD 1 &&`
	`111`	`+ $RUN create-reflog HEAD &&`
`112`	`112`	`git reflog exists HEAD`
`113`	`113`	`'`
`114`	`114`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ test_expect_success 'delete_reflog() not allowed' '`
`92`	`92`	`'`
`93`	`93`
`94`	`94`	`test_expect_success 'create-reflog() not allowed' '`
`95`		`- test_must_fail $RUN create-reflog HEAD 1`
	`95`	`+ test_must_fail $RUN create-reflog HEAD`
`96`	`96`	`'`
`97`	`97`
`98`	`98`	`test_done`