Changeset 0572abcf for scripts


Ignore:
Timestamp:
Dec 24, 2009, 10:36:20 PM (11 years ago)
Author:
Nelson Elhage <nelhage@mit.edu>
Branches:
master, release-1.6, release-1.7, release-1.8, release-1.9
Children:
ac374fc
Parents:
d771d1b (diff), 9f026c1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:
Merge branch 'release-1.5'
File:
1 edited

Legend:

Unmodified
Added
Removed
  • scripts/do-release

    r01846ce rd771d1b  
    3131if [ ! "$force" ] && [ "$VERS" != "$(head -1 ChangeLog)" ]; then
    3232    die "No ChangeLog entry for version $VERS, aborting."
     33fi
     34
     35head=$(git symbolic-ref HEAD)
     36head=${head#refs/heads/}
     37
     38git rev-parse --verify -q $head >/dev/null 2>&1
     39git rev-parse --verify -q origin/$head >/dev/null 2>&1
     40if [ -n "$(git rev-list $head..origin/$head)" ]; then
     41    die "$head is not up to date. Aborting."
    3342fi
    3443
Note: See TracChangeset for help on using the changeset viewer.