summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2015-02-12 12:12:12 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-02-12 11:42:53 -0800
commit581d4e0cdbe9526c122b9d0835f951e478f82448 (patch)
tree3f8b75311288e5eec7879fcd87f2f7fc2b3334a7
parentPost 2.3 cycle (batch #1) (diff)
downloadtgif-581d4e0cdbe9526c122b9d0835f951e478f82448.tar.xz
refs: move REF_DELETING to refs.c
It is only used internally now. Document it a little bit better, too. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--refs.c6
-rw-r--r--refs.h4
2 files changed, 7 insertions, 3 deletions
diff --git a/refs.c b/refs.c
index ab2f2a92cd..5e6355c930 100644
--- a/refs.c
+++ b/refs.c
@@ -35,6 +35,12 @@ static unsigned char refname_disposition[256] = {
};
/*
+ * Flag passed to lock_ref_sha1_basic() telling it to tolerate broken
+ * refs (i.e., because the reference is about to be deleted anyway).
+ */
+#define REF_DELETING 0x02
+
+/*
* Used as a flag to ref_transaction_delete when a loose ref is being
* pruned.
*/
diff --git a/refs.h b/refs.h
index afa3c4decd..9bf214880f 100644
--- a/refs.h
+++ b/refs.h
@@ -183,12 +183,10 @@ extern int peel_ref(const char *refname, unsigned char *sha1);
* Flags controlling ref_transaction_update(), 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.
+ * Other flags are reserved for internal use.
*/
#define REF_NODEREF 0x01
-#define REF_DELETING 0x02
/*
* Setup reflog before using. Set errno to something meaningful on failure.