Skip to content

Commit 48596d7

Browse files
authored
Merge pull request #62 from ChrisJStone/develop
* docs: update copyright information in source files * docs: update repository url in source files * feat(init): add sign flag to create signed commit The -g, --sign flag will create a gpg-signed commit when creating the production branch in a new git repository. This will allow for the option to use the Require Signed Commits branch protection rule on GitHub. closes #59
2 parents 1d1cd23 + b5db30e commit 48596d7

11 files changed

+31
-13
lines changed

git-flow

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
# http://blog.avirtualhome.com/development-workflow-using-git/
88
#
99
# Feel free to contribute to this project at:
10-
# http://github.com/petervanderdoes/gitflow
10+
# http://github.com/CJ-Systems/gitflow-cjs
1111
#
1212
# Authors:
13+
# Copyright 2003 CJ Systems. All rights reserved.
1314
# Copyright 2012-2019 Peter van der Does. All rights reserved.
1415
#
1516
# Original Author:

git-flow-bugfix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
# http://blog.avirtualhome.com/development-workflow-using-git/
99
#
1010
# Feel free to contribute to this project at:
11-
# http://github.com/petervanderdoes/gitflow
11+
# http://github.com/CJ-Systems/gitflow-cjs
1212
#
1313
# Authors:
14+
# Copyright 2003 CJ Systems. All rights reserved.
1415
# Copyright 2012-2019 Peter van der Does. All rights reserved.
1516
#
1617
# Original Author:

git-flow-config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
# http://blog.avirtualhome.com/development-workflow-using-git/
99
#
1010
# Feel free to contribute to this project at:
11-
# http://github.com/petervanderdoes/gitflow
11+
# http://github.com/CJ-Systems/gitflow-cjs
1212
#
1313
# Authors:
14+
# Copyright 2003 CJ Systems. All rights reserved.
1415
# Copyright 2012-2019 Peter van der Does. All rights reserved.
1516
#
1617
#

git-flow-feature

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
# http://blog.avirtualhome.com/development-workflow-using-git/
99
#
1010
# Feel free to contribute to this project at:
11-
# http://github.com/petervanderdoes/gitflow
11+
# http://github.com/CJ-Systems/gitflow-cjs
1212
#
1313
# Authors:
14+
# Copyright 2003 CJ Systems. All rights reserved.
1415
# Copyright 2012-2019 Peter van der Does. All rights reserved.
1516
#
1617
# Original Author:

git-flow-hotfix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
# http://blog.avirtualhome.com/development-workflow-using-git/
99
#
1010
# Feel free to contribute to this project at:
11-
# http://github.com/petervanderdoes/gitflow
11+
# http://github.com/CJ-Systems/gitflow-cjs
1212
#
1313
# Authors:
14+
# Copyright 2003 CJ Systems. All rights reserved.
1415
# Copyright 2012-2019 Peter van der Does. All rights reserved.
1516
#
1617
# Original Author:

git-flow-init

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
# http://blog.avirtualhome.com/development-workflow-using-git/
99
#
1010
# Feel free to contribute to this project at:
11-
# http://github.com/petervanderdoes/gitflow
11+
# http://github.com/CJ-Systems/gitflow-cjs
1212
#
1313
# Authors:
14+
# Copyright 2003 CJ Systems. All rights reserved.
1415
# Copyright 2012-2019 Peter van der Does. All rights reserved.
1516
#
1617
# Original Author:
@@ -66,6 +67,7 @@ h,help! Show this help
6667
showcommands! Show git commands while executing them
6768
d,[no]defaults Use default branch naming conventions
6869
f,[no]force Force setting of gitflow branches, even if already configured
70+
g,[no]sign Sign initial commit when creating a repository
6971
7072
p,feature! Feature branches
7173
b,bugfix! Bugfix branches
@@ -89,6 +91,7 @@ file= use given config file
8991
DEFINE_boolean 'local' false 'use repository config file'
9092
DEFINE_boolean 'global' false 'use global config file'
9193
DEFINE_boolean 'system' false 'use system config file'
94+
DEFINE_boolean 'sign' false 'sign initial commit when creating a repository' g
9295
DEFINE_string 'file' "" 'use given config file'
9396
DEFINE_string 'feature' "" 'feature branches' p
9497
DEFINE_string 'bugfix' "" 'bugfix branches' b
@@ -259,8 +262,13 @@ file= use given config file
259262
local created_gitflow_branch=0
260263
if ! git rev-parse --quiet --verify HEAD >/dev/null 2>&1; then
261264
git_do symbolic-ref HEAD "refs/heads/$master_branch"
262-
git_do commit --allow-empty --quiet -m "Initial commit"
263-
created_gitflow_branch=1
265+
if flag sign; then
266+
git_do commit --allow-empty --gpg-sign --quiet -m "initial commit"
267+
created_gitflow_branch=1
268+
else
269+
git_do commit --allow-empty --quiet -m "initial commit"
270+
created_gitflow_branch=1
271+
fi
264272
fi
265273

266274
# Creation of master

git-flow-log

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
# http://blog.avirtualhome.com/development-workflow-using-git/
99
#
1010
# Feel free to contribute to this project at:
11-
# http://github.com/petervanderdoes/gitflow
11+
# http://github.com/CJ-Systems/gitflow-cjs
1212
#
1313
# Authors:
14+
# Copyright 2003 CJ Systems. All rights reserved.
1415
# Copyright 2012-2019 Peter van der Does. All rights reserved.
1516
#
1617
# Original Author:

git-flow-release

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
# http://blog.avirtualhome.com/development-workflow-using-git/
99
#
1010
# Feel free to contribute to this project at:
11-
# http://github.com/petervanderdoes/gitflow
11+
# http://github.com/CJ-Systems/gitflow-cjs
1212
#
1313
# Authors:
14+
# Copyright 2003 CJ Systems. All rights reserved.
1415
# Copyright 2012-2019 Peter van der Does. All rights reserved.
1516
#
1617
# Original Author:

git-flow-support

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
# http://blog.avirtualhome.com/development-workflow-using-git/
99
#
1010
# Feel free to contribute to this project at:
11-
# http://github.com/petervanderdoes/gitflow
11+
# http://github.com/CJ-Systems/gitflow-cjs
1212
#
1313
# Authors:
14+
# Copyright 2003 CJ Systems. All rights reserved.
1415
# Copyright 2012-2019 Peter van der Does. All rights reserved.
1516
#
1617
# Original Author:

git-flow-version

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
# http://blog.avirtualhome.com/development-workflow-using-git/
99
#
1010
# Feel free to contribute to this project at:
11-
# http://github.com/petervanderdoes/gitflow
11+
# http://github.com/CJ-Systems/gitflow-cjs
1212
#
1313
# Authors:
14+
# Copyright 2003 CJ Systems. All rights reserved.
1415
# Copyright 2012-2019 Peter van der Does. All rights reserved.
1516
#
1617
# Original Author:

gitflow-common

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
# http://blog.avirtualhome.com/development-workflow-using-git/
99
#
1010
# Feel free to contribute to this project at:
11-
# http://github.com/petervanderdoes/gitflow
11+
# http://github.com/CJ-Systems/gitflow-cjs
1212
#
1313
# Authors:
14+
# Copyright 2003 CJ Systems. All rights reserved.
1415
# Copyright 2012-2019 Peter van der Does. All rights reserved.
1516
#
1617
# Original Author:

0 commit comments

Comments
 (0)