Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
brew
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to JiHu GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
KMSCAKKSCFKA AKFACAMADCAS
brew
Commits
12813b8b
Commit
12813b8b
authored
8 years ago
by
Mike McQuaid
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #879 from penman/checkout_warning
Warn when changing branch on update
parents
95863904
37beacd3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Library/Homebrew/cmd/update.sh
+8
-0
8 additions, 0 deletions
Library/Homebrew/cmd/update.sh
with
8 additions
and
0 deletions
Library/Homebrew/cmd/update.sh
+
8
−
0
View file @
12813b8b
...
...
@@ -242,6 +242,14 @@ EOS
INITIAL_BRANCH
=
"
$(
git symbolic-ref
--short
HEAD 2>/dev/null
)
"
if
[[
"
$INITIAL_BRANCH
"
!=
"
$UPSTREAM_BRANCH
"
&&
-n
"
$INITIAL_BRANCH
"
]]
then
if
[[
-z
"
$HOMEBREW_DEVELOPER
"
]]
then
echo
"Checking out
$UPSTREAM_BRANCH
in
$DIR
..."
echo
"To checkout
$INITIAL_BRANCH
in
$DIR
run:"
echo
" 'cd
$DIR
&& git checkout
$INITIAL_BRANCH
"
fi
# Recreate and check out `#{upstream_branch}` if unable to fast-forward
# it to `origin/#{@upstream_branch}`. Otherwise, just check it out.
if
git merge-base
--is-ancestor
"
$UPSTREAM_BRANCH
"
"origin/
$UPSTREAM_BRANCH
"
&>/dev/null
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment