diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-24 16:56:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-24 16:56:48 -0700 |
| commit | 434d6ba03122c160f98713a009cf8a32d02982f3 (patch) | |
| tree | c4b0963078c63407448b58e961ed81e32a1d14c6 /send-pack.c | |
| parent | 168cc639adb29616bde22f97f153faa1dfd024eb (diff) | |
| parent | c95173410d6f290e65c15232e56f4963f8279ef1 (diff) | |
| download | git-434d6ba03122c160f98713a009cf8a32d02982f3.tar.gz git-434d6ba03122c160f98713a009cf8a32d02982f3.tar.xz | |
Merge refs/heads/master from .
Diffstat (limited to 'send-pack.c')
| -rw-r--r-- | send-pack.c | 12 |
1 files changed, 8 insertions, 4 deletions
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, |