Skip to content

Commit

Permalink
[Diff][Fixed] problems when using things like "origin/main"
Browse files Browse the repository at this point in the history
- and add_link_id

Fixes #589
  • Loading branch information
set-soft committed Mar 5, 2024
1 parent c107695 commit d661880
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Filters: _none filter not always honored (i.e. exclude in BoM) (#580)
- PCB Parity: components excluded from the board reported anyways (#585)
- BoardView: X axis mirroring issues (whitequark/kicad-boardview#11)
- Present: Problems when using gerbers already generated
- Present: problems when using gerbers already generated
- Diff: problems when using things like "origin/main" and add_link_id (#589)

## [1.6.4] - 2024-02-02
### Added
Expand Down
5 changes: 4 additions & 1 deletion kibot/out_diff.py
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,10 @@ def do_compare(self, old, old_type, new, new_type, name, name_ori):
GS.exit_with_error(None, FAILED_EXECUTE, e)
if self.add_link_id:
name_comps = os.path.splitext(name_ori)
target = name_comps[0]+'_'+gh1+'-'+gh2+name_comps[1]
extra = '_'+gh1+'-'+gh2
# Replace things like "origin/main" by "origin_main"
extra = extra.replace('/', '_')
target = name_comps[0]+extra+name_comps[1]
if self.copy_instead_of_link:
copy2(name, target)
else:
Expand Down

0 comments on commit d661880

Please sign in to comment.