search

git-time-metric / gtm

Simple, seamless, lightweight time tracking for Git
MIT License
969 stars 52 forks source link

Bug after Git interactive rebase #93

Open ybelenko opened 5 years ago

ybelenko commented 5 years ago

System info:

OS: Macos Mojave 10.14.3 18D109 VSCode 1.31.0 (1.31.0) VSCode extension vscode-gtm 0.2.0

$  git --version
git version 2.19.2

$ gtm --version
v1.3.5

Bug description

As it turned out plugin doubles tracked time after procedure:

$ git rebase --interactive aaffvvcc

I've noticed increased time of single commit from 3 hours to 14 hours after few rebase actions. I've changed message of the last commit few times(5 minutes of real time) and every next rebased commit doubled tracked time(3.5 hours to 7 hours and 14 hours).

At the same time Commit Staged (Ammend) VSCode feature doesn't duplicate time tracking.

mschenk42 commented 5 years ago

Hi,

Thanks for the bug report. Can you provide me what the note data is for the commits you are experiencing issues on. git notes --ref gtm-data show <commit sha>

ybelenko commented 5 years ago 
$  git notes --ref gtm-data show 7da27392e
[ver:1,total:60]
tests/extensions/custom/imports/ProfilesImportTest.php:60,1551661200:60,m

[ver:1,total:60]
tests/extensions/custom/imports/ProfilesImportTest.php:30,1551661200:30,m
.git/rebase-merge/git-rebase-todo:15,1551661200:15,r
.git/COMMIT_EDITMSG:15,1551661200:15,r

[ver:1,total:60]
tests/extensions/custom/imports/ProfilesImportTest.php:30,1551661200:30,m
.git/rebase-merge/git-rebase-todo:15,1551661200:15,r
.git/COMMIT_EDITMSG:15,1551661200:15,r

[ver:1,total:120]
tests/extensions/custom/imports/ProfilesImportTest.php:120,1551661200:120,m

[ver:1,total:240]
composer.json:180,1551661200:180,m
tests/extensions/custom/database/DatabaseTestCase.php:30,1551661200:30,m
public/extensions/custom/imports/ProfilesImport.php:15,1551661200:15,m
tests/extensions/custom/imports/ProfilesImportTest.php:15,1551661200:15,m

[ver:1,total:12300]
tests/extensions/custom/imports/ProfilesImportTest.php:2687,1551657600:1306,1551661200:1381,m
.bashrc:1622,1551643200:1400,1551654000:180,1551661200:42,r
tests/extensions/custom/import/ProfilesImportTest.php:1036,1551654000:936,1551657600:100,d
fulldump.sql:806,1551643200:260,1551646800:180,1551650400:360,1551661200:6,r
composer.json:798,1551654000:570,1551657600:138,1551661200:90,m
tests/extensions/custom/database/DatabaseTestCase.php:541,1551654000:60,1551657600:439,1551661200:42,m
src/core/Directus/Console/Modules/DatabaseModule.php:360,1551639600:180,1551643200:180,r
vendor/phpunit/dbunit/src/DataSet/AbstractDataSet.php:354,1551657600:234,1551661200:120,r
public/extensions/custom/parsers/BaseXlsParser.php:285,1551585600:180,1551636000:90,1551657600:15,r
public/extensions/custom/import/ProfilesImport.php:230,1551654000:230,d
phpunit.xml.dist:227,1551657600:185,1551661200:42,m
bin/directus:220,1551636000:220,r
vendor/phpunit/dbunit/src/DataSet/AbstractXmlDataSet.php:214,1551657600:74,1551661200:140,r
vendor/phpunit/dbunit/src/DataSet/FlatXmlDataSet.php:212,1551657600:212,r
bin/runtests.sh:200,1551636000:200,r
full_after_manual_fill.sql:186,1551654000:180,1551661200:6,r
config/api.php:185,1551636000:155,1551657600:30,r
src/core/Directus/Console/Modules/UserModule.php:180,1551639600:180,r
src/schema.sql:180,1551639600:120,1551643200:60,r
tests/extensions/custom/imports/files/profiles_import_setup.xml:138,1551657600:72,1551661200:66,m
config/migrations.upgrades.php:135,1551636000:135,r
profiles_import_dataset.xml:120,1551654000:120,d
src/core/Directus/Console/Modules/InstallModule.php:120,1551639600:120,r
public/extensions/custom/imports/ProfilesImport.php:108,1551657600:102,1551661200:6,m
vendor/phpunit/dbunit/src/DataSet/AbstractTable.php:102,1551657600:42,1551661200:60,r
vendor/phpunit/dbunit/src/TestCaseTrait.php:94,1551657600:74,1551661200:20,r
datadump.sql:86,1551654000:60,1551657600:20,1551661200:6,r
.gitignore:81,1551643200:60,1551661200:21,m
vendor/phpunit/dbunit/src/Database/Connection.php:75,1551657600:75,r
config/api_sample.php:60,1551636000:60,r
bin/dump.sql:60,1551643200:60,d
src/core/Directus/Console/Modules/LogModule.php:60,1551639600:60,r
tests/extensions/custom/parsers/ProfilesXlsParserTest.php:60,1551650400:60,r
src/core/Directus/Console/Cli.php:60,1551639600:60,r
logs/error.2019-03-03.log:45,1551636000:45,r
vendor/phpunit/dbunit/src/DataSet/MysqlXmlDataSet.php:40,1551657600:20,1551661200:20,r
tests/extensions/custom/parsers/FundingReportsXlsParserTest.php:35,1551654000:20,1551657600:15,r
vendor/phpunit/dbunit/src/DataSet/DefaultDataSet.php:30,1551657600:30,r
vendor/phpunit/dbunit/src/DataSet/CompositeDataSet.php:30,1551657600:30,r
tests/extensions/custom/database/BaseDbTestCase.php:24,1551654000:24,d
vendor/phpunit/dbunit/src/Database/Table.php:20,1551661200:20,r
bin/build_directus.sh:20,1551636000:20,r
vendor/phpunit/dbunit/src/DataSet/XmlDataSet.php:20,1551661200:20,r
tests/extensions/custom/import/files/profiles_import_dataset.xml:20,1551654000:20,d
vendor/phpunit/dbunit/src/DataSet/IDataSet.php:20,1551661200:20,r
vendor/phpunit/dbunit/src/DataSet/ITable.php:20,1551661200:20,r
fulldump_before.sql:20,1551643200:20,d
bin/build_subtree.sh:20,1551636000:20,r
vendor/phpunit/dbunit/src/DataSet/Filter.php:18,1551657600:12,1551661200:6,r
vendor/phpunit/dbunit/src/DataSet/QueryDataSet.php:15,1551657600:15,r
config/migrations.php:15,1551636000:15,r
tests/extensions/custom/imports/files/profiles_import_expected.xml:6,1551661200:6,m

[ver:1,total:120]
tests/extensions/custom/imports/ProfilesImportTest.php:120,1551661200:120,m

[ver:1,total:240]
composer.json:180,1551661200:180,m
tests/extensions/custom/database/DatabaseTestCase.php:30,1551661200:30,m
public/extensions/custom/imports/ProfilesImport.php:15,1551661200:15,m
tests/extensions/custom/imports/ProfilesImportTest.php:15,1551661200:15,m

[ver:1,total:12300]
tests/extensions/custom/imports/ProfilesImportTest.php:2687,1551657600:1306,1551661200:1381,m
.bashrc:1622,1551643200:1400,1551654000:180,1551661200:42,r
tests/extensions/custom/import/ProfilesImportTest.php:1036,1551654000:936,1551657600:100,d
fulldump.sql:806,1551643200:260,1551646800:180,1551650400:360,1551661200:6,r
composer.json:798,1551654000:570,1551657600:138,1551661200:90,m
tests/extensions/custom/database/DatabaseTestCase.php:541,1551654000:60,1551657600:439,1551661200:42,m
src/core/Directus/Console/Modules/DatabaseModule.php:360,1551639600:180,1551643200:180,r
vendor/phpunit/dbunit/src/DataSet/AbstractDataSet.php:354,1551657600:234,1551661200:120,r
public/extensions/custom/parsers/BaseXlsParser.php:285,1551585600:180,1551636000:90,1551657600:15,r
public/extensions/custom/import/ProfilesImport.php:230,1551654000:230,d
phpunit.xml.dist:227,1551657600:185,1551661200:42,m
bin/directus:220,1551636000:220,r
vendor/phpunit/dbunit/src/DataSet/AbstractXmlDataSet.php:214,1551657600:74,1551661200:140,r
vendor/phpunit/dbunit/src/DataSet/FlatXmlDataSet.php:212,1551657600:212,r
bin/runtests.sh:200,1551636000:200,r
full_after_manual_fill.sql:186,1551654000:180,1551661200:6,r
config/api.php:185,1551636000:155,1551657600:30,r
src/core/Directus/Console/Modules/UserModule.php:180,1551639600:180,r
src/schema.sql:180,1551639600:120,1551643200:60,r
tests/extensions/custom/imports/files/profiles_import_setup.xml:138,1551657600:72,1551661200:66,m
config/migrations.upgrades.php:135,1551636000:135,r
profiles_import_dataset.xml:120,1551654000:120,d
src/core/Directus/Console/Modules/InstallModule.php:120,1551639600:120,r
public/extensions/custom/imports/ProfilesImport.php:108,1551657600:102,1551661200:6,m
vendor/phpunit/dbunit/src/DataSet/AbstractTable.php:102,1551657600:42,1551661200:60,r
vendor/phpunit/dbunit/src/TestCaseTrait.php:94,1551657600:74,1551661200:20,r
datadump.sql:86,1551654000:60,1551657600:20,1551661200:6,r
.gitignore:81,1551643200:60,1551661200:21,m
vendor/phpunit/dbunit/src/Database/Connection.php:75,1551657600:75,r
config/api_sample.php:60,1551636000:60,r
bin/dump.sql:60,1551643200:60,d
src/core/Directus/Console/Modules/LogModule.php:60,1551639600:60,r
tests/extensions/custom/parsers/ProfilesXlsParserTest.php:60,1551650400:60,r
src/core/Directus/Console/Cli.php:60,1551639600:60,r
logs/error.2019-03-03.log:45,1551636000:45,r
vendor/phpunit/dbunit/src/DataSet/MysqlXmlDataSet.php:40,1551657600:20,1551661200:20,r
tests/extensions/custom/parsers/FundingReportsXlsParserTest.php:35,1551654000:20,1551657600:15,r
vendor/phpunit/dbunit/src/DataSet/DefaultDataSet.php:30,1551657600:30,r
vendor/phpunit/dbunit/src/DataSet/CompositeDataSet.php:30,1551657600:30,r
tests/extensions/custom/database/BaseDbTestCase.php:24,1551654000:24,d
vendor/phpunit/dbunit/src/Database/Table.php:20,1551661200:20,r
bin/build_directus.sh:20,1551636000:20,r
vendor/phpunit/dbunit/src/DataSet/XmlDataSet.php:20,1551661200:20,r
tests/extensions/custom/import/files/profiles_import_dataset.xml:20,1551654000:20,d
vendor/phpunit/dbunit/src/DataSet/IDataSet.php:20,1551661200:20,r
vendor/phpunit/dbunit/src/DataSet/ITable.php:20,1551661200:20,r
fulldump_before.sql:20,1551643200:20,d
bin/build_subtree.sh:20,1551636000:20,r
vendor/phpunit/dbunit/src/DataSet/Filter.php:18,1551657600:12,1551661200:6,r
vendor/phpunit/dbunit/src/DataSet/QueryDataSet.php:15,1551657600:15,r
config/migrations.php:15,1551636000:15,r
tests/extensions/custom/imports/files/profiles_import_expected.xml:6,1551661200:6,m

[ver:1,total:60]
tests/extensions/custom/imports/ProfilesImportTest.php:30,1551661200:30,m
.git/rebase-merge/git-rebase-todo:15,1551661200:15,r
.git/COMMIT_EDITMSG:15,1551661200:15,r

[ver:1,total:120]
tests/extensions/custom/imports/ProfilesImportTest.php:120,1551661200:120,m

[ver:1,total:240]
composer.json:180,1551661200:180,m
tests/extensions/custom/database/DatabaseTestCase.php:30,1551661200:30,m
public/extensions/custom/imports/ProfilesImport.php:15,1551661200:15,m
tests/extensions/custom/imports/ProfilesImportTest.php:15,1551661200:15,m

[ver:1,total:12300]
tests/extensions/custom/imports/ProfilesImportTest.php:2687,1551657600:1306,1551661200:1381,m
.bashrc:1622,1551643200:1400,1551654000:180,1551661200:42,r
tests/extensions/custom/import/ProfilesImportTest.php:1036,1551654000:936,1551657600:100,d
fulldump.sql:806,1551643200:260,1551646800:180,1551650400:360,1551661200:6,r
composer.json:798,1551654000:570,1551657600:138,1551661200:90,m
tests/extensions/custom/database/DatabaseTestCase.php:541,1551654000:60,1551657600:439,1551661200:42,m
src/core/Directus/Console/Modules/DatabaseModule.php:360,1551639600:180,1551643200:180,r
vendor/phpunit/dbunit/src/DataSet/AbstractDataSet.php:354,1551657600:234,1551661200:120,r
public/extensions/custom/parsers/BaseXlsParser.php:285,1551585600:180,1551636000:90,1551657600:15,r
public/extensions/custom/import/ProfilesImport.php:230,1551654000:230,d
phpunit.xml.dist:227,1551657600:185,1551661200:42,m
bin/directus:220,1551636000:220,r
vendor/phpunit/dbunit/src/DataSet/AbstractXmlDataSet.php:214,1551657600:74,1551661200:140,r
vendor/phpunit/dbunit/src/DataSet/FlatXmlDataSet.php:212,1551657600:212,r
bin/runtests.sh:200,1551636000:200,r
full_after_manual_fill.sql:186,1551654000:180,1551661200:6,r
config/api.php:185,1551636000:155,1551657600:30,r
src/core/Directus/Console/Modules/UserModule.php:180,1551639600:180,r
src/schema.sql:180,1551639600:120,1551643200:60,r
tests/extensions/custom/imports/files/profiles_import_setup.xml:138,1551657600:72,1551661200:66,m
config/migrations.upgrades.php:135,1551636000:135,r
profiles_import_dataset.xml:120,1551654000:120,d
src/core/Directus/Console/Modules/InstallModule.php:120,1551639600:120,r
public/extensions/custom/imports/ProfilesImport.php:108,1551657600:102,1551661200:6,m
vendor/phpunit/dbunit/src/DataSet/AbstractTable.php:102,1551657600:42,1551661200:60,r
vendor/phpunit/dbunit/src/TestCaseTrait.php:94,1551657600:74,1551661200:20,r
datadump.sql:86,1551654000:60,1551657600:20,1551661200:6,r
.gitignore:81,1551643200:60,1551661200:21,m
vendor/phpunit/dbunit/src/Database/Connection.php:75,1551657600:75,r
config/api_sample.php:60,1551636000:60,r
bin/dump.sql:60,1551643200:60,d
src/core/Directus/Console/Modules/LogModule.php:60,1551639600:60,r
tests/extensions/custom/parsers/ProfilesXlsParserTest.php:60,1551650400:60,r
src/core/Directus/Console/Cli.php:60,1551639600:60,r
logs/error.2019-03-03.log:45,1551636000:45,r
vendor/phpunit/dbunit/src/DataSet/MysqlXmlDataSet.php:40,1551657600:20,1551661200:20,r
tests/extensions/custom/parsers/FundingReportsXlsParserTest.php:35,1551654000:20,1551657600:15,r
vendor/phpunit/dbunit/src/DataSet/DefaultDataSet.php:30,1551657600:30,r
vendor/phpunit/dbunit/src/DataSet/CompositeDataSet.php:30,1551657600:30,r
tests/extensions/custom/database/BaseDbTestCase.php:24,1551654000:24,d
vendor/phpunit/dbunit/src/Database/Table.php:20,1551661200:20,r
bin/build_directus.sh:20,1551636000:20,r
vendor/phpunit/dbunit/src/DataSet/XmlDataSet.php:20,1551661200:20,r
tests/extensions/custom/import/files/profiles_import_dataset.xml:20,1551654000:20,d
vendor/phpunit/dbunit/src/DataSet/IDataSet.php:20,1551661200:20,r
vendor/phpunit/dbunit/src/DataSet/ITable.php:20,1551661200:20,r
fulldump_before.sql:20,1551643200:20,d
bin/build_subtree.sh:20,1551636000:20,r
vendor/phpunit/dbunit/src/DataSet/Filter.php:18,1551657600:12,1551661200:6,r
vendor/phpunit/dbunit/src/DataSet/QueryDataSet.php:15,1551657600:15,r
config/migrations.php:15,1551636000:15,r
tests/extensions/custom/imports/files/profiles_import_expected.xml:6,1551661200:6,m

[ver:1,total:120]
tests/extensions/custom/imports/ProfilesImportTest.php:120,1551661200:120,m

[ver:1,total:240]
composer.json:180,1551661200:180,m
tests/extensions/custom/database/DatabaseTestCase.php:30,1551661200:30,m
public/extensions/custom/imports/ProfilesImport.php:15,1551661200:15,m
tests/extensions/custom/imports/ProfilesImportTest.php:15,1551661200:15,m

[ver:1,total:12300]
tests/extensions/custom/imports/ProfilesImportTest.php:2687,1551657600:1306,1551661200:1381,m
.bashrc:1622,1551643200:1400,1551654000:180,1551661200:42,r
tests/extensions/custom/import/ProfilesImportTest.php:1036,1551654000:936,1551657600:100,d
fulldump.sql:806,1551643200:260,1551646800:180,1551650400:360,1551661200:6,r
composer.json:798,1551654000:570,1551657600:138,1551661200:90,m
tests/extensions/custom/database/DatabaseTestCase.php:541,1551654000:60,1551657600:439,1551661200:42,m
src/core/Directus/Console/Modules/DatabaseModule.php:360,1551639600:180,1551643200:180,r
vendor/phpunit/dbunit/src/DataSet/AbstractDataSet.php:354,1551657600:234,1551661200:120,r
public/extensions/custom/parsers/BaseXlsParser.php:285,1551585600:180,1551636000:90,1551657600:15,r
public/extensions/custom/import/ProfilesImport.php:230,1551654000:230,d
phpunit.xml.dist:227,1551657600:185,1551661200:42,m
bin/directus:220,1551636000:220,r
vendor/phpunit/dbunit/src/DataSet/AbstractXmlDataSet.php:214,1551657600:74,1551661200:140,r
vendor/phpunit/dbunit/src/DataSet/FlatXmlDataSet.php:212,1551657600:212,r
bin/runtests.sh:200,1551636000:200,r
full_after_manual_fill.sql:186,1551654000:180,1551661200:6,r
config/api.php:185,1551636000:155,1551657600:30,r
src/core/Directus/Console/Modules/UserModule.php:180,1551639600:180,r
src/schema.sql:180,1551639600:120,1551643200:60,r
tests/extensions/custom/imports/files/profiles_import_setup.xml:138,1551657600:72,1551661200:66,m
config/migrations.upgrades.php:135,1551636000:135,r
profiles_import_dataset.xml:120,1551654000:120,d
src/core/Directus/Console/Modules/InstallModule.php:120,1551639600:120,r
public/extensions/custom/imports/ProfilesImport.php:108,1551657600:102,1551661200:6,m
vendor/phpunit/dbunit/src/DataSet/AbstractTable.php:102,1551657600:42,1551661200:60,r
vendor/phpunit/dbunit/src/TestCaseTrait.php:94,1551657600:74,1551661200:20,r
datadump.sql:86,1551654000:60,1551657600:20,1551661200:6,r
.gitignore:81,1551643200:60,1551661200:21,m
vendor/phpunit/dbunit/src/Database/Connection.php:75,1551657600:75,r
config/api_sample.php:60,1551636000:60,r
bin/dump.sql:60,1551643200:60,d
src/core/Directus/Console/Modules/LogModule.php:60,1551639600:60,r
tests/extensions/custom/parsers/ProfilesXlsParserTest.php:60,1551650400:60,r
src/core/Directus/Console/Cli.php:60,1551639600:60,r
logs/error.2019-03-03.log:45,1551636000:45,r
vendor/phpunit/dbunit/src/DataSet/MysqlXmlDataSet.php:40,1551657600:20,1551661200:20,r
tests/extensions/custom/parsers/FundingReportsXlsParserTest.php:35,1551654000:20,1551657600:15,r
vendor/phpunit/dbunit/src/DataSet/DefaultDataSet.php:30,1551657600:30,r
vendor/phpunit/dbunit/src/DataSet/CompositeDataSet.php:30,1551657600:30,r
tests/extensions/custom/database/BaseDbTestCase.php:24,1551654000:24,d
vendor/phpunit/dbunit/src/Database/Table.php:20,1551661200:20,r
bin/build_directus.sh:20,1551636000:20,r
vendor/phpunit/dbunit/src/DataSet/XmlDataSet.php:20,1551661200:20,r
tests/extensions/custom/import/files/profiles_import_dataset.xml:20,1551654000:20,d
vendor/phpunit/dbunit/src/DataSet/IDataSet.php:20,1551661200:20,r
vendor/phpunit/dbunit/src/DataSet/ITable.php:20,1551661200:20,r
fulldump_before.sql:20,1551643200:20,d
bin/build_subtree.sh:20,1551636000:20,r
vendor/phpunit/dbunit/src/DataSet/Filter.php:18,1551657600:12,1551661200:6,r
vendor/phpunit/dbunit/src/DataSet/QueryDataSet.php:15,1551657600:15,r
config/migrations.php:15,1551636000:15,r
tests/extensions/custom/imports/files/profiles_import_expected.xml:6,1551661200:6,m