git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 15/15] refs.c: allow deleting refs with a broken sha1

From
Ronnie Sahlberg <sahlberg@google.com>
Date
Oct 21, 2014, 19:24 UTC
Message-ID
<1413919462-3458-16-git-send-email-sahlberg@google.com>
In-Reply-To
<1413919462-3458-1-git-send-email-sahlberg@google.com>
commit 8d75baa250c0f84cc438568cb53ef1a9dd3dfec9 upstream.

Add back support to make it possible to delete refs that have a broken sha1.

Add new internal flags REF_ALLOW_BROKEN and RESOLVE_REF_ALLOW_BAD_SHA1 to pass intent from branch.c that we are willing to allow resolve_ref_unsafe and lock_ref_sha1_basic to allow broken refs. Since these refs can not actually be resolved to a sha1, they instead resolve to null_sha1 when these flags are used.

For example, the ref:
   echo "Broken ref" > .git/refs/heads/foo-broken-1
can now be deleted using git branch -d foo-broken-1
Change-Id: I4e744d9e7d8b7e81dde5479965819117d03c98db
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 builtin/branch.c            | 5 +++--
 cache.h                     | 7 +++++++
 refs.c                      | 6 ++++++
 refs.h                      | 6 ++++--
 t/t1402-check-ref-format.sh | 8 ++++++++
 5 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 3b79c50..04f57d4 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -238,7 +238,8 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
 		target = resolve_ref_unsafe(name,
 					    RESOLVE_REF_READING
 					    | RESOLVE_REF_NO_RECURSE
-					    | RESOLVE_REF_ALLOW_BAD_NAME,
+					    | RESOLVE_REF_ALLOW_BAD_NAME
+					    | RESOLVE_REF_ALLOW_BAD_SHA1,
 					    sha1, &flags);
 		if (!target) {
 			error(remote_branch
@@ -255,7 +256,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
 			continue;
 		}
 
-		if (delete_ref(name, sha1, REF_NODEREF)) {
+		if (delete_ref(name, sha1, REF_NODEREF|REF_ALLOW_BROKEN)) {
 			error(remote_branch
 			      ? _("Error deleting remote branch '%s'")
 			      : _("Error deleting branch '%s'"),
diff --git a/cache.h b/cache.h
index 99ed096..61e61af 100644
--- a/cache.h
+++ b/cache.h
@@ -1000,10 +1000,17 @@ extern int read_ref(const char *refname, unsigned char *sha1);
  * resolved. The function returns NULL for such ref names.
  * Caps and underscores refers to the special refs, such as HEAD,
  * FETCH_HEAD and friends, that all live outside of the refs/ directory.
+ *
+ * RESOLVE_REF_ALLOW_BAD_SHA1 when this flag is set and the ref contains
+ * an invalid sha1, resolve_ref_unsafe will clear the sha1 argument,
+ * set the REF_ISBROKEN flag and return the refname.
+ * This allows using resolve_ref_unsafe to check for existence of such
+ * broken refs.
  */
 #define RESOLVE_REF_READING 0x01
 #define RESOLVE_REF_NO_RECURSE 0x02
 #define RESOLVE_REF_ALLOW_BAD_NAME 0x04
+#define RESOLVE_REF_ALLOW_BAD_SHA1 0x08
 extern const char *resolve_ref_unsafe(const char *ref, int resolve_flags, unsigned char *sha1, int *flags);
 extern char *resolve_refdup(const char *ref, int resolve_flags, unsigned char *sha1, int *flags);
 
diff --git a/refs.c b/refs.c
index 5bd6d62..ae29d11 100644
--- a/refs.c
+++ b/refs.c
@@ -1584,6 +1584,10 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags, unsigned
 			    (buffer[40] != '\0' && !isspace(buffer[40]))) {
 				if (flags)
 					*flags |= REF_ISBROKEN;
+				if (resolve_flags & RESOLVE_REF_ALLOW_BAD_SHA1) {
+					hashclr(sha1);
+					return refname;
+				}
 				errno = EINVAL;
 				return NULL;
 			}
@@ -2265,6 +2269,8 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
 		if (flags & REF_NODEREF)
 			resolve_flags |= RESOLVE_REF_NO_RECURSE;
 	}
+	if (flags & REF_ALLOW_BROKEN)
+		resolve_flags |= RESOLVE_REF_ALLOW_BAD_SHA1;
 
 	refname = resolve_ref_unsafe(refname, resolve_flags,
 				     lock->old_sha1, &type);
diff --git a/refs.h b/refs.h
index 721e21f..2e97f4f 100644
--- a/refs.h
+++ b/refs.h
@@ -185,11 +185,13 @@ extern int peel_ref(const char *refname, unsigned char *sha1);
  * REF_NODEREF: act on the ref directly, instead of dereferencing
  *              symbolic references.
  * REF_DELETING: tolerate broken refs
+ * REF_ALLOW_BROKEN: allow locking refs that are broken.
  *
  * Flags >= 0x100 are reserved for internal use.
  */
-#define REF_NODEREF	0x01
-#define REF_DELETING	0x02
+#define REF_NODEREF		0x01
+#define REF_DELETING		0x02
+#define REF_ALLOW_BROKEN	0x04
 
 /** Reads log for the value of ref during at_time. **/
 extern int read_ref_at(const char *refname, unsigned int flags,
diff --git a/t/t1402-check-ref-format.sh b/t/t1402-check-ref-format.sh
index e5dc62e..a0aef69 100755
--- a/t/t1402-check-ref-format.sh
+++ b/t/t1402-check-ref-format.sh
@@ -197,4 +197,12 @@ invalid_ref_normalized 'heads///foo.lock'
 invalid_ref_normalized 'foo.lock/bar'
 invalid_ref_normalized 'foo.lock///bar'
 
+test_expect_success 'git branch -d can delete ref with broken sha1' '
+	echo "012brokensha1" > .git/refs/heads/brokensha1 &&
+	test_when_finished "rm -f .git/refs/heads/brokensha1" &&
+	git branch -d brokensha1 &&
+	git branch >output &&
+	! grep -e "brokensha1" output
+'
+
 test_done

-- 
2.1.0.rc2.206.gedb03e5
Previous: Ronnie Sahlberg
Message 28 of 28 in “ref-transactions-reflog”
  1. 00/15 ref-transactions-reflogRonnie Sahlberg, Oct 21, 2014
  2. 01/15 refs.c make ref_transaction_create a wrapper to ref_transaction_updateRonnie Sahlberg, Oct 21, 2014
  3. Junio C HamanoOct 23, 2014
  4. Ronnie SahlbergOct 23, 2014
  5. Junio C HamanoOct 23, 2014
  6. Junio C HamanoOct 28, 2014
  7. 02/15 refs.c: make ref_transaction_delete a wrapper for ref_transaction_updateRonnie Sahlberg, Oct 21, 2014
  8. Junio C HamanoOct 23, 2014
  9. 03/15 refs.c: rename the transaction functionsRonnie Sahlberg, Oct 21, 2014
  10. 04/15 refs.c: add a new update_type field to ref_updateRonnie Sahlberg, Oct 21, 2014
  11. Junio C HamanoOct 23, 2014
  12. 05/15 refs.c: add a function to append a reflog entry to a fdRonnie Sahlberg, Oct 21, 2014
  13. 06/15 copy.c: make copy_fd preserve meaningful errnoRonnie Sahlberg, Oct 21, 2014
  14. Junio C HamanoOct 23, 2014
  15. Ronnie SahlbergOct 23, 2014
  16. 07/15 refs.c: add a transaction function to append a reflog entryRonnie Sahlberg, Oct 21, 2014
  17. 08/15 refs.c: add a flag to allow reflog updates to truncate the logRonnie Sahlberg, Oct 21, 2014
  18. 09/15 refs.c: only write reflog update if msg is non-NULLRonnie Sahlberg, Oct 21, 2014
  19. Junio C HamanoOct 23, 2014
  20. Ronnie SahlbergOct 28, 2014
  21. 10/15 refs.c: allow multiple reflog updates during a single transactionRonnie Sahlberg, Oct 21, 2014
  22. Junio C HamanoOct 23, 2014
  23. Ronnie SahlbergOct 28, 2014
  24. 11/15 reflog.c: use a reflog transaction when writing during expireRonnie Sahlberg, Oct 21, 2014
  25. 12/15 refs.c: rename log_ref_setup to create_reflogRonnie Sahlberg, Oct 21, 2014
  26. 13/15 refs.c: make unlock_ref/close_ref/commit_ref staticRonnie Sahlberg, Oct 21, 2014
  27. 14/15 refs.c: remove lock_any_ref_for_updateRonnie Sahlberg, Oct 21, 2014
  28. 15/15 refs.c: allow deleting refs with a broken sha1Ronnie Sahlberg, Oct 21, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.