summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-04 10:25:04 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-04 10:25:04 -0800
commit370855e967e21d9c5b70df7b5cd3756c7bed5c7c (patch)
tree80d1f70f82ec587ca4919d2289d6087d4979009c /cache.h
parent099ba556d05571001293c8eda10a4fc659f83f48 (diff)
parentb4cf8db27502f613fcff3fd871c8e31d23f49c7d (diff)
downloadgit-370855e967e21d9c5b70df7b5cd3756c7bed5c7c.tar.gz
Merge branch 'jc/push-reject-reasons'
Improve error and advice messages given locally when "git push" refuses when it cannot compute fast-forwardness by separating these cases from the normal "not a fast-forward; merge first and push again" case. * jc/push-reject-reasons: push: finishing touches to explain REJECT_ALREADY_EXISTS better push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE push: further simplify the logic to assign rejection reason push: further clean up fields of "struct ref"
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/cache.h b/cache.h
index 9038fb500e..e493563f4c 100644
--- a/cache.h
+++ b/cache.h
@@ -1015,10 +1015,8 @@ struct ref {
char *symref;
unsigned int
force:1,
- requires_force:1,
+ forced_update:1,
merge:1,
- nonfastforward:1,
- update:1,
deletion:1;
enum {
REF_STATUS_NONE = 0,
@@ -1026,6 +1024,8 @@ struct ref {
REF_STATUS_REJECT_NONFASTFORWARD,
REF_STATUS_REJECT_ALREADY_EXISTS,
REF_STATUS_REJECT_NODELETE,
+ REF_STATUS_REJECT_FETCH_FIRST,
+ REF_STATUS_REJECT_NEEDS_FORCE,
REF_STATUS_UPTODATE,
REF_STATUS_REMOTE_REJECT,
REF_STATUS_EXPECTING_REPORT