summaryrefslogtreecommitdiff
path: root/transport.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-03-26 19:51:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-26 19:59:04 (GMT)
commite339aa92ae2db194a3d5738cb3aee6d8b3bf7b10 (patch)
treecf5dd2ce2f41d750747c7539787e79af43cc50c8 /transport.h
parentf25950f3475e263ed6c8f0797bb058ba6444f85e (diff)
downloadgit-e339aa92ae2db194a3d5738cb3aee6d8b3bf7b10.zip
git-e339aa92ae2db194a3d5738cb3aee6d8b3bf7b10.tar.gz
git-e339aa92ae2db194a3d5738cb3aee6d8b3bf7b10.tar.bz2
clean up struct ref's nonfastforward field
Each ref structure contains a "nonfastforward" field which is set during push to show whether the ref rewound history. Originally this was a single bit, but it was changed in f25950f (push: Provide situational hints for non-fast-forward errors) to an enum differentiating a non-ff of the current branch versus another branch. However, we never actually set the member according to the enum values, nor did we ever read it expecting anything but a boolean value. But we did use the side effect of declaring the enum constants to store those values in a totally different integer variable. The code as-is isn't buggy, but the enum declaration inside "struct ref" is somewhat misleading. Let's convert nonfastforward back into a single bit, and then define the NON_FF_* constants closer to where they would be used (they are returned via the "int *nonfastforward" parameter to transport_push, so we can define them there). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'transport.h')
-rw-r--r--transport.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/transport.h b/transport.h
index ce99ef8..1631a35 100644
--- a/transport.h
+++ b/transport.h
@@ -138,6 +138,8 @@ int transport_set_option(struct transport *transport, const char *name,
void transport_set_verbosity(struct transport *transport, int verbosity,
int force_progress);
+#define NON_FF_HEAD 1
+#define NON_FF_OTHER 2
int transport_push(struct transport *connection,
int refspec_nr, const char **refspec, int flags,
int * nonfastforward);