Merge branch 'maint'

[git.git] / http-push.c
diff --git a/http-push.c b/http-push.c

index a035919764ae4eb020dbeba9f1f7126a0c66e3be..9314621a11030e66eeba7f0da6b88a813e1ba759 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -13,7 +13,7 @@
  #include <expat.h>
  
  static const char http_push_usage[] =
-"git-http-push [--all] [--force] [--verbose] <remote> [<head>...]\n";
+"git-http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";
  
  #ifndef XML_STATUS_OK
  enum XML_Status {
@@ -80,6 +80,7 @@ static struct curl_slist *default_headers;
  static int push_verbosely;
  static int push_all;
  static int force_all;
+static int dry_run;
  
  static struct object_list *objects;
  
@@ -2240,7 +2241,11 @@ static int delete_remote_branch(char *pattern, int force)
  
                 /* Remote branch must be an ancestor of remote HEAD */
                 if (!verify_merge_base(head_sha1, remote_ref->old_sha1)) {
-                       return error("The branch '%s' is not a strict subset of your current HEAD.\nIf you are sure you want to delete it, run:\n\t'git http-push -D %s %s'", remote_ref->name, remote->url, pattern);
+                       return error("The branch '%s' is not an ancestor "
+                                    "of your current HEAD.\n"
+                                    "If you are sure you want to delete it,"
+                                    " run:\n\t'git http-push -D %s %s'",
+                                    remote_ref->name, remote->url, pattern);
                 }
         }
  
@@ -2302,6 +2307,10 @@ int main(int argc, char **argv)
                                 force_all = 1;
                                 continue;
                         }
+                       if (!strcmp(arg, "--dry-run")) {
+                               dry_run = 1;
+                               continue;
+                       }
                         if (!strcmp(arg, "--verbose")) {
                                 push_verbosely = 1;
                                 continue;
@@ -2412,16 +2421,17 @@ int main(int argc, char **argv)
                         if (!has_sha1_file(ref->old_sha1) ||
                             !ref_newer(ref->peer_ref->new_sha1,
                                        ref->old_sha1)) {
-                               /* We do not have the remote ref, or
+                               /*
+                                * We do not have the remote ref, or
                                  * we know that the remote ref is not
                                  * an ancestor of what we are trying to
                                  * push.  Either way this can be losing
                                  * commits at the remote end and likely
                                  * we were not up to date to begin with.
                                  */
-                               error("remote '%s' is not a strict "
-                                     "subset of local ref '%s'. "
-                                     "maybe you are not up-to-date and "
+                               error("remote '%s' is not an ancestor of\n"
+                                     "local '%s'.\n"
+                                     "Maybe you are not up-to-date and "
                                       "need to pull first?",
                                       ref->name,
                                       ref->peer_ref->name);
@@ -2443,7 +2453,8 @@ int main(int argc, char **argv)
                 if (strcmp(ref->name, ref->peer_ref->name))
                         fprintf(stderr, " using '%s'", ref->peer_ref->name);
                 fprintf(stderr, "\n  from %s\n  to   %s\n", old_hex, new_hex);
-
+               if (dry_run)
+                       continue;
  
                 /* Lock remote branch ref */
                 ref_lock = lock_remote(ref->name, LOCK_TIME);
@@ -2511,7 +2522,8 @@ int main(int argc, char **argv)
         if (remote->has_info_refs && new_refs) {
                 if (info_ref_lock && remote->can_update_info_refs) {
                         fprintf(stderr, "Updating remote server info\n");
-                       update_remote_info_refs(info_ref_lock);
+                       if (!dry_run)
+                               update_remote_info_refs(info_ref_lock);
                 } else {
                         fprintf(stderr, "Unable to update server info\n");
                 }