File: pull.sh

package info (click to toggle)
acl2 8.3dfsg-2
  • links: PTS
  • area: main
  • in suites: bullseye
  • size: 309,408 kB
  • sloc: lisp: 3,311,842; javascript: 22,569; cpp: 9,029; ansic: 7,872; perl: 6,501; xml: 3,838; java: 3,738; makefile: 3,383; ruby: 2,633; sh: 2,489; ml: 763; python: 741; yacc: 721; awk: 260; csh: 186; php: 171; lex: 154; tcl: 49; asm: 23; haskell: 17
file content (27 lines) | stat: -rwxr-xr-x 683 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
#!/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