summaryrefslogtreecommitdiff
path: root/object.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-07-07 05:09:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-07-07 05:09:17 (GMT)
commit67d99b82de27e98bfec7d174ef4b6369d5b85d7a (patch)
tree862766ca5a1a3dde7b68f1492b4a533bbfef126d /object.h
parent8a78e4d61588fe8e46dd7d27cb2d521b07f4a191 (diff)
parent64472d15e90f14d920eade6bb1d1c4a01fca2280 (diff)
downloadgit-67d99b82de27e98bfec7d174ef4b6369d5b85d7a.zip
git-67d99b82de27e98bfec7d174ef4b6369d5b85d7a.tar.gz
git-67d99b82de27e98bfec7d174ef4b6369d5b85d7a.tar.bz2
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 'object.h')
-rw-r--r--object.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/object.h b/object.h
index 532d7d7..1bcf4f3 100644
--- a/object.h
+++ b/object.h
@@ -66,7 +66,7 @@ struct object_array {
* builtin/blame.c: 12-13
* bisect.c: 16
* bundle.c: 16
- * http-push.c: 16-----19
+ * http-push.c: 11-----14
* commit-graph.c: 15
* commit-reach.c: 16-----19
* sha1-name.c: 20