Replace 'git-foo' with 'git foo' as the former is now deprecated
This commit is contained in:
		
							parent
							
								
									35217ff47d
								
							
						
					
					
						commit
						ce5a97fd2e
					
				
							
								
								
									
										4
									
								
								README
								
								
								
								
							
							
						
						
									
										4
									
								
								README
								
								
								
								
							| 
						 | 
				
			
			@ -32,7 +32,7 @@ user-editable variables live. Variables are generally only set here if
 | 
			
		|||
they are not exported in the environment; this allows variables to be
 | 
			
		||||
overridden in a wrapper script, with the defaults specified.
 | 
			
		||||
 | 
			
		||||
This might be a good point to run `git-init-db', if you intend to use
 | 
			
		||||
This might be a good point to run `git init-db', if you intend to use
 | 
			
		||||
the git SCM system.
 | 
			
		||||
 | 
			
		||||
Instantiating Modules
 | 
			
		||||
| 
						 | 
				
			
			@ -121,7 +121,7 @@ order. The following commands may be used:
 | 
			
		|||
 | 
			
		||||
  push					(git only)
 | 
			
		||||
    If this is a git repository, does a `git push' as well as a
 | 
			
		||||
    `git-push --tags'. This is a good way to ensure that any tags you
 | 
			
		||||
    `git push --tags'. This is a good way to ensure that any tags you
 | 
			
		||||
    create are pushed to a central repository (this normally needs to be
 | 
			
		||||
    done separately).
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -36,7 +36,7 @@ PKGNAME="$(basename ${REPOS})-${VER}"
 | 
			
		|||
echo "Cloning repository..."
 | 
			
		||||
do_cmd cd "${DIR}" || exit 1
 | 
			
		||||
do_cmd rm -rf "${PKGNAME}" "${PKGNAME}-doc" || exit 1
 | 
			
		||||
do_cmd git-clone --local --shared -n "${REPOS}" "${PKGNAME}" || exit 1
 | 
			
		||||
do_cmd git clone --local --shared -n "${REPOS}" "${PKGNAME}" || exit 1
 | 
			
		||||
do_cmd cd "${PKGNAME}" || exit 1
 | 
			
		||||
print_success "Done"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -44,7 +44,7 @@ print_success "Done"
 | 
			
		|||
 | 
			
		||||
# Check out a new copy of the library from git
 | 
			
		||||
echo "Checking out tag ${VER}..."
 | 
			
		||||
do_cmd git-checkout -b releaseprivate "${VER}" || exit 1
 | 
			
		||||
do_cmd git checkout -b releaseprivate "${VER}" || exit 1
 | 
			
		||||
print_success "Done"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -19,7 +19,7 @@ then
 | 
			
		|||
    echo "  libmajor LIB  - as major but for soversion"
 | 
			
		||||
    echo "  libmicro LIB  - as micro but for soversion"
 | 
			
		||||
    echo "  tag           - tag version"
 | 
			
		||||
    echo "  push          - do a git-push with --tags"
 | 
			
		||||
    echo "  push          - do a git push with --tags"
 | 
			
		||||
 | 
			
		||||
    exit 1
 | 
			
		||||
fi
 | 
			
		||||
| 
						 | 
				
			
			@ -39,7 +39,7 @@ edit_versions() {
 | 
			
		|||
        SEDCMD="${SEDCMD} -e s,^${var}=.*$,${var}=${value},"
 | 
			
		||||
    done
 | 
			
		||||
    sed ${SEDCMD} -i "${file}"
 | 
			
		||||
    git-commit -m "Bump version" "${file}"
 | 
			
		||||
    git commit -m "Bump version" "${file}"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bump_major() {
 | 
			
		||||
| 
						 | 
				
			
			@ -69,12 +69,12 @@ bump_somicro() {
 | 
			
		|||
 | 
			
		||||
do_tag() {
 | 
			
		||||
    source version
 | 
			
		||||
    git-tag "${VERMAJOR}.${VERMINOR}.${VERMICRO}"
 | 
			
		||||
    git tag "${VERMAJOR}.${VERMINOR}.${VERMICRO}"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
do_push() {
 | 
			
		||||
    git-push
 | 
			
		||||
    git-push --tags
 | 
			
		||||
    git push
 | 
			
		||||
    git push --tags
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
set -ex
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue