Merge branch 'dg/bswap-msvc'

[thirdparty/git.git] / advice.c

diff --git a/advice.c b/advice.c
index f0a3d32d20687d1caadc1534aa15cf50543c27c0..164742305fd147c9f31fab6b127a10e1f8e0f636 100644 (file)
--- a/advice.c
+++ b/advice.c
@@ -11,6 +11,7 @@ int advice_push_already_exists = 1;
 int advice_push_fetch_first = 1;
 int advice_push_needs_force = 1;
 int advice_push_unqualified_ref_name = 1;
+int advice_push_ref_needs_update = 1;
 int advice_status_hints = 1;
 int advice_status_u_option = 1;
 int advice_status_ahead_behind_warning = 1;
@@ -72,6 +73,7 @@ static struct {
        { "pushFetchFirst", &advice_push_fetch_first },
        { "pushNeedsForce", &advice_push_needs_force },
        { "pushUnqualifiedRefName", &advice_push_unqualified_ref_name },
+       { "pushRefNeedsUpdate", &advice_push_ref_needs_update },
        { "statusHints", &advice_status_hints },
        { "statusUoption", &advice_status_u_option },
        { "statusAheadBehindWarning", &advice_status_ahead_behind_warning },
@@ -116,6 +118,7 @@ static struct {
        [ADVICE_PUSH_ALREADY_EXISTS]                    = { "pushAlreadyExists", 1 },
        [ADVICE_PUSH_FETCH_FIRST]                       = { "pushFetchFirst", 1 },
        [ADVICE_PUSH_NEEDS_FORCE]                       = { "pushNeedsForce", 1 },
+       [ADVICE_PUSH_REF_NEEDS_UPDATE]                  = { "pushRefNeedsUpdate", 1 },
 
        /* make this an alias for backward compatibility */
        [ADVICE_PUSH_UPDATE_REJECTED_ALIAS]             = { "pushNonFastForward", 1 },