admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

update: rebase (rather than merge) by default.

Browse Source 
We want to always avoid merge commits being committed to Homebrew so
this feels like a better fit.
This commit is contained in:
Mike McQuaid 2016-04-22 10:06:59 +01:00
parent 341b64cc96
commit 2921795668
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/cmd/update.sh
View File

@ -1,8 +1,9 @@
#: * `update` [`--rebase`]: #: * `update` [`--merge`]:
#: Fetch the newest version of Homebrew and all formulae from GitHub using #: Fetch the newest version of Homebrew and all formulae from GitHub using
#: `git`(1). #: `git`(1).
#: #:
#: If `--rebase` is specified then `git pull --rebase` is used. #: If `--merge` is specified then `git merge` is used to include updates
#: (rather than `git rebase`).
brew() { brew() {
"$HOMEBREW_BREW_FILE" "$@" "$HOMEBREW_BREW_FILE" "$@"
@ -199,7 +200,7 @@ pull() {
# ensure we don't munge line endings on checkout # ensure we don't munge line endings on checkout
git config core.autocrlf false git config core.autocrlf false
if [[ -n "$HOMEBREW_REBASE" ]] if [[ -z "$HOMEBREW_MERGE" ]]
then then
git rebase "${QUIET_ARGS[@]}" "origin/$UPSTREAM_BRANCH" git rebase "${QUIET_ARGS[@]}" "origin/$UPSTREAM_BRANCH"
else else
@ -236,7 +237,7 @@ homebrew-update() {
--help) brew help update; exit $? ;; --help) brew help update; exit $? ;;
--verbose) HOMEBREW_VERBOSE=1 ;; --verbose) HOMEBREW_VERBOSE=1 ;;
--debug) HOMEBREW_DEBUG=1;; --debug) HOMEBREW_DEBUG=1;;
--rebase) HOMEBREW_REBASE=1 ;; --merge) HOMEBREW_MERGE=1 ;;
--simulate-from-current-branch) HOMEBREW_SIMULATE_FROM_CURRENT_BRANCH=1 ;; --simulate-from-current-branch) HOMEBREW_SIMULATE_FROM_CURRENT_BRANCH=1 ;;
--preinstall) HOMEBREW_UPDATE_PREINSTALL=1 ;; --preinstall) HOMEBREW_UPDATE_PREINSTALL=1 ;;
--*) ;; --*) ;;

5
share/doc/homebrew/brew.1.html
View File

@ -390,10 +390,11 @@ source. This is useful for creating patches for the software.</p></dd>
<dt><code>unpin</code> <var>formulae</var></dt><dd><p>Unpin <var>formulae</var>, allowing them to be upgraded by <code>brew upgrade</code>. See also <dt><code>unpin</code> <var>formulae</var></dt><dd><p>Unpin <var>formulae</var>, allowing them to be upgraded by <code>brew upgrade</code>. See also
<code>pin</code>.</p></dd> <code>pin</code>.</p></dd>
<dt><code>untap</code> <var>tap</var></dt><dd><p>Remove a tapped repository.</p></dd> <dt><code>untap</code> <var>tap</var></dt><dd><p>Remove a tapped repository.</p></dd>
<dt><code>update</code> [<code>--rebase</code>]</dt><dd><p>Fetch the newest version of Homebrew and all formulae from GitHub using <dt><code>update</code> [<code>--merge</code>]</dt><dd><p>Fetch the newest version of Homebrew and all formulae from GitHub using
<code>git</code>(1).</p> <code>git</code>(1).</p>
<p>If <code>--rebase</code> is specified then <code>git pull --rebase</code> is used.</p></dd> <p>If <code>--merge</code> is specified then <code>git merge</code> is used to include updates
(rather than <code>git rebase</code>).</p></dd>
<dt><code>upgrade</code> [<var>install-options</var>] [<code>--cleanup</code>] [<var>formulae</var>]</dt><dd><p>Upgrade outdated, unpinned brews.</p> <dt><code>upgrade</code> [<var>install-options</var>] [<code>--cleanup</code>] [<var>formulae</var>]</dt><dd><p>Upgrade outdated, unpinned brews.</p>
<p>Options for the <code>install</code> command are also valid here.</p> <p>Options for the <code>install</code> command are also valid here.</p>

4
share/man/man1/brew.1
View File

@ -538,11 +538,11 @@ Unpin \fIformulae\fR, allowing them to be upgraded by \fBbrew upgrade\fR\. See a
Remove a tapped repository\. Remove a tapped repository\.
. .
.TP .TP
\fBupdate\fR [\fB\-\-rebase\fR] \fBupdate\fR [\fB\-\-merge\fR]
Fetch the newest version of Homebrew and all formulae from GitHub using \fBgit\fR(1)\. Fetch the newest version of Homebrew and all formulae from GitHub using \fBgit\fR(1)\.
. .
.IP .IP
If \fB\-\-rebase\fR is specified then \fBgit pull \-\-rebase\fR is used\. If \fB\-\-merge\fR is specified then \fBgit merge\fR is used to include updates (rather than \fBgit rebase\fR)\.
. .
.TP .TP
\fBupgrade\fR [\fIinstall\-options\fR] [\fB\-\-cleanup\fR] [\fIformulae\fR] \fBupgrade\fR [\fIinstall\-options\fR] [\fB\-\-cleanup\fR] [\fIformulae\fR]