brew/Library/Homebrew/cmd/update.rb, branch 1.2.4

Promote update-bash to the default updater.

2016-02-15T08:54:03+00:00

Also, rename the existing updater to `update-ruby` to allow using as
a fallback. It will eventually be removed.

Closes Homebrew/homebrew#49109.

Signed-off-by: Mike McQuaid

update: abbreviate hashes to at least 7 characters

2016-01-08T14:56:43+00:00

Abbreviations will be longer if needed to preserve uniqueness.

This makes it more consistent with `git rev-parse --short`,
https://github.com/Homebrew/homebrew/commits, etc.

For example, instead of:

    Updated Homebrew from 40d1e9c2 to 90b9bdf4.

We see:

    Updated Homebrew from 40d1e9c to 90b9bdf.

See 0c48248b6555353c8d60b61973639c8423ce586c for the original
introduction of eight-character abbreviations.

doctor: move code away from cmd/

2016-01-05T13:33:06+00:00

Closes Homebrew/homebrew#47665.

Signed-off-by: Baptiste Fontaine

update: avoid unnecessarily recreating 'master'

2016-01-04T15:25:32+00:00

This only affects the behavior of `brew update` while being on a branch
`feature` that doesn't track the upstream branch. For simplicity, the
upstream branch is assumed to be called `master` (`@upstream_branch` in
the code). Consider the following simplified commit history:

        master      origin/master (current state of remote)
        |           |
A---B---C---D---E---F
     \
      G---H---I
              |
              feature (HEAD)

If `origin/master` is equal to `master` and also points at commit `C`,
then `brew update` will update both `master` and `origin/master` to `F`
and report on the changes in the range `C..F`.

However, if `origin/master` is equal to `E` because some commits have
been already fetched with `git fetch origin`, then `brew update` will
recreate `master` from `origin/master` and then pull in the commits from
the remote to update both to `F`. Because `master` gets recreated from
a younger `origin/master`, the report will only contain changes from the
range `E..F` (thus omitting the changes from `C..E`).

This commit adjusts the logic to not recreate `master` if it can be
safely fast-forwarded to `origin/master` (the common case). This fixes
the problem from the second scenario and again reports on the desired
range `C..F`.

Closes Homebrew/homebrew#46951.

Signed-off-by: Martin Afanasjew

update: make stashing local changes more robust

2015-12-13T21:18:14+00:00

Users with local changes and without a configured Git identity won't be
able to update Homebrew via `brew update`, as the update will fail when
trying to stash the local modifications with `git stash`. They will be
unable to proceed until they follow Git's advice to configure their
identity or they manage to revert their local changes.

This change always sets a commit e-mail and name, avoiding this issue. A
nice bonus is that experienced Git users can see who created the stash
commit (identifying `brew update` as the author).

Fixes Homebrew/homebrew#46930.

Closes Homebrew/homebrew#46939.

Signed-off-by: Martin Afanasjew

Allow taps to link manpages.

2015-12-09T09:09:26+00:00

A blocker for https://github.com/caskroom/homebrew-cask/pull/15381
being merged.

Closes Homebrew/homebrew#46795.

avoid using FORMULA_RENAMES directly

2015-12-09T08:56:59+00:00

Use `(installed)` and emoji ticks consistently.

2015-12-07T14:56:30+00:00

Across info, search and update.

Closes Homebrew/homebrew#45131.

Signed-off-by: Mike McQuaid

update: always reset to origin/master.

2015-12-07T13:37:27+00:00

Do a reset to `origin/master` and then stash but don't pop the stash
after running update (unless you were on a branch). This may be mildly
more annoying for Homebrew developers but means it's easier for our
users who don't understand Git (and particularly when they don't
understand that every tap is a separate Git repository).

Closes Homebrew/homebrew#45825.

Signed-off-by: Mike McQuaid

centralize the logic of handling `homebrew-` in Tap.fetch

2015-12-03T05:46:59+00:00

Closes Homebrew/homebrew#46537.

Signed-off-by: Xu Cheng