Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/remote-default-show'
author
Junio C Hamano
<gitster@pobox.com>
Sun, 20 Apr 2008 04:10:24 +0000
(21:10 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 20 Apr 2008 04:10:24 +0000
(21:10 -0700)
* jk/remote-default-show:
git-remote: show all remotes with "git remote show"
builtin-remote.c
patch
|
blob
|
history
raw
(from parent 1:
dc46fa3
)
diff --git
a/builtin-remote.c
b/builtin-remote.c
index 8fe31dbd9af2833f4dc6c3e93b9179f20d2a1d66..a3ee1ac3937b179799fbaa048927c4c8a9963cc9 100644
(file)
--- a/
builtin-remote.c
+++ b/
builtin-remote.c
@@
-19,6
+19,8
@@
static const char * const builtin_remote_usage[] = {
static int verbose;
+static int show_all(void);
+
static inline int postfixcmp(const char *string, const char *postfix)
{
int len1 = strlen(string), len2 = strlen(postfix);
@@
-384,8
+386,11
@@
static int show_or_prune(int argc, const char **argv, int prune)
argc = parse_options(argc, argv, options, builtin_remote_usage, 0);
- if (argc < 1)
+ if (argc < 1) {
+ if (!prune)
+ return show_all();
usage_with_options(builtin_remote_usage, options);
+ }
memset(&states, 0, sizeof(states));
for (; argc; argc--, argv++) {