summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorLibravatar Chris Rorvick <chris@rorvick.com>2012-11-29 19:41:34 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-12-02 01:39:50 -0800
commitb24e6047a8da3cddfd686e6a9157ed4bac28ed4f (patch)
tree6cb17f7ea002a44c823a5c034f5cb856249afe81 /cache.h
parentpush: return reject reasons as a bitset (diff)
downloadtgif-b24e6047a8da3cddfd686e6a9157ed4bac28ed4f.tar.xz
push: add advice for rejected tag reference
Advising the user to fetch and merge only makes sense if the rejected reference is a branch. If none of the rejections are for branches, just tell the user the reference already exists. Signed-off-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index dbd8018b58..d72b64d8b0 100644
--- a/cache.h
+++ b/cache.h
@@ -1002,6 +1002,7 @@ struct ref {
unsigned int force:1,
merge:1,
nonfastforward:1,
+ not_forwardable:1,
deletion:1;
enum {
REF_STATUS_NONE = 0,