Skip to content

Bug fix in commit script - log.generate.short was not skipped

Spyros Argyropoulos requested to merge fix3 into master

Description of bug

When using ./scripts/commit_new_dsid.sh -m="[skip athena]" the commit script was not skipping the log.generate.short files.

Will now add files to git commit
		File: 600xxx/600026/log.generate cannot be added to the commit. Skipping.
		Added: 600xxx/600026/log.generate.short

This was because a closing fi was missing

Changes introduced

  • Fix buggy if statement that led to the above bug
  • Make sure we do a git fetch origin --prune to update the local branches before we push, otherwise the DSID assignment was being confused

Tests

  1. Without [skip athena]

Screenshot_2020-03-18_at_11.41.03

  1. With [skip athena]

Screenshot_2020-03-18_at_11.49.51

Issues resolved

Closes #

Edited by Spyros Argyropoulos

Merge request reports