undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show usage string for 'git http-push -h'

Browse Source 
http-push already knows how to dump usage if it is given no options, but
it interprets '-h' as the URL to a remote repository:

    $ git http-push -h
    error: Cannot access URL -h/, return code 6

Dump usage instead.  Humans wanting to pass the URL -h/ to curl for some
reason can use 'git http-push -h/' explicitly.  Scripts expecting to
access an HTTP repository at URL '-h' will break, though.

Also delay finding a git directory until after option parsing, so
"http-push -h" can be used outside any git repository.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2009-11-09 04:47:34 -06:00 committed by Junio C Hamano
parent 616f86d713
commit 548d3464dc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
http-push.c
View File

@ -1792,8 +1792,6 @@ int main(int argc, char **argv)
git_extract_argv0_path(argv[0]); git_extract_argv0_path(argv[0]);
setup_git_directory();
repo = xcalloc(sizeof(*repo), 1); repo = xcalloc(sizeof(*repo), 1);
argv++; argv++;
@ -1827,6 +1825,8 @@ int main(int argc, char **argv)
force_delete = 1; force_delete = 1;
continue; continue;
} }
if (!strcmp(arg, "-h"))
usage(http_push_usage);
} }
if (!repo->url) { if (!repo->url) {
char *path = strstr(arg, "//"); char *path = strstr(arg, "//");
@ -1854,6 +1854,8 @@ int main(int argc, char **argv)
if (delete_branch && nr_refspec != 1) if (delete_branch && nr_refspec != 1)
die("You must specify only one branch name when deleting a remote branch"); die("You must specify only one branch name when deleting a remote branch");
setup_git_directory();
memset(remote_dir_exists, -1, 256); memset(remote_dir_exists, -1, 256);
/* /*