yogsototh/gitflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
133 commits 1 branch 4 tags 258 KiB
Commit graph

133 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Driessen
3c337fb5e4 Added -v (--verbose) flags to list subaction of all subcommands. 2010-02-04 11:30:18 +01:00
Vincent Driessen
c7ea9b2236 Fix: add init to Makefile. 2010-02-04 10:22:13 +01:00
Vincent Driessen
5455a6f9b1 Allow creation of feature branches even for dirty working trees (using flag -f, --force). 2010-02-03 00:14:05 +01:00
Vincent Driessen
4417492346 Fix: Of course, in sh, true=0 and false=1. In order to never mess this up 
again, the convenience functions flag() and noflag() have been used and
all occurrences of 0 and 1 are replaces by true and false. This makes it
safe (and more readable!) to test for active/inactive flags.

Also specify $FLAGS_PARENT explicitly, to avoid having the generated usage
texts by shFlags mention the full Unix path to $0, but instead use the
more recognizable varient 'git flow feature'.
 2010-02-02 23:57:31 +01:00
Vincent Driessen
1db658f5de Merge branch 'feature/fix-installer' into develop 2010-02-02 22:51:35 +01:00
Vincent Driessen
c3b7db9d2a Added a nicer way of installing/uninstalling git-flow. 
Now also installs the shFlags.sh script. (The license lines are included in its header.)
 2010-02-02 22:50:13 +01:00
Vincent Driessen
eec73c6777 Only push to the origin repo if we wanted to fetch, too. 2010-02-02 16:14:16 +01:00
Stefan Naewe
c3948cf8bd use correct name of shFlags 
Signed-off-by: Stefan Naewe <stefan.naewe@atlas-elektronik.com>
 2010-02-02 13:11:57 +01:00
Vincent Driessen
d33e5ea81f Merge branch 'feature/rebase-subcommand' into develop 2010-02-02 12:00:00 +01:00
Vincent Driessen
95bf82c2ab Add support for the -r (--rebase) option, before doing the actual merge. 2010-02-02 11:58:37 +01:00
Vincent Driessen
9cf5673475 Fix: do integer comparison, not string comparison. wc returns stuff like ' 13', which is perfectly equal to 13. 2010-02-02 11:57:51 +01:00
Vincent Driessen
c62633fbe4 Added initial implementation of the rebase [-i] subcommand. 2010-02-02 10:48:50 +01:00
Vincent Driessen
4c92a9d339 Add 'fatal' prefix for messages, like Git does itself. 2010-02-02 09:42:51 +01:00
Vincent Driessen
e168487d5c Fix: quote arg to typeset 2010-02-02 06:33:53 +01:00
Vincent Driessen
aaec7b3b72 Merge branch 'feature/allow-diff-without-name-arg' into develop 2010-02-02 06:30:56 +01:00
Vincent Driessen
11b1f41a36 Allow for optional <name> argument in feature diffs. (No name uses the "current" feature branch.) 2010-02-02 06:29:51 +01:00
Vincent Driessen
b03cf963fc Update options for feature's subcommands in usage. 2010-02-01 22:00:39 +01:00
Vincent Driessen
115609241f Fix: bug that caused BRANCH variable not to be set correctly. 2010-02-01 21:58:37 +01:00
Vincent Driessen
aa6d016ce6 Implement showing the currently checked out feature branch in feature list 
overview, very Gitish.
 2010-02-01 19:43:46 +01:00
Vincent Driessen
e9d2d04e00 Add TODO item for adding installation of shFlags, too. 
Simplify the default "make" message.
 2010-02-01 16:03:07 +01:00
Vincent Driessen
0a5c7307df Merge branch 'feature/verbose-feature-list' into develop 2010-02-01 15:58:32 +01:00
Vincent Driessen
1adbc3e9ca Dynamically calculate maximal column width used in verbose feature list output. 2010-02-01 15:57:54 +01:00
Vincent Driessen
f2536f4c68 Add initial implementation of the --verbose flag algorithm. 
Conflicts:

	git-flow-feature
 2010-02-01 15:57:48 +01:00
Vincent Driessen
60d3d62fb1 Merge branch 'feature/getopt' into develop 2010-02-01 15:55:21 +01:00
Vincent Driessen
1b8192362e Use shFlags to parse flags given to main and subcommands. 
Implement the flags for each of the 'feature' subcommands.
 2010-02-01 15:55:18 +01:00
Vincent Driessen
ea58d0f1de Added initial implementation of using shFlags. 2010-01-30 20:51:03 +01:00
Vincent Driessen
42600d9b43 Include shFlags repo as a Git submodule. 
shFlags is a library written to greatly simplify the handling of
command-line flags in Bourne based Unix shell scripts (bash, dash, ksh,
sh, zsh) on many Unix OSes (Linux, Solaris, Mac OS X, etc.).

Most shell scripts use getopt for flags processing, but the different
versions of getopt on various OSes make writing portable shell scripts
difficult.  shFlags instead provides an API that doesn't change across
shell and OS versions so the script writer can be confident that the
script will work.

(Taken from http://code.google.com/p/shflags/)
 2010-01-30 20:44:19 +01:00
Vincent Driessen
d3bc76028a Merge branch 'feature/allow-prefixes-as-name-arg-on-finish' into develop 2010-01-29 17:37:11 +01:00
Vincent Driessen
7ae320bfc5 Fix one old occurence of gitflow_check_ -> gitflow_require_ 2010-01-29 17:36:57 +01:00
Vincent Driessen
1ee37e7231 Fix one old occurence of gitflow_check_ -> gitflow_require_ 2010-01-29 17:36:21 +01:00
Vincent Driessen
ea608951a4 Document which subcommands may use the prefix. 2010-01-29 17:00:37 +01:00
Vincent Driessen
8392ed32a3 Doesn't make sense to allow prefix names for commands that require $BRANCH to be absent. 2010-01-29 16:55:38 +01:00
Vincent Driessen
22ef21a136 Further divide the parse_args function up, to support automatic prefix expansion for all subcommands, except for 'feature start' 2010-01-29 16:52:17 +01:00
Vincent Driessen
2e1856b7fd Implement the basic logic to resolve name prefixes passed to 'flow feature' into their full feature branch names, if unambiguous. 2010-01-29 16:46:33 +01:00
Vincent Driessen
a0fe939a6c Merge branch 'feature/merge-conflict-support' into develop 2010-01-29 12:42:40 +01:00
Vincent Driessen
f6f152fff8 Support scenarios where the user might have cancelled a merge in the middle of a merge conflict. 2010-01-29 12:41:25 +01:00
Vincent Driessen
62345d54f3 Created a second function called gitflow_test_clean_working_tree() that returns error codes instead of dies. 
Rewrote gitflow_require_clean_working_tree() in terms of that.
 2010-01-29 12:41:04 +01:00
Vincent Driessen
49c7d029ec Initial implementation of merge conflict resolution support. 2010-01-29 12:41:04 +01:00
Vincent Driessen
58995b5b86 Include a globally available variable GIT_DIR, that points to the .git directory. 
Add a function that tests whether a specific commit is already merged into the given target branch.
 2010-01-29 12:40:08 +01:00
Vincent Driessen
17a8112b91 Merge branch 'feature/no-connectivity-for-feature-branches' into develop 2010-01-29 12:39:05 +01:00
Vincent Driessen
2acfffd96a Make the 'to fetch or not to fetch' flag explicit in the other commands, too. 
Only difference is that the default equals to:
0	for git-flow-feature
1	for git-flow-{release,hotfix,support}
 2010-01-29 12:37:22 +01:00
Vincent Driessen
57e7bde9b8 Fix: respect the VERSION_PREFIX in hotfix releases, too. 2010-01-29 12:36:23 +01:00
Vincent Driessen
ab3dc49b8a Fix: respect the VERSION_PREFIX in hotfix releases, too. 2010-01-29 12:35:49 +01:00
Vincent Driessen
e034e4a279 Only have network connectivity when explicitly asked for feature branches. This action is so common that it should be quick (very git-ish). 
For hotfix and release branches, forgetting to update would be an unsafe thing to do, so we leave the fetch in there by default.
 2010-01-29 12:10:44 +01:00
Vincent Driessen
48386441c8 Replace gitflow_check_ prefixes by gitflow_require_ prefixes, for consistency. 2010-01-29 10:30:40 +01:00
Vincent Driessen
278884b573 Fix 'feature diff' 2010-01-28 16:29:34 +01:00
Vincent Driessen
92b125cfba Remove pointless check for existence of function setup() 2010-01-28 10:56:54 +01:00
Vincent Driessen
46e9c86aff Merge branch 'feature/subcmd-structure' into develop 
Conflicts:
	git-flow-feature
	git-flow-hotfix
	git-flow-release
	git-flow-support
 2010-01-28 01:19:56 +01:00
Vincent Driessen
04839aeffa Forgot list command for hotfixes. 2010-01-28 01:14:35 +01:00
Vincent Driessen
05caf02aa2 Remove double entry from README. 2010-01-28 01:14:35 +01:00