summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-11 11:18:43 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-11 11:18:43 -0700
commit07e74b0da2896ffa6acb5c33f56d7266b35b7ac9 (patch)
treebe3f24134f5956774c7d5407231a31bab33d5616 /cache.h
parent9a10117560316ed22099f74583e56c1cc7c41394 (diff)
parent0aff719f489771c5e52259394d011c51317b118f (diff)
downloadgit-07e74b0da2896ffa6acb5c33f56d7266b35b7ac9.tar.gz
Merge branch 'ct/advise-push-default' into maint
The cases "git push" fails due to non-ff can be broken into three categories; each case is given a separate advise message. By Christopher Tiwald (2) and Jeff King (1) * ct/advise-push-default: Fix httpd tests that broke when non-ff push advice changed clean up struct ref's nonfastforward field push: Provide situational hints for non-fast-forward errors
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index 5e6eef9b4d..5bf59ff5c3 100644
--- a/cache.h
+++ b/cache.h
@@ -625,7 +625,8 @@ enum push_default_type {
PUSH_DEFAULT_NOTHING = 0,
PUSH_DEFAULT_MATCHING,
PUSH_DEFAULT_UPSTREAM,
- PUSH_DEFAULT_CURRENT
+ PUSH_DEFAULT_CURRENT,
+ PUSH_DEFAULT_UNSPECIFIED
};
extern enum branch_track git_branch_track;