File: pull.sh

package info (click to toggle)
acl2 8.6%2Bdfsg-2
  • links: PTS
  • area: main
  • in suites: trixie
  • size: 1,111,420 kB
  • sloc: lisp: 17,818,294; java: 125,359; python: 28,122; javascript: 23,458; cpp: 18,851; ansic: 11,569; perl: 7,678; xml: 5,591; sh: 3,976; makefile: 3,833; ruby: 2,633; yacc: 1,126; ml: 763; awk: 295; csh: 233; lex: 197; php: 178; tcl: 49; asm: 23; haskell: 17
file content (28 lines) | stat: -rwxr-xr-x 684 bytes parent folder | download | duplicates (3) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
 
#!/bin/sh

# Matt Kaufmann will use this script to pull from the remote "acl2"
# repository only after a check is done that others have committed
# only under books/.

if [ `basename $PWD` = devel ] ; then \
    echo "ERROR: Must not be in a devel directory." ; \
    exit 1 ; \
fi

# The following does a "git fetch --all", as necessary in order to
# prepare for the "git merge" below.
echo "-----"
echo "Executing `dirname $0`/purity.sh"
echo "-----"
`dirname $0`/purity.sh

if [ $? -ne 0 ] ; then \
    echo 'ERROR: Not executing git merge command.' ; \
    exit 1 ; \
fi

echo "-----"
echo "Executing git merge remotes/origin/master"
echo "-----"
git merge remotes/origin/master