From b24e6047a8da3cddfd686e6a9157ed4bac28ed4f Mon Sep 17 00:00:00 2001
From: Chris Rorvick <chris@rorvick.com>
Date: Thu, 29 Nov 2012 19:41:34 -0600
Subject: 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>
---
 cache.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'cache.h')

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,
-- 
cgit v1.3-5-g9baa