From 001e4f345bb8e267844f0eb7dafcbd824a3832f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 29 Nov 2018 13:21:09 +0100 Subject: git: Add gitbcheckout --- bash-completion/gitbmerge | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) (limited to 'bash-completion/gitbmerge') diff --git a/bash-completion/gitbmerge b/bash-completion/gitbmerge index 8706fc8..33e8ed0 100644 --- a/bash-completion/gitbmerge +++ b/bash-completion/gitbmerge @@ -1,21 +1,14 @@ _gitbmerge() { - local cur prev + [ "$COMP_CWORD" -gt 1 ] && return # Complete only single branch + local cur prev words cword _init_completion || return - [ $COMP_CWORD -gt 1 ] && return # Complete only single dependency - COMPREPLY=() - local GDIR="$(pwd)" - while [ ! -d "$GDIR/.git" ]; do - [ -z "$GDIR" ] && return - GDIR="${GDIR%/*}" - done - GDIR="$GDIR/.git" - [ -f "$GDIR" ] && GDIR="$(cat "$GDIR")" # This just points to some other directory - [ -d "$GDIR/refs/heads" ] || return # No completion if there is no local branch - local ops="" - for B in "$GDIR"/refs/heads/*; do - # TODO skip branch on HEAD - ops="$ops ${B#$GDIR/refs/heads/}" - done - COMPREPLY+=($(compgen -W "${ops}" -- ${cur})) + local gdir branch + gdir="$(git rev-parse --git-common-dir 2>/dev/null)" || return + local branches=() + # TODO ignore current HEAD (merging HEAD to HEAD does not makes sense) + while read -r branch; do + branches+=("$branch") + done < <(find "$gdir/refs/heads" -mindepth 1 -printf '%P\n') + COMPREPLY=($(compgen -W "${branches[*]}" -- ${cur})) } complete -F _gitbmerge gitbmerge -- cgit v1.2.3