Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitflow
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tools
gitflow
Commits
1156ef7d
Commit
1156ef7d
authored
Jan 23, 2017
by
cmosh
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/test' into develop
parents
9c0baed3
12b1abd0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
17 deletions
+17
-17
git-flow-feature
git-flow-feature
+17
-17
No files found.
git-flow-feature
View file @
1156ef7d
...
@@ -226,13 +226,13 @@ cmd_start() {
...
@@ -226,13 +226,13 @@ cmd_start() {
echo $TIME_REQUIRED >> "./gitflow/.timelog-feature-$NAME"
echo $TIME_REQUIRED >> "./
.
gitflow/.timelog-feature-$NAME"
git add .gitignore
git add .gitignore
git commit --allow-empty -m "--Flow message(start) -- Started working on $BRANCH on $(date) estimated Time $TIME_REQUIRED"
git commit --allow-empty -m "--Flow message(start) -- Started working on $BRANCH on $(date) estimated Time $TIME_REQUIRED"
echo $(date +%s) >> "./gitflow/.timelog-feature-$NAME"
echo $(date +%s) >> "./
.
gitflow/.timelog-feature-$NAME"
echo
echo
...
@@ -357,28 +357,28 @@ cmd_finish() {
...
@@ -357,28 +357,28 @@ cmd_finish() {
exit 1
exit 1
fi
fi
echo $(date +%s) >> "./gitflow/.timelog-feature-$NAME"
echo $(date +%s) >> "./
.
gitflow/.timelog-feature-$NAME"
LAST_LINE="$(wc -l < ./gitflow/.timelog-feature-$NAME)"
LAST_LINE="$(wc -l < ./
.
gitflow/.timelog-feature-$NAME)"
PREV_LINE=$((LAST_LINE-1))
PREV_LINE=$((LAST_LINE-1))
LAST_TIME=$(sed "${LAST_LINE}q;d" ./gitflow/.timelog-feature-$NAME)
LAST_TIME=$(sed "${LAST_LINE}q;d" ./
.
gitflow/.timelog-feature-$NAME)
PREV_TIME=$(sed "${PREV_LINE}q;d" ./gitflow/.timelog-feature-$NAME)
PREV_TIME=$(sed "${PREV_LINE}q;d" ./
.
gitflow/.timelog-feature-$NAME)
TIME_USED=$((LAST_TIME-PREV_TIME))
TIME_USED=$((LAST_TIME-PREV_TIME))
echo "$TIME_USED" >> "./gitflow/.seconds-feature-$NAME"
echo "$TIME_USED" >> "./
.
gitflow/.seconds-feature-$NAME"
if [ -f ./gitflow/.breaktime-feature-$NAME ];
if [ -f ./
.
gitflow/.breaktime-feature-$NAME ];
then
then
TOTAL_BREAK_TIME=$(awk '{ sum += $1 } END { print sum }' ./gitflow/.breaktime-feature-$NAME)
TOTAL_BREAK_TIME=$(awk '{ sum += $1 } END { print sum }' ./
.
gitflow/.breaktime-feature-$NAME)
else
else
TOTAL_BREAK_TIME=0
TOTAL_BREAK_TIME=0
fi
fi
TOTAL_TIME=$(awk '{ sum += $1 } END { print sum }' ./gitflow/.seconds-feature-$NAME)
TOTAL_TIME=$(awk '{ sum += $1 } END { print sum }' ./
.
gitflow/.seconds-feature-$NAME)
TIME_EXPECTED=$(head -n 1 ./gitflow/.timelog-feature-$NAME)
TIME_EXPECTED=$(head -n 1 ./
.
gitflow/.timelog-feature-$NAME)
FINALTIME=$((TOTAL_TIME/86400))" days "$(date -d "1970-01-01 + $TOTAL_TIME seconds" "+%H hours %M minutes %S seconds")
FINALTIME=$((TOTAL_TIME/86400))" days "$(date -d "1970-01-01 + $TOTAL_TIME seconds" "+%H hours %M minutes %S seconds")
TOTAL_TIME_OFF=$((TOTAL_BREAK_TIME/86400))" days "$(date -d "1970-01-01 + $TOTAL_BREAK_TIME seconds" "+%H hours %M minutes %S seconds")
TOTAL_TIME_OFF=$((TOTAL_BREAK_TIME/86400))" days "$(date -d "1970-01-01 + $TOTAL_BREAK_TIME seconds" "+%H hours %M minutes %S seconds")
...
@@ -596,7 +596,7 @@ cmd_pause() {
...
@@ -596,7 +596,7 @@ cmd_pause() {
TIME_USED=$((LAST_TIME-PREV_TIME))
TIME_USED=$((LAST_TIME-PREV_TIME))
echo "$TIME_USED" >> "./gitflow/.seconds-feature-$current_name"
echo "$TIME_USED" >> "./
.
gitflow/.seconds-feature-$current_name"
...
@@ -646,7 +646,7 @@ cmd_interrupt() {
...
@@ -646,7 +646,7 @@ cmd_interrupt() {
TIME_USED=$((LAST_TIME-PREV_TIME))
TIME_USED=$((LAST_TIME-PREV_TIME))
echo "$TIME_USED" >> "./gitflow/.seconds-feature-$current_name"
echo "$TIME_USED" >> "./
.
gitflow/.seconds-feature-$current_name"
touch .interrupt-feature-$current_name
touch .interrupt-feature-$current_name
...
@@ -691,15 +691,15 @@ cmd_resume() {
...
@@ -691,15 +691,15 @@ cmd_resume() {
INTERRUPT_REASON="No reason :)"
INTERRUPT_REASON="No reason :)"
fi
fi
LAST_LINE="$(wc -l < ./gitflow/.timelog-feature-$NAME)"
LAST_LINE="$(wc -l < ./
.
gitflow/.timelog-feature-$NAME)"
LAST_TIME=$(date +%s)
LAST_TIME=$(date +%s)
PREV_TIME=$(sed "${LAST_LINE}q;d" ./gitflow/.timelog-feature-$NAME)
PREV_TIME=$(sed "${LAST_LINE}q;d" ./
.
gitflow/.timelog-feature-$NAME)
BREAK_TIME=$((LAST_TIME-PREV_TIME))
BREAK_TIME=$((LAST_TIME-PREV_TIME))
echo "$BREAK_TIME" >> "./gitflow/.breaktime-feature-$NAME"
echo "$BREAK_TIME" >> "./
.
gitflow/.breaktime-feature-$NAME"
seconds=$BREAK_TIME; TIME_OFF=$((seconds/86400))" days "$(date -d "1970-01-01 + $seconds seconds" "+%H hours %M minutes %S seconds")
seconds=$BREAK_TIME; TIME_OFF=$((seconds/86400))" days "$(date -d "1970-01-01 + $seconds seconds" "+%H hours %M minutes %S seconds")
...
@@ -714,7 +714,7 @@ cmd_resume() {
...
@@ -714,7 +714,7 @@ cmd_resume() {
git commit --allow-empty -m "--Flow message(resume) --$BRANCH/Back to Work at:$(date) Time off:$TIME_OFF, Reason: $INTERRUPT_REASON"
git commit --allow-empty -m "--Flow message(resume) --$BRANCH/Back to Work at:$(date) Time off:$TIME_OFF, Reason: $INTERRUPT_REASON"
echo $(date +%s) >> "./gitflow/.timelog-feature-$NAME"
echo $(date +%s) >> "./
.
gitflow/.timelog-feature-$NAME"
echo
echo
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment