5 # SPDX-License-Identifier: BSD-2-Clause-FreeBSD
7 # Copyright (c) 2018 M. Warner Losh
9 # Redistribution and use in source and binary forms, with or without
10 # modification, are permitted provided that the following conditions
12 # 1. Redistributions of source code must retain the above copyright
13 # notice, this list of conditions and the following disclaimer.
14 # 2. Redistributions in binary form must reproduce the above copyright
15 # notice, this list of conditions and the following disclaimer in the
16 # documentation and/or other materials provided with the distribution.
18 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
19 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21 # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
22 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
24 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 # simple script to keep all my branches up to date while tracking
32 # FreeBSD (or any upstream svn source) with git. Run it often, and it
33 # will rebase all the branches so they don't get too stale.
34 # Takes no args, and acts goofy if you have really old branches
35 # which is why stable/* and mfc* are excluded. Caution to should be taken
40 echo ----------------- Checkout master for svn rebase ------------
42 echo ----------------- Rebasing our master to svn upstream ------------
44 for i in $(git branch --no-merge | grep -v stable/ | grep -v mfc); do
45 echo ----------------- Rebasing $i to the tip of master ------------
46 git rebase master $i || {
47 echo "****************** REBASE OF $i FAILED, ABORTING *****************"
52 echo ----------------- Checkout out master again ------------
55 if [ -n "$FAIL" ]; then
56 echo Failed branches: $FAIL