Skip to content

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

Merge branch 'feature/finish_fix' into develop

parents da1dc069 afbb787a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2387 additions and 370 deletions
.gitignore
View file @ fb785d14
...@@ -8,3 +8,5 @@ debian/*/* ...@@ -8,3 +8,5 @@ debian/*/*
.timelog-feature-workingtime .timelog-feature-workingtime
.seconds-feature-sdsa .seconds-feature-sdsa
.timelog-feature-sdsa .timelog-feature-sdsa
.seconds-feature-finish_fix
.timelog-feature-finish_fix
git-flow-feature
View file @ fb785d14
...@@ -358,7 +358,7 @@ cmd_finish() { ...@@ -358,7 +358,7 @@ cmd_finish() {
exit 1 exit 1
fi fi
TOTAL_TIME=awk '{ sum += $1 } END { print sum }' .seconds-feature-$NAME TOTAL_TIME=$(awk '{ sum += $1 } END { print sum }' .seconds-feature-$NAME)
TIME_EXPECTED=line=$(head -n 1 .timelog-feature-$NAME) TIME_EXPECTED=line=$(head -n 1 .timelog-feature-$NAME)
seconds=$TOTAL_TIME; FINALTIME=$((seconds/86400))" days "$(date -d "1970-01-01 + $seconds seconds" "+%H hours %M minutes %S seconds") seconds=$TOTAL_TIME; FINALTIME=$((seconds/86400))" days "$(date -d "1970-01-01 + $seconds seconds" "+%H hours %M minutes %S seconds")
...@@ -632,4 +632,3 @@ cmd_resume() { ...@@ -632,4 +632,3 @@ cmd_resume() {
} }
\ No newline at end of file
gitflow-shFlags deleted 120000 → 0
View file @ da1dc069
shFlags/src/shflags
\ No newline at end of file
gitflow-shFlags 0 → 100644
View file @ fb785d14
This diff is collapsed.
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