Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove file with same name and different case #6028

Merged
merged 1 commit into from
May 31, 2019

Conversation

alexspeller
Copy link
Contributor

Description

#6027 includes two files named the same but with different case. This breaks git on case-insensitive filesystems (like MacOS by default) - @drashna @noroadsleft mentioning you as you were reviewers on that PR

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • [x ] I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@drashna
Copy link
Member

drashna commented May 31, 2019

Sorry, I missed that.

And yeah, we prefer lowercase names, as it's less prone to "odd issues".

@alexspeller alexspeller force-pushed the remove-same-named-file branch from 24013dd to b97986d Compare May 31, 2019 01:54
@alexspeller alexspeller force-pushed the remove-same-named-file branch from b97986d to 24d0e1a Compare May 31, 2019 01:57
@alexspeller
Copy link
Contributor Author

Makes sense, I renamed to lowercase

Copy link
Member

@noroadsleft noroadsleft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to go. 👍

@alexspeller alexspeller mentioned this pull request May 31, 2019
13 tasks
@drashna drashna merged commit 6693d16 into qmk:master May 31, 2019
duncanyoyo1 added a commit to duncanyoyo1/qmk_firmware that referenced this pull request May 31, 2019
[Keyboard] Remove file with same name and different case (qmk#6028)
@hillam
Copy link
Contributor

hillam commented May 31, 2019

Whoops! Thanks for catching that.

tenderlove added a commit to tenderlove/qmk_firmware that referenced this pull request Jun 10, 2019
* master: (790 commits)
  [Keyboard] YMD96 refactor (qmk#5472)
  Update reference_configurator_support.md
  Use qmk docker image for travis CI builds
  [Keyboard] Remove file with same name and different case (qmk#6028)
  [Keyboard] Fix json for NK65 (qmk#6026)
  [Keymap] added hhkb layout for tada68 (qmk#6027)
  [Keymap] Added keymap for user jasondunsmore (qmk#6023)
  [Keyboard] Fix jc65 when RGB or BACKLIGHT disabled (qmk#6022)
  Update feature_encoders.md
  Copy avr teensy flash logic to arm (qmk#6016)
  [Keyboard] E6V2 R2 BMC PCB (qmk#6009)
  Add belgian layout for sendstring (qmk#6008)
  [Keyboard] Added XW60 PCB (qmk#6011)
  [Keymap] Georgi flippydippy layout (qmk#6005)
  Fix TO() and DF() calling layer_state_set_[kb,user] twice (qmk#6003)
  Update 333fred keymaps and add new iris map. (qmk#6010)
  [Keyboard] Changed LED positions for Massdrop CTRL and DZ60RGB (qmk#5801)
  [Keyboard] Add support for AKB boards (qmk#5996)
  Duck Octagon V1 Configurator cleanup (qmk#5957)
  Fixing matrix_scan so it properly returns changed status
  ...
Timbus pushed a commit to Timbus/qmk_firmware that referenced this pull request Jun 23, 2019
kimat pushed a commit to kimat/qmk_firmware that referenced this pull request Sep 8, 2019
benjaminmikiten pushed a commit to benjaminmikiten/qmk_firmware that referenced this pull request Sep 29, 2019
benjaminmikiten pushed a commit to benjaminmikiten/qmk_firmware that referenced this pull request Dec 18, 2019
benjaminmikiten added a commit to benjaminmikiten/qmk_firmware that referenced this pull request Dec 18, 2019
…ware into develop

* 'develop' of https://github.com/benjaminmikiten/qmk_firmware: (42 commits)
  userspace work
  preonic edits
  work
  update dvorak
  add hexpad, bootmagic
  split version of xd75
  rewrite XD75 lauyout for left-hand keypad
  add enter, clicky toggle, switch song
  redo preonic
  Update keymap.c
  restore songs
  swap lower, raise
  create preonic layout
  add xd75 keymap
  fix plaid adjust layer
  update gitignore
  [Keyboard] Remove file with same name and different case (qmk#6028)
  Ignore VSCode ipsh folder (qmk#5741)
  add infinity ergodox
  customize keymap some
  ...

# Conflicts:
#	keyboards/preonic/keymaps/benjaminmikiten/config.h
#	keyboards/preonic/keymaps/benjaminmikiten/keymap.c
#	keyboards/preonic/keymaps/benjaminmikiten/rules.mk
#	keyboards/romac/rules.mk
#	keyboards/xd75/keymaps/benjaminmikiten/keymap.c
#	keyboards/xd75/keymaps/benjaminmikiten/rules.mk
#	users/benjaminmikiten/benjaminmikiten.h
#	users/benjaminmikiten/readme.md
ridingqwerty pushed a commit to ridingqwerty/qmk_firmware that referenced this pull request Jan 10, 2020
JeffreyPalmer pushed a commit to JeffreyPalmer/qmk_firmware that referenced this pull request Feb 27, 2020
swamp09 pushed a commit to swamp09/qmk_firmware that referenced this pull request Mar 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants