Skip to content

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

Merge branch 'feature/finish_fix' into develop

parents af0c4708 7e071131
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
.gitignore
View file @ 93908e18
...@@ -12,3 +12,5 @@ debian/*/* ...@@ -12,3 +12,5 @@ debian/*/*
.timelog-feature-finish_fix .timelog-feature-finish_fix
.seconds-feature-finish_fix .seconds-feature-finish_fix
.timelog-feature-finish_fix .timelog-feature-finish_fix
.seconds-feature-finish_fix
.timelog-feature-finish_fix
git-flow-feature
View file @ 93908e18
...@@ -371,7 +371,7 @@ cmd_finish() { ...@@ -371,7 +371,7 @@ cmd_finish() {
echo "$TIME_USED" >> ".seconds-feature-$NAME" echo "$TIME_USED" >> ".seconds-feature-$NAME"
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=$(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")
git commit --allow-empty -m "$BRANCH was completed on $(date), total time taken:$FINALTIME expectde time was $TIME_EXPECTED" git commit --allow-empty -m "$BRANCH was completed on $(date), total time taken:$FINALTIME expectde time was $TIME_EXPECTED"
......
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