Merge branch 'master' into db/fetch-pack

diff --git a/builtin-push.c b/builtin-push.c
index 4ee36c292d9d42f658673c5d37d80077d65dc855..a552f0dac654bb532ecd43ec5c8cd15e113ef82c 100644 (file)
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -8,7 +8,7 @@
 #include "remote.h"
 #include "transport.h"
 
-static const char push_usage[] = "git-push [--all] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>...]";
+static const char push_usage[] = "git-push [--all] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>...]";
 
 static int all, thin, verbose;
 static const char *receivepack;
@@ -107,6 +107,10 @@ int cmd_push(int argc, const char **argv, const char *prefix)
                        flags |= TRANSPORT_PUSH_ALL;
                        continue;
                }
+               if (!strcmp(arg, "--dry-run")) {
+                       flags |= TRANSPORT_PUSH_DRY_RUN;
+                       continue;
+               }
                if (!strcmp(arg, "--tags")) {
                        add_refspec("refs/tags/*");
                        continue;