summaryrefslogtreecommitdiff
path: root/send-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-24 07:40:14 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-24 23:50:53 (GMT)
commitff27adf3dae36695f1af1b6f0e01ec6738ce0249 (patch)
tree676ccf3206efd6b7335a630185b08211c16b2918 /send-pack.c
parentefe9bf0f3b34d12b3b76f8277550f91700609b25 (diff)
downloadgit-ff27adf3dae36695f1af1b6f0e01ec6738ce0249.zip
git-ff27adf3dae36695f1af1b6f0e01ec6738ce0249.tar.gz
git-ff27adf3dae36695f1af1b6f0e01ec6738ce0249.tar.bz2
Support +<src>:<dst> format in push as well.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'send-pack.c')
-rw-r--r--send-pack.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/send-pack.c b/send-pack.c
index 0ab135c..55d8ff7 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,