GitLab

Revert PR #3359 as this is breaking stuff for many folks. Need to rethink how we handle system defaults differently on this

Commit 81004dfa reverted the change
in 9b811fb6 when editing the merge
conflict from #2928.

This commit fixes that so that we don't make the same mistake again.

First seen in http://git.io/Cdaj5Q

This avoid spawning additional processes, as the $USER variable will
**always** contain the current logged-in user.

From http://zsh.sourceforge.net/Doc/Release/Options.html#Completion-4

> AUTO_NAME_DIRS
> Any parameter that is set to the absolute name of a directory immediately
> becomes a name for that directory, that will be used by the ‘%~’ and
> related prompt sequences, and will be available when completion is performed
> on a word starting with ‘~’.
> (Otherwise, the parameter must be used in the form ‘~param’ first.)

Explained in more detail in
https://github.com/wayneeseguin/rvm/issues/3091#issuecomment-60083194

Related issues:
https://github.com/robbyrussell/oh-my-zsh/issues/2857
https://github.com/robbyrussell/oh-my-zsh/issues/3238
https://github.com/wayneeseguin/rvm/issues/3091

In older version of zsh, `add-zsh-hook` is not available, causing issues like:

```
/Users/hugo/.oh-my-zsh/lib/termsupport.zsh:32: add-zsh-hook: function definition file not found
/Users/hugo/.oh-my-zsh/lib/termsupport.zsh:33: add-zsh-hook: function definition file not found
```

See https://github.com/robbyrussell/oh-my-zsh/issues/748. This patch pulls in the changes suggested in https://github.com/robbyrussell/oh-my-zsh/issues/748#issuecomment-37862691 by @mcornella and I have tested it on RHEL 5.

Some environments (such as Android) does not have /usr/bin.

Merged from #2906

The function `git_prompt_info` calls `git config` for its stdout output,
but doesn't handle the stderr output.  This can lead to problems,
e.g. if the git config file is unreadable for some reason (permissions
etc).

This fixes the issue by simply ignoring the stderr output.

Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>

before, 128 was returned, which could display an error,
but out of a git repo this should exit silently
fixes #2226

replaced hardcoded origin/{branch-name} with @{upstream} which gets the upstream branch since git 1.7.0

This commit move the nocorrect aliases definition so they're called
only when the user set ENABLE_CORRECTION to "true" to activate commands
autocorrection.

Since e537ee9d, the reverse-menu-complete keybinding has no longer been
properly bound (it was accidentally bound to the delete key).

This commit again binds it to shift-tab.

Fixes formatting on some rare cases when a percent ends up
in the $CMD variable, like these below:

- When assigning a variable, $CMD ends up with the second parameter;
in this case, $CMD will contain '+%s%N', messing with the syntax:

 $ a=`date +%s%N`

- A function (or command in general) that contains a percent symbol:

 $ to\%() { echo $(( $1 * 100 / $3))\% } # $CMD=to%()
 $ to% 2 of 10 # $CMD=to%

Fixes #2641, #2642

Especially given the inc_append_history option, it is not necessary to
set the (default) append_history option.

Fixes #2641, #2642

Delete key (of Fn+Delete on Mac) would print "~" instead of deletion.

Aligned comments