[tor-bugs] #20565 [Core Tor/Stem]: Ignore git mergetool backup files
Tor Bug Tracker & Wiki
blackhole at torproject.org
Fri Nov 4 14:50:03 UTC 2016
#20565: Ignore git mergetool backup files
-------------------------------+--------------------
Reporter: cypherpunks | Owner: atagar
Type: defect | Status: new
Priority: Medium | Milestone:
Component: Core Tor/Stem | Version:
Severity: Normal | Keywords:
Actual Points: | Parent ID:
Points: | Reviewer:
Sponsor: |
-------------------------------+--------------------
I use `git mergetool` to handle merge conflicts. The tool leaves `.orig`
files as backups to the original files.
This makes `git status` complain about untracked files and fails the
installation unit test because it detects these files as not being
installed.
The attached patch solves both issues.
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/20565>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
More information about the tor-bugs
mailing list