diff options
| author | Mike McQuaid | 2015-12-07 09:30:19 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2015-12-07 13:37:27 +0000 |
| commit | fe8a0569ca1fc419f80196bea22cc1de0ff3b93a (patch) | |
| tree | 71cee24a2966ebdcd1c9a4113a3bc76b7edafc2e /Library/Homebrew/test | |
| parent | 3d3c3e013108a3d21ad188488e69f8b33227537b (diff) | |
| download | brew-fe8a0569ca1fc419f80196bea22cc1de0ff3b93a.tar.bz2 | |
update: always reset to origin/master.
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 <mike@mikemcquaid.com>
Diffstat (limited to 'Library/Homebrew/test')
| -rw-r--r-- | Library/Homebrew/test/test_updater.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Library/Homebrew/test/test_updater.rb b/Library/Homebrew/test/test_updater.rb index 20d26e6e9..16efdaa1d 100644 --- a/Library/Homebrew/test/test_updater.rb +++ b/Library/Homebrew/test/test_updater.rb @@ -57,9 +57,9 @@ class UpdaterTests < Homebrew::TestCase Formulary.stubs(:factory).returns(stub(:pkg_version => "1.0")) FormulaVersions.stubs(:new).returns(stub(:formula_at_revision => "2.0")) @updater.diff = fixture(fixture_name) - @updater.in_repo_expect("git diff --quiet", true) @updater.in_repo_expect("git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null", "refs/remotes/origin/master") @updater.in_repo_expect("git symbolic-ref --short HEAD 2>/dev/null", "master") + @updater.in_repo_expect("git status --untracked-files=all --porcelain 2>/dev/null", "") @updater.in_repo_expect("git rev-parse -q --verify HEAD", "1234abcd") @updater.in_repo_expect("git config core.autocrlf false") @updater.in_repo_expect("git pull --ff --no-rebase --quiet origin refs/heads/master:refs/remotes/origin/master") |