From ff27adf3dae36695f1af1b6f0e01ec6738ce0249 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 24 Aug 2005 00:40:14 -0700 Subject: Support +: format in push as well. Signed-off-by: Junio C Hamano --- send-pack.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'send-pack.c') diff --git a/send-pack.c b/send-pack.c index 0ab135c98..55d8ff7e1 100644 --- a/send-pack.c +++ b/send-pack.c @@ -206,7 +206,8 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec) /* This part determines what can overwrite what. * The rules are: * - * (0) you can always use --force. + * (0) you can always use --force or +A:B notation to + * selectively force individual ref pairs. * * (1) if the old thing does not exist, it is OK. * @@ -218,16 +219,19 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec) * descendant of old, it is OK. */ - if (!force_update && !is_zero_sha1(ref->old_sha1)) { + if (!force_update && + !is_zero_sha1(ref->old_sha1) && + !ref->force) { if (!has_sha1_file(ref->old_sha1)) { error("remote '%s' object %s does not " "exist on local", ref->name, sha1_to_hex(ref->old_sha1)); continue; } + /* We assume that local is fsck-clean. Otherwise - * you _could_ have a old tag which points at - * something you do not have which may or may not + * you _could_ have an old tag which points at + * something you do not have, which may or may not * be a commit. */ if (!ref_newer(ref->peer_ref->new_sha1, -- cgit v1.2.1