@@ -1,7 +1,7 @@ -source .git-completion.bash +source ~/.git-completion.bash # Environment variables -export PS1='\e[36m\w$(__git_ps1 "(%s)") \e[0m> ' +export PS1='\[\e[36m\]\w$(__git_ps1 "(%s)") \[\e[0m> \]' export HISTCONTROL=erasedups export HISTSIZE=10000 if [ -e mvim ] @@ -50,5 +50,7 @@ alias git_remove_missing_files="gs | awk '/deleted:(.*)/ {print $3}' | xargs git alias gcm='git commit -m' alias gp='git push' alias gbr='git checkout -b' +alias gco='git checkout' +alias gmas='git checkout master' bind "set completion-ignore-case on" .bashrc @@ -45,11 +45,6 @@ # git@vger.kernel.org # -case "$COMP_WORDBREAKS" in -*:*) : great ;; -*) COMP_WORDBREAKS="$COMP_WORDBREAKS:" -esac - __gitdir () { if [ -z "$1" ]; then @@ -73,41 +68,30 @@ __git_ps1 () if [ -n "$g" ]; then local r local b - if [ -d "$g/rebase-apply" ] + if [ -d "$g/../.dotest" ] then - if test -f "$g/rebase-apply/rebasing" - then - r="|REBASE" - elif test -f "$g/rebase-apply/applying" - then - r="|AM" - else - r="|AM/REBASE" - fi + r="|AM/REBASE" b="$(git symbolic-ref HEAD 2>/dev/null)" - elif [ -f "$g/rebase-merge/interactive" ] + elif [ -f "$g/.dotest-merge/interactive" ] then r="|REBASE-i" - b="$(cat "$g/rebase-merge/head-name")" - elif [ -d "$g/rebase-merge" ] + b="$(cat $g/.dotest-merge/head-name)" + elif [ -d "$g/.dotest-merge" ] then r="|REBASE-m" - b="$(cat "$g/rebase-merge/head-name")" + b="$(cat $g/.dotest-merge/head-name)" elif [ -f "$g/MERGE_HEAD" ] then r="|MERGING" b="$(git symbolic-ref HEAD 2>/dev/null)" else - if [ -f "$g/BISECT_LOG" ] + if [ -f $g/BISECT_LOG ] then r="|BISECTING" fi if ! b="$(git symbolic-ref HEAD 2>/dev/null)" then - if ! b="$(git describe --exact-match HEAD 2>/dev/null)" - then - b="$(cut -c1-7 "$g/HEAD")..." - fi + b="$(cut -c1-7 $g/HEAD)..." fi fi @@ -119,46 +103,37 @@ __git_ps1 () fi } -__gitcomp_1 () -{ - local c IFS=' '$'\t'$'\n' - for c in $1; do - case "$c$2" in - --*=*) printf %s$'\n' "$c$2" ;; - *.) printf %s$'\n' "$c$2" ;; - *) printf %s$'\n' "$c$2 " ;; - esac - done -} - __gitcomp () { + local all c s=$'\n' IFS=' '$'\t'$'\n' local cur="${COMP_WORDS[COMP_CWORD]}" if [ $# -gt 2 ]; then cur="$3" fi - case "$cur" in - --*=) - COMPREPLY=() - ;; - *) - local IFS=$'\n' - COMPREPLY=($(compgen -P "$2" \ - -W "$(__gitcomp_1 "$1" "$4")" \ - -- "$cur")) - ;; - esac + for c in $1; do + case "$c$4" in + --*=*) all="$all$c$4$s" ;; + *.) all="$all$c$4$s" ;; + *) all="$all$c$4 $s" ;; + esac + done + IFS=$s + COMPREPLY=($(compgen -P "$2" -W "$all" -- "$cur")) + return } __git_heads () { local cmd i is_hash=y dir="$(__gitdir "$1")" if [ -d "$dir" ]; then - git --git-dir="$dir" for-each-ref --format='%(refname:short)' \ - refs/heads + for i in $(git --git-dir="$dir" \ + for-each-ref --format='%(refname)' \ + refs/heads ); do + echo "${i#refs/heads/}" + done return fi - for i in $(git ls-remote "$1" 2>/dev/null); do + for i in $(git-ls-remote "$1" 2>/dev/null); do case "$is_hash,$i" in y,*) is_hash=n ;; n,*^{}) is_hash=y ;; @@ -172,11 +147,14 @@ __git_tags () { local cmd i is_hash=y dir="$(__gitdir "$1")" if [ -d "$dir" ]; then - git --git-dir="$dir" for-each-ref --format='%(refname:short)' \ - refs/tags + for i in $(git --git-dir="$dir" \ + for-each-ref --format='%(refname)' \ + refs/tags ); do + echo "${i#refs/tags/}" + done return fi - for i in $(git ls-remote "$1" 2>/dev/null); do + for i in $(git-ls-remote "$1" 2>/dev/null); do case "$is_hash,$i" in y,*) is_hash=n ;; n,*^{}) is_hash=y ;; @@ -188,25 +166,22 @@ __git_tags () __git_refs () { - local i is_hash=y dir="$(__gitdir "$1")" - local cur="${COMP_WORDS[COMP_CWORD]}" format refs + local cmd i is_hash=y dir="$(__gitdir "$1")" if [ -d "$dir" ]; then - case "$cur" in - refs|refs/*) - format="refname" - refs="${cur%/*}" - ;; - *) - if [ -e "$dir/HEAD" ]; then echo HEAD; fi - format="refname:short" - refs="refs/tags refs/heads refs/remotes" - ;; - esac - git --git-dir="$dir" for-each-ref --format="%($format)" \ - $refs + if [ -e "$dir/HEAD" ]; then echo HEAD; fi + for i in $(git --git-dir="$dir" \ + for-each-ref --format='%(refname)' \ + refs/tags refs/heads refs/remotes); do + case "$i" in + refs/tags/*) echo "${i#refs/tags/}" ;; + refs/heads/*) echo "${i#refs/heads/}" ;; + refs/remotes/*) echo "${i#refs/remotes/}" ;; + *) echo "$i" ;; + esac + done return fi - for i in $(git ls-remote "$dir" 2>/dev/null); do + for i in $(git-ls-remote "$dir" 2>/dev/null); do case "$is_hash,$i" in y,*) is_hash=n ;; n,*^{}) is_hash=y ;; @@ -229,7 +204,7 @@ __git_refs2 () __git_refs_remotes () { local cmd i is_hash=y - for i in $(git ls-remote "$1" 2>/dev/null); do + for i in $(git-ls-remote "$1" 2>/dev/null); do case "$is_hash,$i" in n,refs/heads/*) is_hash=y @@ -268,17 +243,15 @@ __git_merge_strategies () echo "$__git_merge_strategylist" return fi - git merge -s help 2>&1 | - sed -n -e '/[Aa]vailable strategies are: /,/^$/{ - s/\.$// - s/.*:// - s/^[ ]*// - s/[ ]*$// + sed -n "/^all_strategies='/{ + s/^all_strategies='// + s/'// p - }' + q + }" "$(git --exec-path)/git-merge" } __git_merge_strategylist= -__git_merge_strategylist=$(__git_merge_strategies 2>/dev/null) +__git_merge_strategylist="$(__git_merge_strategies 2>/dev/null)" __git_complete_file () { @@ -298,23 +271,9 @@ __git_complete_file () ls="$ref" ;; esac - - case "$COMP_WORDBREAKS" in - *:*) : great ;; - *) pfx="$ref:$pfx" ;; - esac - - local IFS=$'\n' COMPREPLY=($(compgen -P "$pfx" \ -W "$(git --git-dir="$(__gitdir)" ls-tree "$ls" \ - | sed '/^100... blob /{ - s,^.* ,, - s,$, , - } - /^120000 blob /{ - s,^.* ,, - s,$, , - } + | sed '/^100... blob /s,^.* ,, /^040000 tree /{ s,^.* ,, s,$,/, @@ -342,16 +301,19 @@ __git_complete_revlist () cur="${cur#*..}" __gitcomp "$(__git_refs)" "$pfx" "$cur" ;; + *.) + __gitcomp "$cur." + ;; *) __gitcomp "$(__git_refs)" ;; esac } -__git_all_commands () +__git_commands () { - if [ -n "$__git_all_commandlist" ]; then - echo "$__git_all_commandlist" + if [ -n "$__git_commandlist" ]; then + echo "$__git_commandlist" return fi local i IFS=" "$'\n' @@ -359,33 +321,13 @@ __git_all_commands () do case $i in *--*) : helper pattern;; - *) echo $i;; - esac - done -} -__git_all_commandlist= -__git_all_commandlist="$(__git_all_commands 2>/dev/null)" - -__git_porcelain_commands () -{ - if [ -n "$__git_porcelain_commandlist" ]; then - echo "$__git_porcelain_commandlist" - return - fi - local i IFS=" "$'\n' - for i in "help" $(__git_all_commands) - do - case $i in - *--*) : helper pattern;; applymbox) : ask gittus;; applypatch) : ask gittus;; archimport) : import;; cat-file) : plumbing;; check-attr) : plumbing;; check-ref-format) : plumbing;; - checkout-index) : plumbing;; commit-tree) : plumbing;; - count-objects) : infrequent;; cvsexportcommit) : export;; cvsimport) : import;; cvsserver) : daemon;; @@ -394,7 +336,6 @@ __git_porcelain_commands () diff-index) : plumbing;; diff-tree) : plumbing;; fast-import) : import;; - fast-export) : export;; fsck-objects) : plumbing;; fetch-pack) : plumbing;; fmt-merge-msg) : plumbing;; @@ -404,10 +345,6 @@ __git_porcelain_commands () index-pack) : plumbing;; init-db) : deprecated;; local-fetch) : plumbing;; - lost-found) : infrequent;; - ls-files) : plumbing;; - ls-remote) : plumbing;; - ls-tree) : plumbing;; mailinfo) : plumbing;; mailsplit) : plumbing;; merge-*) : plumbing;; @@ -432,11 +369,11 @@ __git_porcelain_commands () runstatus) : plumbing;; sh-setup) : internal;; shell) : daemon;; - show-ref) : plumbing;; send-pack) : plumbing;; show-index) : plumbing;; ssh-*) : transport;; stripspace) : plumbing;; + svn) : import export;; symbolic-ref) : plumbing;; tar-tree) : deprecated;; unpack-file) : plumbing;; @@ -447,15 +384,13 @@ __git_porcelain_commands () upload-archive) : plumbing;; upload-pack) : plumbing;; write-tree) : plumbing;; - var) : infrequent;; - verify-pack) : infrequent;; verify-tag) : plumbing;; *) echo $i;; esac done } -__git_porcelain_commandlist= -__git_porcelain_commandlist="$(__git_porcelain_commands 2>/dev/null)" +__git_commandlist= +__git_commandlist="$(__git_commands 2>/dev/null)" __git_aliases () { @@ -482,41 +417,13 @@ __git_aliased_command () done } -__git_find_subcommand () -{ - local word subcommand c=1 - - while [ $c -lt $COMP_CWORD ]; do - word="${COMP_WORDS[c]}" - for subcommand in $1; do - if [ "$subcommand" = "$word" ]; then - echo "$subcommand" - return - fi - done - c=$((++c)) - done -} - -__git_has_doubledash () -{ - local c=1 - while [ $c -lt $COMP_CWORD ]; do - if [ "--" = "${COMP_WORDS[c]}" ]; then - return 0 - fi - c=$((++c)) - done - return 1 -} - -__git_whitespacelist="nowarn warn error error-all fix" +__git_whitespacelist="nowarn warn error error-all strip" _git_am () { - local cur="${COMP_WORDS[COMP_CWORD]}" dir="$(__gitdir)" - if [ -d "$dir"/rebase-apply ]; then - __gitcomp "--skip --resolved --abort" + local cur="${COMP_WORDS[COMP_CWORD]}" + if [ -d .dotest ]; then + __gitcomp "--skip --resolved" return fi case "$cur" in @@ -556,56 +463,36 @@ _git_apply () _git_add () { - __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" case "$cur" in --*) - __gitcomp " - --interactive --refresh --patch --update --dry-run - --ignore-errors - " + __gitcomp "--interactive --refresh" return esac COMPREPLY=() } -_git_archive () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - case "$cur" in - --format=*) - __gitcomp "$(git archive --list)" "" "${cur##--format=}" - return - ;; - --remote=*) - __gitcomp "$(__git_remotes)" "" "${cur##--remote=}" - return - ;; - --*) - __gitcomp " - --format= --list --verbose - --prefix= --remote= --exec= - " - return - ;; - esac - __git_complete_file -} - _git_bisect () { - __git_has_doubledash && return + local i c=1 command + while [ $c -lt $COMP_CWORD ]; do + i="${COMP_WORDS[c]}" + case "$i" in + start|bad|good|reset|visualize|replay|log) + command="$i" + break + ;; + esac + c=$((++c)) + done - local subcommands="start bad good skip reset visualize replay log run" - local subcommand="$(__git_find_subcommand "$subcommands")" - if [ -z "$subcommand" ]; then - __gitcomp "$subcommands" + if [ $c -eq $COMP_CWORD -a -z "$command" ]; then + __gitcomp "start bad good reset visualize replay log" return fi - case "$subcommand" in - bad|good|reset|skip) + case "$command" in + bad|good|reset) __gitcomp "$(__git_refs)" ;; *) @@ -616,43 +503,26 @@ _git_bisect () _git_branch () { - local i c=1 only_local_ref="n" has_r="n" - - while [ $c -lt $COMP_CWORD ]; do - i="${COMP_WORDS[c]}" - case "$i" in - -d|-m) only_local_ref="y" ;; - -r) has_r="y" ;; - esac - c=$((++c)) - done - - case "${COMP_WORDS[COMP_CWORD]}" in - --*=*) COMPREPLY=() ;; - --*) - __gitcomp " - --color --no-color --verbose --abbrev= --no-abbrev - --track --no-track --contains --merged --no-merged - " - ;; - *) - if [ $only_local_ref = "y" -a $has_r = "n" ]; then - __gitcomp "$(__git_heads)" - else - __gitcomp "$(__git_refs)" - fi - ;; - esac + __gitcomp "$(__git_refs)" } _git_bundle () { - local cmd="${COMP_WORDS[2]}" - case "$COMP_CWORD" in - 2) + local mycword="$COMP_CWORD" + case "${COMP_WORDS[0]}" in + git) + local cmd="${COMP_WORDS[2]}" + mycword="$((mycword-1))" + ;; + git-bundle*) + local cmd="${COMP_WORDS[1]}" + ;; + esac + case "$mycword" in + 1) __gitcomp "create list-heads verify unbundle" ;; - 3) + 2) # looking for a file ;; *) @@ -667,8 +537,6 @@ _git_bundle () _git_checkout () { - __git_has_doubledash && return - __gitcomp "$(__git_refs)" } @@ -690,55 +558,14 @@ _git_cherry_pick () esac } -_git_clean () -{ - __git_has_doubledash && return - - local cur="${COMP_WORDS[COMP_CWORD]}" - case "$cur" in - --*) - __gitcomp "--dry-run --quiet" - return - ;; - esac - COMPREPLY=() -} - -_git_clone () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - case "$cur" in - --*) - __gitcomp " - --local - --no-hardlinks - --shared - --reference - --quiet - --no-checkout - --bare - --mirror - --origin - --upload-pack - --template= - --depth - " - return - ;; - esac - COMPREPLY=() -} - _git_commit () { - __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" case "$cur" in --*) __gitcomp " --all --author= --signoff --verify --no-verify - --edit --amend --include --only --interactive + --edit --amend --include --only " return esac @@ -747,63 +574,60 @@ _git_commit () _git_describe () { - local cur="${COMP_WORDS[COMP_CWORD]}" - case "$cur" in - --*) - __gitcomp " - --all --tags --contains --abbrev= --candidates= - --exact-match --debug --long --match --always - " - return - esac __gitcomp "$(__git_refs)" } _git_diff () { - __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" case "$cur" in --*) __gitcomp "--cached --stat --numstat --shortstat --summary --patch-with-stat --name-only --name-status --color --no-color --color-words --no-renames --check - --full-index --binary --abbrev --diff-filter= + --full-index --binary --abbrev --diff-filter --find-copies-harder --pickaxe-all --pickaxe-regex --text --ignore-space-at-eol --ignore-space-change --ignore-all-space --exit-code --quiet --ext-diff - --no-ext-diff - --no-prefix --src-prefix= --dst-prefix= - --base --ours --theirs - " + --no-ext-diff" return ;; esac __git_complete_file } +_git_diff_tree () +{ + __gitcomp "$(__git_refs)" +} + _git_fetch () { local cur="${COMP_WORDS[COMP_CWORD]}" - if [ "$COMP_CWORD" = 2 ]; then + case "${COMP_WORDS[0]},$COMP_CWORD" in + git-fetch*,1) __gitcomp "$(__git_remotes)" - else + ;; + git,2) + __gitcomp "$(__git_remotes)" + ;; + *) case "$cur" in *:*) - local pfx="" - case "$COMP_WORDBREAKS" in - *:*) : great ;; - *) pfx="${cur%%:*}:" ;; - esac - __gitcomp "$(__git_refs)" "$pfx" "${cur#*:}" + __gitcomp "$(__git_refs)" "" "${cur#*:}" ;; *) - __gitcomp "$(__git_refs2 "${COMP_WORDS[2]}")" + local remote + case "${COMP_WORDS[0]}" in + git-fetch) remote="${COMP_WORDS[1]}" ;; + git) remote="${COMP_WORDS[2]}" ;; + esac + __gitcomp "$(__git_refs2 "$remote")" ;; esac - fi + ;; + esac } _git_format_patch () @@ -821,8 +645,6 @@ _git_format_patch () --in-reply-to= --full-index --binary --not --all - --cover-letter - --no-prefix --src-prefix= --dst-prefix= " return ;; @@ -842,84 +664,6 @@ _git_gc () COMPREPLY=() } -_git_grep () -{ - __git_has_doubledash && return - - local cur="${COMP_WORDS[COMP_CWORD]}" - case "$cur" in - --*) - __gitcomp " - --cached - --text --ignore-case --word-regexp --invert-match - --full-name - --extended-regexp --basic-regexp --fixed-strings - --files-with-matches --name-only - --files-without-match - --count - --and --or --not --all-match - " - return - ;; - esac - COMPREPLY=() -} - -_git_help () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - case "$cur" in - --*) - __gitcomp "--all --info --man --web" - return - ;; - esac - __gitcomp "$(__git_all_commands) - attributes cli core-tutorial cvs-migration - diffcore gitk glossary hooks ignore modules - repository-layout tutorial tutorial-2 - workflows - " -} - -_git_init () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - case "$cur" in - --shared=*) - __gitcomp " - false true umask group all world everybody - " "" "${cur##--shared=}" - return - ;; - --*) - __gitcomp "--quiet --bare --template= --shared --shared=" - return - ;; - esac - COMPREPLY=() -} - -_git_ls_files () -{ - __git_has_doubledash && return - - local cur="${COMP_WORDS[COMP_CWORD]}" - case "$cur" in - --*) - __gitcomp "--cached --deleted --modified --others --ignored - --stage --directory --no-empty-directory --unmerged - --killed --exclude= --exclude-from= - --exclude-per-directory= --exclude-standard - --error-unmatch --with-tree= --full-name - --abbrev --ignored --exclude-per-directory - " - return - ;; - esac - COMPREPLY=() -} - _git_ls_remote () { __gitcomp "$(__git_remotes)" @@ -932,8 +676,6 @@ _git_ls_tree () _git_log () { - __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" case "$cur" in --pretty=*) @@ -961,12 +703,6 @@ _git_log () --pretty= --name-status --name-only --raw --not --all --left-right --cherry-pick - --graph - --stat --numstat --shortstat - --decorate --diff-filter= - --color-words --walk-reflogs - --parents --children --full-history - --merge " return ;; @@ -989,49 +725,18 @@ _git_merge () ;; --*) __gitcomp " - --no-commit --no-stat --log --no-log --squash --strategy + --no-commit --no-summary --squash --strategy " return esac __gitcomp "$(__git_refs)" } -_git_mergetool () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - case "$cur" in - --tool=*) - __gitcomp " - kdiff3 tkdiff meld xxdiff emerge - vimdiff gvimdiff ecmerge opendiff - " "" "${cur##--tool=}" - return - ;; - --*) - __gitcomp "--tool=" - return - ;; - esac - COMPREPLY=() -} - _git_merge_base () { __gitcomp "$(__git_refs)" } -_git_mv () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - case "$cur" in - --*) - __gitcomp "--dry-run" - return - ;; - esac - COMPREPLY=() -} - _git_name_rev () { __gitcomp "--tags --all --stdin" @@ -1041,29 +746,44 @@ _git_pull () { local cur="${COMP_WORDS[COMP_CWORD]}" - if [ "$COMP_CWORD" = 2 ]; then + case "${COMP_WORDS[0]},$COMP_CWORD" in + git-pull*,1) __gitcomp "$(__git_remotes)" - else - __gitcomp "$(__git_refs "${COMP_WORDS[2]}")" - fi + ;; + git,2) + __gitcomp "$(__git_remotes)" + ;; + *) + local remote + case "${COMP_WORDS[0]}" in + git-pull) remote="${COMP_WORDS[1]}" ;; + git) remote="${COMP_WORDS[2]}" ;; + esac + __gitcomp "$(__git_refs "$remote")" + ;; + esac } _git_push () { local cur="${COMP_WORDS[COMP_CWORD]}" - if [ "$COMP_CWORD" = 2 ]; then + case "${COMP_WORDS[0]},$COMP_CWORD" in + git-push*,1) __gitcomp "$(__git_remotes)" - else + ;; + git,2) + __gitcomp "$(__git_remotes)" + ;; + *) case "$cur" in *:*) - local pfx="" - case "$COMP_WORDBREAKS" in - *:*) : great ;; - *) pfx="${cur%%:*}:" ;; + local remote + case "${COMP_WORDS[0]}" in + git-push) remote="${COMP_WORDS[1]}" ;; + git) remote="${COMP_WORDS[2]}" ;; esac - - __gitcomp "$(__git_refs "${COMP_WORDS[2]}")" "$pfx" "${cur#*:}" + __gitcomp "$(__git_refs "$remote")" "" "${cur#*:}" ;; +*) __gitcomp "$(__git_refs)" + "${cur#+}" @@ -1072,13 +792,14 @@ _git_push () __gitcomp "$(__git_refs)" ;; esac - fi + ;; + esac } _git_rebase () { - local cur="${COMP_WORDS[COMP_CWORD]}" dir="$(__gitdir)" - if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then + local cur="${COMP_WORDS[COMP_CWORD]}" + if [ -d .dotest ] || [ -d .git/.dotest-merge ]; then __gitcomp "--continue --skip --abort" return fi @@ -1093,31 +814,12 @@ _git_rebase () return ;; --*) - __gitcomp "--onto --merge --strategy --interactive" + __gitcomp "--onto --merge --strategy" return esac __gitcomp "$(__git_refs)" } -_git_send_email () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - case "$cur" in - --*) - __gitcomp "--bcc --cc --cc-cmd --chain-reply-to --compose - --dry-run --envelope-sender --from --identity - --in-reply-to --no-chain-reply-to --no-signed-off-by-cc - --no-suppress-from --no-thread --quiet - --signed-off-by-cc --smtp-pass --smtp-server - --smtp-server-port --smtp-ssl --smtp-user --subject - --suppress-cc --suppress-from --thread --to - --validate --no-validate" - return - ;; - esac - COMPREPLY=() -} - _git_config () { local cur="${COMP_WORDS[COMP_CWORD]}" @@ -1216,6 +918,7 @@ _git_config () core.sharedRepository core.warnAmbiguousRefs core.compression + core.legacyHeaders core.packedGitWindowSize core.packedGitLimit clean.requireForce @@ -1246,8 +949,7 @@ _git_config () gitcvs.enabled gitcvs.logfile gitcvs.allbinary - gitcvs.dbname gitcvs.dbdriver gitcvs.dbuser gitcvs.dbpass - gitcvs.dbtablenameprefix + gitcvs.dbname gitcvs.dbdriver gitcvs.dbuser gitcvs.dvpass gc.packrefs gc.reflogexpire gc.reflogexpireunreachable @@ -1277,6 +979,7 @@ _git_config () pull.octopus pull.twohead repack.useDeltaBaseOffset + show.difftree showbranch.default tar.umask transfer.unpackLimit @@ -1285,20 +988,28 @@ _git_config () user.name user.email user.signingkey + whatchanged.difftree branch. remote. " } _git_remote () { - local subcommands="add rm show prune update" - local subcommand="$(__git_find_subcommand "$subcommands")" - if [ -z "$subcommand" ]; then - __gitcomp "$subcommands" + local i c=1 command + while [ $c -lt $COMP_CWORD ]; do + i="${COMP_WORDS[c]}" + case "$i" in + add|rm|show|prune|update) command="$i"; break ;; + esac + c=$((++c)) + done + + if [ $c -eq $COMP_CWORD -a -z "$command" ]; then + __gitcomp "add rm show prune update" return fi - case "$subcommand" in + case "$command" in rm|show|prune) __gitcomp "$(__git_remotes)" ;; @@ -1322,8 +1033,6 @@ _git_remote () _git_reset () { - __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" case "$cur" in --*) @@ -1334,36 +1043,8 @@ _git_reset () __gitcomp "$(__git_refs)" } -_git_revert () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - case "$cur" in - --*) - __gitcomp "--edit --mainline --no-edit --no-commit --signoff" - return - ;; - esac - __gitcomp "$(__git_refs)" -} - -_git_rm () -{ - __git_has_doubledash && return - - local cur="${COMP_WORDS[COMP_CWORD]}" - case "$cur" in - --*) - __gitcomp "--cached --dry-run --ignore-unmatch --quiet" - return - ;; - esac - COMPREPLY=() -} - _git_shortlog () { - __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" case "$cur" in --*) @@ -1384,8 +1065,6 @@ _git_shortlog () _git_show () { - __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" case "$cur" in --pretty=*) @@ -1402,148 +1081,36 @@ _git_show () __git_complete_file } -_git_show_branch () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - case "$cur" in - --*) - __gitcomp " - --all --remotes --topo-order --current --more= - --list --independent --merge-base --no-name - --sha1-name --topics --reflog - " - return - ;; - esac - __git_complete_revlist -} - _git_stash () { - local subcommands='save list show apply clear drop pop create branch' - local subcommand="$(__git_find_subcommand "$subcommands")" - if [ -z "$subcommand" ]; then - __gitcomp "$subcommands" - else - local cur="${COMP_WORDS[COMP_CWORD]}" - case "$subcommand,$cur" in - save,--*) - __gitcomp "--keep-index" - ;; - apply,--*) - __gitcomp "--index" - ;; - show,--*|drop,--*|pop,--*|branch,--*) - COMPREPLY=() - ;; - show,*|apply,*|drop,*|pop,*|branch,*) - __gitcomp "$(git --git-dir="$(__gitdir)" stash list \ - | sed -n -e 's/:.*//p')" - ;; - *) - COMPREPLY=() - ;; - esac - fi + __gitcomp 'list show apply clear' } _git_submodule () { - __git_has_doubledash && return + local i c=1 command + while [ $c -lt $COMP_CWORD ]; do + i="${COMP_WORDS[c]}" + case "$i" in + add|status|init|update) command="$i"; break ;; + esac + c=$((++c)) + done - local subcommands="add status init update summary foreach sync" - if [ -z "$(__git_find_subcommand "$subcommands")" ]; then + if [ $c -eq $COMP_CWORD -a -z "$command" ]; then local cur="${COMP_WORDS[COMP_CWORD]}" case "$cur" in --*) __gitcomp "--quiet --cached" ;; *) - __gitcomp "$subcommands" + __gitcomp "add status init update" ;; esac return fi } -_git_svn () -{ - local subcommands=" - init fetch clone rebase dcommit log find-rev - set-tree commit-diff info create-ignore propget - proplist show-ignore show-externals - " - local subcommand="$(__git_find_subcommand "$subcommands")" - if [ -z "$subcommand" ]; then - __gitcomp "$subcommands" - else - local remote_opts="--username= --config-dir= --no-auth-cache" - local fc_opts=" - --follow-parent --authors-file= --repack= - --no-metadata --use-svm-props --use-svnsync-props - --log-window-size= --no-checkout --quiet - --repack-flags --user-log-author $remote_opts - " - local init_opts=" - --template= --shared= --trunk= --tags= - --branches= --stdlayout --minimize-url - --no-metadata --use-svm-props --use-svnsync-props - --rewrite-root= $remote_opts - " - local cmt_opts=" - --edit --rmdir --find-copies-harder --copy-similarity= - " - - local cur="${COMP_WORDS[COMP_CWORD]}" - case "$subcommand,$cur" in - fetch,--*) - __gitcomp "--revision= --fetch-all $fc_opts" - ;; - clone,--*) - __gitcomp "--revision= $fc_opts $init_opts" - ;; - init,--*) - __gitcomp "$init_opts" - ;; - dcommit,--*) - __gitcomp " - --merge --strategy= --verbose --dry-run - --fetch-all --no-rebase $cmt_opts $fc_opts - " - ;; - set-tree,--*) - __gitcomp "--stdin $cmt_opts $fc_opts" - ;; - create-ignore,--*|propget,--*|proplist,--*|show-ignore,--*|\ - show-externals,--*) - __gitcomp "--revision=" - ;; - log,--*) - __gitcomp " - --limit= --revision= --verbose --incremental - --oneline --show-commit --non-recursive - --authors-file= - " - ;; - rebase,--*) - __gitcomp " - --merge --verbose --strategy= --local - --fetch-all $fc_opts - " - ;; - commit-diff,--*) - __gitcomp "--message= --file= --revision= $cmt_opts" - ;; - info,--*) - __gitcomp "--url" - ;; - *) - COMPREPLY=() - ;; - esac - fi -} - _git_tag () { local i c=1 f=0 @@ -1565,7 +1132,7 @@ _git_tag () -m|-F) COMPREPLY=() ;; - -*|tag) + -*|tag|git-tag) if [ $f = 1 ]; then __gitcomp "$(__git_tags)" else @@ -1587,28 +1154,24 @@ _git () case "$i" in --git-dir=*) __git_dir="${i#--git-dir=}" ;; --bare) __git_dir="." ;; - --version|-p|--paginate) ;; - --help) command="help"; break ;; + --version|--help|-p|--paginate) ;; *) command="$i"; break ;; esac c=$((++c)) done - if [ -z "$command" ]; then + if [ $c -eq $COMP_CWORD -a -z "$command" ]; then case "${COMP_WORDS[COMP_CWORD]}" in --*=*) COMPREPLY=() ;; --*) __gitcomp " - --paginate --no-pager --git-dir= --bare --version --exec-path - --work-tree= - --help " ;; - *) __gitcomp "$(__git_porcelain_commands) $(__git_aliases)" ;; + *) __gitcomp "$(__git_commands) $(__git_aliases)" ;; esac return fi @@ -1620,15 +1183,12 @@ _git () am) _git_am ;; add) _git_add ;; apply) _git_apply ;; - archive) _git_archive ;; bisect) _git_bisect ;; bundle) _git_bundle ;; branch) _git_branch ;; checkout) _git_checkout ;; cherry) _git_cherry ;; cherry-pick) _git_cherry_pick ;; - clean) _git_clean ;; - clone) _git_clone ;; commit) _git_commit ;; config) _git_config ;; describe) _git_describe ;; @@ -1636,32 +1196,22 @@ _git () fetch) _git_fetch ;; format-patch) _git_format_patch ;; gc) _git_gc ;; - grep) _git_grep ;; - help) _git_help ;; - init) _git_init ;; log) _git_log ;; - ls-files) _git_ls_files ;; ls-remote) _git_ls_remote ;; ls-tree) _git_ls_tree ;; merge) _git_merge;; - mergetool) _git_mergetool;; merge-base) _git_merge_base ;; - mv) _git_mv ;; name-rev) _git_name_rev ;; pull) _git_pull ;; push) _git_push ;; rebase) _git_rebase ;; remote) _git_remote ;; reset) _git_reset ;; - revert) _git_revert ;; - rm) _git_rm ;; - send-email) _git_send_email ;; shortlog) _git_shortlog ;; show) _git_show ;; - show-branch) _git_show_branch ;; + show-branch) _git_log ;; stash) _git_stash ;; submodule) _git_submodule ;; - svn) _git_svn ;; tag) _git_tag ;; whatchanged) _git_log ;; *) COMPREPLY=() ;; @@ -1670,17 +1220,10 @@ _git () _gitk () { - __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" - local g="$(git rev-parse --git-dir 2>/dev/null)" - local merge="" - if [ -f $g/MERGE_HEAD ]; then - merge="--merge" - fi case "$cur" in --*) - __gitcomp "--not --all $merge" + __gitcomp "--not --all" return ;; esac @@ -1689,11 +1232,64 @@ _gitk () complete -o default -o nospace -F _git git complete -o default -o nospace -F _gitk gitk +complete -o default -o nospace -F _git_am git-am +complete -o default -o nospace -F _git_apply git-apply +complete -o default -o nospace -F _git_bisect git-bisect +complete -o default -o nospace -F _git_branch git-branch +complete -o default -o nospace -F _git_bundle git-bundle +complete -o default -o nospace -F _git_checkout git-checkout +complete -o default -o nospace -F _git_cherry git-cherry +complete -o default -o nospace -F _git_cherry_pick git-cherry-pick +complete -o default -o nospace -F _git_commit git-commit +complete -o default -o nospace -F _git_describe git-describe +complete -o default -o nospace -F _git_diff git-diff +complete -o default -o nospace -F _git_fetch git-fetch +complete -o default -o nospace -F _git_format_patch git-format-patch +complete -o default -o nospace -F _git_gc git-gc +complete -o default -o nospace -F _git_log git-log +complete -o default -o nospace -F _git_ls_remote git-ls-remote +complete -o default -o nospace -F _git_ls_tree git-ls-tree +complete -o default -o nospace -F _git_merge git-merge +complete -o default -o nospace -F _git_merge_base git-merge-base +complete -o default -o nospace -F _git_name_rev git-name-rev +complete -o default -o nospace -F _git_pull git-pull +complete -o default -o nospace -F _git_push git-push +complete -o default -o nospace -F _git_rebase git-rebase +complete -o default -o nospace -F _git_config git-config +complete -o default -o nospace -F _git_remote git-remote +complete -o default -o nospace -F _git_reset git-reset +complete -o default -o nospace -F _git_shortlog git-shortlog +complete -o default -o nospace -F _git_show git-show +complete -o default -o nospace -F _git_stash git-stash +complete -o default -o nospace -F _git_submodule git-submodule +complete -o default -o nospace -F _git_log git-show-branch +complete -o default -o nospace -F _git_tag git-tag +complete -o default -o nospace -F _git_log git-whatchanged # The following are necessary only for Cygwin, and only are needed # when the user has tab-completed the executable name and consequently # included the '.exe' suffix. # if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then +complete -o default -o nospace -F _git_add git-add.exe +complete -o default -o nospace -F _git_apply git-apply.exe complete -o default -o nospace -F _git git.exe +complete -o default -o nospace -F _git_branch git-branch.exe +complete -o default -o nospace -F _git_bundle git-bundle.exe +complete -o default -o nospace -F _git_cherry git-cherry.exe +complete -o default -o nospace -F _git_describe git-describe.exe +complete -o default -o nospace -F _git_diff git-diff.exe +complete -o default -o nospace -F _git_format_patch git-format-patch.exe +complete -o default -o nospace -F _git_log git-log.exe +complete -o default -o nospace -F _git_ls_tree git-ls-tree.exe +complete -o default -o nospace -F _git_merge_base git-merge-base.exe +complete -o default -o nospace -F _git_name_rev git-name-rev.exe +complete -o default -o nospace -F _git_push git-push.exe +complete -o default -o nospace -F _git_config git-config +complete -o default -o nospace -F _git_shortlog git-shortlog.exe +complete -o default -o nospace -F _git_show git-show.exe +complete -o default -o nospace -F _git_log git-show-branch.exe +complete -o default -o nospace -F _git_tag git-tag.exe +complete -o default -o nospace -F _git_log git-whatchanged.exe fi + .git-completion.bash f92c3989e678771310a32bcbe0dd0be3b5a16635 faithfulgeek joe@faithfulgeek.org http://github.com/faithfulgeek/dotfiles/commit/be7e8086577f59575165e44e32e4fb48c400aa13 be7e8086577f59575165e44e32e4fb48c400aa13 2009-03-08T19:04:54-07:00 2009-03-08T19:04:54-07:00 Corrected/updated git completions, fixed a bug with command line coloring, and added git aliases 229940adafa8d3c560ca4801ca8155f5aab0c9f3 faithfulgeek joe@faithfulgeek.org