Skip to content

G
gitflow
Commit 36cbdffe authored by cmosh's avatar cmosh
Browse files
Options

Merge branch 'release/0.4.8' 

- Minor bugfixes
parents 399c8a3b 7e1c9eca
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 237 deletions
.gitignore
View file @ 36cbdffe
node_modules/* node_modules/*
\ No newline at end of file npm-debug.log
npm-debug.log*
\ No newline at end of file
contrib/gitflow-installer.sh
View file @ 36cbdffe
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
# git-flow make-less installer for *nix systems, by Rick Osborne # git-flow make-less installer for *nix systems, by Rick Osborne
# Based on the git-flow core Makefile: # Based on the git-flow core Makefile:
# http://github.com/petervanderdoes/gitflow-avh/blob/master/Makefile # http://github.com/dreidev/gitflow/blob/master/Makefile
# Licensed under the same restrictions as git-flow: # Licensed under the same restrictions as git-flow:
# http://github.com/petervanderdoes/gitflow-avh/blob/develop/LICENSE # http://github.com/dreidev/gitflow/blob/develop/LICENSE
# Updated for the fork at petervanderdoes # Updated for the fork at petervanderdoes
......
git-flow-feature
View file @ 36cbdffe
...@@ -996,7 +996,7 @@ h,help! Show this help ...@@ -996,7 +996,7 @@ h,help! Show this help
" "
parse_args "$@" parse_args "$@"
require_name_arg gitflow_require_name_arg
# sanity checks # sanity checks
require_branch "$BRANCH" require_branch "$BRANCH"
......
git-flow-version
View file @ 36cbdffe
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# #
GITFLOW_VERSION=0.4.7 GITFLOW_VERSION=0.4.8
initialize() { initialize() {
# A function can not be empty. Comments count as empty. # A function can not be empty. Comments count as empty.
......
gitflow-installer.sh deleted 100644 → 0
View file @ 399c8a3b
#!/bin/bash
# git-flow make-less installer for *nix systems, by Rick Osborne
# Based on the git-flow core Makefile:
# http://github.com/nvie/gitflow/blob/master/Makefile
# Licensed under the same restrictions as git-flow:
# http://github.com/nvie/gitflow/blob/develop/LICENSE
# Does this need to be smarter for each host OS?
if [ -z "$INSTALL_PREFIX" ] ; then
INSTALL_PREFIX="/usr/local/bin"
fi
if [ -z "$REPO_NAME" ] ; then
REPO_NAME="gitflow"
fi
if [ -z "$REPO_HOME" ] ; then
REPO_HOME="http://github.com/nvie/gitflow.git"
fi
EXEC_FILES="git-flow"
SCRIPT_FILES="git-flow-init git-flow-feature git-flow-hotfix git-flow-release git-flow-support git-flow-version gitflow-common gitflow-shFlags"
SUBMODULE_FILE="gitflow-shFlags"
echo "### gitflow no-make installer ###"
case "$1" in
uninstall)
echo "Uninstalling git-flow from $INSTALL_PREFIX"
if [ -d "$INSTALL_PREFIX" ] ; then
for script_file in $SCRIPT_FILES $EXEC_FILES ; do
echo "rm -vf $INSTALL_PREFIX/$script_file"
rm -vf "$INSTALL_PREFIX/$script_file"
done
else
echo "The '$INSTALL_PREFIX' directory was not found."
echo "Do you need to set INSTALL_PREFIX ?"
fi
exit
;;
help)
echo "Usage: [environment] gitflow-installer.sh [install|uninstall]"
echo "Environment:"
echo " INSTALL_PREFIX=$INSTALL_PREFIX"
echo " REPO_HOME=$REPO_HOME"
echo " REPO_NAME=$REPO_NAME"
exit
;;
*)
echo "Installing git-flow to $INSTALL_PREFIX"
if [ -d "$REPO_NAME" -a -d "$REPO_NAME/.git" ] ; then
echo "Using existing repo: $REPO_NAME"
else
echo "Cloning repo from GitHub to $REPO_NAME"
git clone "$REPO_HOME" "$REPO_NAME"
fi
if [ -f "$REPO_NAME/$SUBMODULE_FILE" ] ; then
echo "Submodules look up to date"
else
echo "Updating submodules"
lastcwd=$PWD
cd "$REPO_NAME"
git submodule init
git submodule update
cd "$lastcwd"
fi
install -v -d -m 0755 "$INSTALL_PREFIX"
for exec_file in $EXEC_FILES ; do
install -v -m 0755 "$REPO_NAME/$exec_file" "$INSTALL_PREFIX"
done
for script_file in $SCRIPT_FILES ; do
install -v -m 0644 "$REPO_NAME/$script_file" "$INSTALL_PREFIX"
done
exit
;;
esac
npm-debug.log deleted 100644 → 0
View file @ 399c8a3b
0 info it worked if it ends with ok
1 verbose cli [ '/home/clive/.nvm/versions/node/v6.6.0/bin/node',
1 verbose cli '/home/clive/.nvm/versions/node/v6.6.0/bin/npm',
1 verbose cli 'link' ]
2 info using npm@3.10.3
3 info using node@v6.6.0
4 verbose linkPkg /mnt/c/Users/clive/Code/dreidev/gitflow
5 silly gentlyRm /home/clive/.nvm/versions/node/v6.6.0/lib/node_modules/gitflow is being purged
6 verbose gentlyRm don't care about contents; nuking /home/clive/.nvm/versions/node/v6.6.0/lib/node_modules/gitflow
7 silly vacuum-fs purging /home/clive/.nvm/versions/node/v6.6.0/lib/node_modules/gitflow
8 silly vacuum-fs quitting because other entries in /home/clive/.nvm/versions/node/v6.6.0/lib/node_modules
9 verbose link build target /home/clive/.nvm/versions/node/v6.6.0/lib/node_modules/gitflow
10 silly loadCurrentTree Starting
11 silly install loadCurrentTree
12 silly install readLocalPackageData
13 silly install normalizeTree
14 silly loadCurrentTree Finishing
15 silly loadIdealTree Starting
16 silly install loadIdealTree
17 silly cloneCurrentTree Starting
18 silly install cloneCurrentTreeToIdealTree
19 silly cloneCurrentTree Finishing
20 silly loadShrinkwrap Starting
21 silly install loadShrinkwrap
22 silly loadShrinkwrap Finishing
23 silly loadAllDepsIntoIdealTree Starting
24 silly install loadAllDepsIntoIdealTree
25 silly loadAllDepsIntoIdealTree Finishing
26 silly loadIdealTree Finishing
27 silly currentTree gitflow@0.4.7
27 silly currentTree ├── balanced-match@0.4.2
27 silly currentTree ├── brace-expansion@1.1.6
27 silly currentTree ├── commander@2.9.0
27 silly currentTree ├── concat-map@0.0.1
27 silly currentTree ├── fs.realpath@1.0.0
27 silly currentTree ├── glob@7.1.1
27 silly currentTree ├── graceful-readlink@1.0.1
27 silly currentTree ├── inflight@1.0.6
27 silly currentTree ├── inherits@2.0.3
27 silly currentTree ├── interpret@1.0.1
27 silly currentTree ├── minimatch@3.0.3
27 silly currentTree ├── once@1.4.0
27 silly currentTree ├── path-is-absolute@1.0.1
27 silly currentTree ├── rechoir@0.6.2
27 silly currentTree ├── resolve@1.2.0
27 silly currentTree ├── shelljs@0.7.6
27 silly currentTree └── wrappy@1.0.2
28 silly idealTree gitflow@0.4.7
28 silly idealTree ├── balanced-match@0.4.2
28 silly idealTree ├── brace-expansion@1.1.6
28 silly idealTree ├── commander@2.9.0
28 silly idealTree ├── concat-map@0.0.1
28 silly idealTree ├── fs.realpath@1.0.0
28 silly idealTree ├── glob@7.1.1
28 silly idealTree ├── graceful-readlink@1.0.1
28 silly idealTree ├── inflight@1.0.6
28 silly idealTree ├── inherits@2.0.3
28 silly idealTree ├── interpret@1.0.1
28 silly idealTree ├── minimatch@3.0.3
28 silly idealTree ├── once@1.4.0
28 silly idealTree ├── path-is-absolute@1.0.1
28 silly idealTree ├── rechoir@0.6.2
28 silly idealTree ├── resolve@1.2.0
28 silly idealTree ├── shelljs@0.7.6
28 silly idealTree └── wrappy@1.0.2
29 silly generateActionsToTake Starting
30 silly install generateActionsToTake
31 silly generateActionsToTake Finishing
32 silly diffTrees action count 0
33 silly decomposeActions action count 0
34 silly executeActions Starting
35 silly install executeActions
36 silly doSerial global-install 0
37 silly doParallel fetch 0
38 verbose correctMkdir /home/clive/.npm/_locks correctMkdir not in flight; initializing
39 verbose lock using /home/clive/.npm/_locks/staging-1ced2b31bd2e26fd.lock for /mnt/c/Users/clive/Code/dreidev/gitflow/node_modules/.staging
40 silly doParallel extract 0
41 silly doParallel preinstall 0
42 silly doReverseSerial remove 0
43 silly doSerial move 0
44 silly doSerial finalize 0
45 silly doSerial build 0
46 silly doSerial global-link 0
47 silly doParallel update-linked 0
48 silly doSerial install 0
49 silly doSerial postinstall 0
50 verbose unlock done using /home/clive/.npm/_locks/staging-1ced2b31bd2e26fd.lock for /mnt/c/Users/clive/Code/dreidev/gitflow/node_modules/.staging
51 silly executeActions Finishing
52 silly rollbackFailedOptional Starting
53 silly rollbackFailedOptional Finishing
54 silly runTopLevelLifecycles Starting
55 silly install runTopLevelLifecycles
56 silly preinstall gitflow@0.4.7 /mnt/c/Users/clive/Code/dreidev/gitflow/gitflow-c45d7dad
57 info lifecycle gitflow@0.4.7~preinstall: gitflow@0.4.7
58 silly lifecycle gitflow@0.4.7~preinstall: no script for preinstall, continuing
59 silly build gitflow@0.4.7
60 info linkStuff gitflow@0.4.7
61 silly linkStuff gitflow@0.4.7 has /mnt/c/Users/clive/Code/dreidev as its parent node_modules
62 verbose linkBins gitflow@0.4.7
63 verbose linkMans gitflow@0.4.7
64 silly install gitflow@0.4.7 /mnt/c/Users/clive/Code/dreidev/gitflow/gitflow-c45d7dad
65 info lifecycle gitflow@0.4.7~install: gitflow@0.4.7
66 silly lifecycle gitflow@0.4.7~install: no script for install, continuing
67 silly postinstall gitflow@0.4.7 /mnt/c/Users/clive/Code/dreidev/gitflow/gitflow-c45d7dad
68 info lifecycle gitflow@0.4.7~postinstall: gitflow@0.4.7
69 verbose lifecycle gitflow@0.4.7~postinstall: unsafe-perm in lifecycle true
70 verbose lifecycle gitflow@0.4.7~postinstall: PATH: /home/clive/.nvm/versions/node/v6.6.0/lib/node_modules/npm/bin/node-gyp-bin:/mnt/c/Users/clive/Code/dreidev/gitflow/node_modules/.bin:/home/clive/.nvm/versions/node/v6.6.0/bin:/home/clive/.nvm/versions/node/v6.6.0/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/opt/go_appengine
71 verbose lifecycle gitflow@0.4.7~postinstall: CWD: /mnt/c/Users/clive/Code/dreidev/gitflow
72 silly lifecycle gitflow@0.4.7~postinstall: Args: [ '-c',
72 silly lifecycle 'curl https://raw.githubusercontent.com/dreidev/gitflow/develop/contrib/gitflow-installer.sh > gitflow-installer.sh; chmod a+x gitflow-installer.sh; sudo bash gitflow-installer.sh install stable' ]
73 silly lifecycle gitflow@0.4.7~postinstall: Returned: code: 2 signal: null
74 info lifecycle gitflow@0.4.7~postinstall: Failed to exec postinstall script
75 verbose stack Error: gitflow@0.4.7 postinstall: `curl https://raw.githubusercontent.com/dreidev/gitflow/develop/contrib/gitflow-installer.sh > gitflow-installer.sh; chmod a+x gitflow-installer.sh; sudo bash gitflow-installer.sh install stable`
75 verbose stack Exit status 2
75 verbose stack at EventEmitter.<anonymous> (/home/clive/.nvm/versions/node/v6.6.0/lib/node_modules/npm/lib/utils/lifecycle.js:242:16)
75 verbose stack at emitTwo (events.js:106:13)
75 verbose stack at EventEmitter.emit (events.js:191:7)
75 verbose stack at ChildProcess.<anonymous> (/home/clive/.nvm/versions/node/v6.6.0/lib/node_modules/npm/lib/utils/spawn.js:40:14)
75 verbose stack at emitTwo (events.js:106:13)
75 verbose stack at ChildProcess.emit (events.js:191:7)
75 verbose stack at maybeClose (internal/child_process.js:877:16)
75 verbose stack at Process.ChildProcess._handle.onexit (internal/child_process.js:226:5)
76 verbose pkgid gitflow@0.4.7
77 verbose cwd /mnt/c/Users/clive/Code/dreidev/gitflow
78 error Linux 3.4.0+
79 error argv "/home/clive/.nvm/versions/node/v6.6.0/bin/node" "/home/clive/.nvm/versions/node/v6.6.0/bin/npm" "link"
80 error node v6.6.0
81 error npm v3.10.3
82 error code ELIFECYCLE
83 error gitflow@0.4.7 postinstall: `curl https://raw.githubusercontent.com/dreidev/gitflow/develop/contrib/gitflow-installer.sh > gitflow-installer.sh; chmod a+x gitflow-installer.sh; sudo bash gitflow-installer.sh install stable`
83 error Exit status 2
84 error Failed at the gitflow@0.4.7 postinstall script 'curl https://raw.githubusercontent.com/dreidev/gitflow/develop/contrib/gitflow-installer.sh > gitflow-installer.sh; chmod a+x gitflow-installer.sh; sudo bash gitflow-installer.sh install stable'.
84 error Make sure you have the latest version of node.js and npm installed.
84 error If you do, this is most likely a problem with the gitflow package,
84 error not with npm itself.
84 error Tell the author that this fails on your system:
84 error curl https://raw.githubusercontent.com/dreidev/gitflow/develop/contrib/gitflow-installer.sh > gitflow-installer.sh; chmod a+x gitflow-installer.sh; sudo bash gitflow-installer.sh install stable
84 error You can get information on how to open an issue for this project with:
84 error npm bugs gitflow
84 error Or if that isn't available, you can get their info via:
84 error npm owner ls gitflow
84 error There is likely additional logging output above.
85 verbose exit [ 1, true ]
package.json
View file @ 36cbdffe
{ {
"name": "gitflow", "name": "gitflow",
"version": "0.4.7", "version": "0.4.8",
"description": "Modified gitflow for dreidev", "description": "Modified gitflow for dreidev",
"main": "src/index.js", "main": "src/index.js",
"scripts": { "scripts": {
"postuninstall": "sudo make uninstall", "postinstall": "curl https://raw.githubusercontent.com/dreidev/gitflow/develop/contrib/gitflow-installer.sh > gitflow-installer.sh; chmod a+x gitflow-installer.sh; sudo bash gitflow-installer.sh install stable",
"postinstall": "curl https://raw.githubusercontent.com/dreidev/gitflow/develop/contrib/gitflow-installer.sh > gitflow-installer.sh; chmod a+x gitflow-installer.sh; sudo bash gitflow-installer.sh install stable" "postuninstall": "curl https://raw.githubusercontent.com/dreidev/gitflow/develop/contrib/gitflow-installer.sh > gitflow-installer.sh; chmod a+x gitflow-installer.sh; sudo bash gitflow-installer.sh uninstall"
}, },
"files": [ "files": [
"src/" "src/"
......
src/flow.js
View file @ 36cbdffe
...@@ -5,12 +5,12 @@ const version = require('../package.json').version; ...@@ -5,12 +5,12 @@ const version = require('../package.json').version;
program program
.version(version) .version(version)
.command('bugfix [options...]','Command wrapper for git flow bugfix').alias('b') .command('bugfix [options]','Command wrapper for git flow bugfix').alias('b')
.command('config [options...]','Command wrapper for git flow config').alias('c') .command('config [options]','Command wrapper for git flow config').alias('c')
.command('feature [options...]','Command wrapper for git flow feature',{isDefault: true}).alias('fwf') .command('feature [options]','Command wrapper for git flow feature',{isDefault: true}).alias('fwf')
.command('hotfix [options...]','Command wrapper for git flow hotfix').alias('h') .command('hotfix [options]','Command wrapper for git flow hotfix').alias('h')
.command('init [options...]','Command wrapper for git flow init').alias('i') .command('init [options]','Command wrapper for git flow init').alias('i')
.command('log [options...]','Command wrapper for git flow log').alias('l') .command('log [options]','Command wrapper for git flow log').alias('l')
.command('release [options...]','Command wrapper for git release').alias('r') .command('release [options]','Command wrapper for git release').alias('r')
.command('support [options...]','Command wrapper for git support').alias('s') .command('support [options]','Command wrapper for git support').alias('s')
.parse(process.argv); .parse(process.argv);
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment