summaryrefslogtreecommitdiff
path: root/refs.h
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2014-09-10 18:22:48 -0700
committerJunio C Hamano <gitster@pobox.com>2014-10-15 10:47:25 -0700
commit62a2d52514aed2b684409cb48e40e0cd14335d1b (patch)
tree609d4997c69205497bbd6103c0d76f49e22b91e8 /refs.h
parent014e7db3f5563a61cefbe1f6f5747931c799a37e (diff)
downloadgit-62a2d52514aed2b684409cb48e40e0cd14335d1b.tar.gz
branch -d: avoid repeated symref resolution
If a repository gets in a broken state with too much symref nesting, it cannot be repaired with "git branch -d": $ git symbolic-ref refs/heads/nonsense refs/heads/nonsense $ git branch -d nonsense error: branch 'nonsense' not found. Worse, "git update-ref --no-deref -d" doesn't work for such repairs either: $ git update-ref -d refs/heads/nonsense error: unable to resolve reference refs/heads/nonsense: Too many levels of symbolic links Fix both by teaching resolve_ref_unsafe a new RESOLVE_REF_NO_RECURSE flag and passing it when appropriate. Callers can still read the value of a symref (for example to print a message about it) with that flag set --- resolve_ref_unsafe will resolve one level of symrefs and stop there. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Reviewed-by: Ronnie Sahlberg <sahlberg@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs.h')
-rw-r--r--refs.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/refs.h b/refs.h
index eea104478f..79802d79c0 100644
--- a/refs.h
+++ b/refs.h
@@ -177,10 +177,12 @@ extern int peel_ref(const char *refname, unsigned char *sha1);
* ref_transaction_create(), etc.
* REF_NODEREF: act on the ref directly, instead of dereferencing
* symbolic references.
+ * REF_DELETING: tolerate broken refs
*
* Flags >= 0x100 are reserved for internal use.
*/
#define REF_NODEREF 0x01
+#define REF_DELETING 0x02
/*
* This function sets errno to something meaningful on failure.
*/