diff options
| author | SZEDER Gábor <szeder.dev@gmail.com> | 2017-02-03 02:48:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-04 06:18:40 (GMT) |
| commit | 69a775963b76824511fe4bdaf949f2e44df4b7a5 (patch) | |
| tree | ea9831f56bd49a98e07b6a764473ee46fb9de875 /contrib | |
| parent | 5c12f642df48a0ddee24554fbd2067c4958273d8 (diff) | |
| download | git-69a775963b76824511fe4bdaf949f2e44df4b7a5.zip git-69a775963b76824511fe4bdaf949f2e44df4b7a5.tar.gz git-69a775963b76824511fe4bdaf949f2e44df4b7a5.tar.bz2 | |
completion: list refs from remote when remote's name matches a directory
If the remote given to __git_refs() happens to match both the name of
a configured remote and the name of a directory in the current working
directory, then that directory is assumed to be a git repository, and
listing refs from that directory will be attempted. This is wrong,
because in such a situation git commands (e.g. 'git fetch|pull|push
<remote>' whom these refs will eventually be passed to) give
precedence to the configured remote. Therefore, __git_refs() should
list refs from the configured remote as well.
Add the helper function __git_is_configured_remote() that checks
whether its argument matches the name of a configured remote. Use
this helper to decide how to handle the remote passed to __git_refs().
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 46ac6a6..af5ad52 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -347,12 +347,16 @@ __git_refs () local format refs pfx if [ -n "$remote" ]; then - if [ -d "$remote/.git" ]; then + if __git_is_configured_remote "$remote"; then + # configured remote takes precedence over a + # local directory with the same name + list_refs_from=remote + elif [ -d "$remote/.git" ]; then dir="$remote/.git" elif [ -d "$remote" ]; then dir="$remote" else - list_refs_from=remote + list_refs_from=url fi fi @@ -435,6 +439,18 @@ __git_remotes () git --git-dir="$d" remote } +# Returns true if $1 matches the name of a configured remote, false otherwise. +__git_is_configured_remote () +{ + local remote + for remote in $(__git_remotes); do + if [ "$remote" = "$1" ]; then + return 0 + fi + done + return 1 +} + __git_list_merge_strategies () { git merge -s help 2>&1 | |