aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-20 15:50:37 -0700
committerJunio C Hamano <gitster@pobox.com>2012-04-20 15:50:37 -0700
commitc5da24a73a96a9908ae715f6430e65294115646a (patch)
tree4db197f483c8fd331cc149869da44d02c9ecacb2 /cache.h
parentaf78c317205ce254d9cc75fc0298ee86b579de73 (diff)
parent0aff719f489771c5e52259394d011c51317b118f (diff)
downloadgit-c5da24a73a96a9908ae715f6430e65294115646a.tar.gz
git-c5da24a73a96a9908ae715f6430e65294115646a.tar.xz
Merge branch 'ct/advise-push-default'
Break down the cases in which "git push" fails due to non-ff into three categories, and give separate advise messages for each case. 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 5e6eef9b4..5bf59ff5c 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;