diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-07-07 08:09:17 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-07 08:09:17 +0300 |
| commit | 67d99b82de27e98bfec7d174ef4b6369d5b85d7a (patch) | |
| tree | 862766ca5a1a3dde7b68f1492b4a533bbfef126d /http-push.c | |
| parent | 8a78e4d61588fe8e46dd7d27cb2d521b07f4a191 (diff) | |
| parent | 64472d15e90f14d920eade6bb1d1c4a01fca2280 (diff) | |
Merge branch 'bc/http-push-flagsfix'
The code to push changes over "dumb" HTTP had a bad interaction
with the commit reachability code due to incorrect allocation of
object flag bits, which has been corrected.
* bc/http-push-flagsfix:
http-push: ensure unforced pushes fail when data would be lost
Diffstat (limited to 'http-push.c')
| -rw-r--r-- | http-push.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/http-push.c b/http-push.c index ac7868ffee..1ff1883cdd 100644 --- a/http-push.c +++ b/http-push.c @@ -70,10 +70,10 @@ enum XML_Status { #define LOCK_REFRESH 30 /* Remember to update object flag allocation in object.h */ -#define LOCAL (1u<<16) -#define REMOTE (1u<<17) -#define FETCHING (1u<<18) -#define PUSHING (1u<<19) +#define LOCAL (1u<<11) +#define REMOTE (1u<<12) +#define FETCHING (1u<<13) +#define PUSHING (1u<<14) /* We allow "recursive" symbolic refs. Only within reason, though */ #define MAXDEPTH 5 |