diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-31 13:14:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-31 13:14:59 -0800 |
| commit | fe575f06532bde1e672a2313fd76ef09b66fc355 (patch) | |
| tree | c0a7b6b77695f9ea2b2c8c76b0a8c8f495ac77d7 /builtin/fetch.c | |
| parent | c54ba283fa4501cc02230424ccfd84622df49256 (diff) | |
| parent | e459b073fb3ab8abe36e6bee5c5d6be1ed3928ae (diff) | |
| download | git-fe575f06532bde1e672a2313fd76ef09b66fc355.tar.gz git-fe575f06532bde1e672a2313fd76ef09b66fc355.tar.xz | |
Merge branch 'js/remote-rename-with-half-configured-remote'
With anticipatory tweaking for remotes defined in ~/.gitconfig
(e.g. "remote.origin.prune" set to true, even though there may or
may not actually be "origin" remote defined in a particular Git
repository), "git remote rename" and other commands misinterpreted
and behaved as if such a non-existing remote actually existed.
* js/remote-rename-with-half-configured-remote:
remote rename: more carefully determine whether a remote is configured
remote rename: demonstrate a bogus "remote exists" bug
Diffstat (limited to 'builtin/fetch.c')
| -rw-r--r-- | builtin/fetch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index f1570e346..b5ad09d04 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1177,7 +1177,7 @@ static int add_remote_or_group(const char *name, struct string_list *list) git_config(get_remote_group, &g); if (list->nr == prev_nr) { struct remote *remote = remote_get(name); - if (!remote_is_configured(remote)) + if (!remote_is_configured(remote, 0)) return 0; string_list_append(list, remote->name); } |