Commit 978a28a108ecdc501cf03dade3215aed24981a12

Christian Weisgerber 2021-09-04T16:22:38

make "got branch -d" print reference name and value Also silence output of "got branch -d" in a regression test, from stsp. ok stsp

diff --git a/got/got.c b/got/got.c
index a0e7e05..2b61384 100644
--- a/got/got.c
+++ b/got/got.c
@@ -5773,7 +5773,7 @@ delete_branch(struct got_repository *repo, struct got_worktree *worktree,
 		goto done;
 	}
 
-	err = got_ref_delete(ref, repo);
+	err = delete_ref(repo, ref);
 done:
 	if (ref)
 		got_ref_close(ref);
diff --git a/regress/cmdline/fetch.sh b/regress/cmdline/fetch.sh
index 2e47e88..4ab2988 100755
--- a/regress/cmdline/fetch.sh
+++ b/regress/cmdline/fetch.sh
@@ -438,7 +438,7 @@ test_fetch_delete_branch() {
 		return 1
 	fi
 
-	got branch -r $testroot/repo -d foo
+	got branch -r $testroot/repo -d foo >/dev/null
 
 	got fetch -q -r $testroot/repo-clone
 	ret="$?"