git and file name case on cygwin
- From
Niklas Höglund <nhoglund@gmail.com>
- Date
- Feb 3, 2007, 22:00 UTC
- Message-ID
- <ad8ce5c20702031400h78ddc11o34f98a461339bb55@mail.gmail.com>
There's something funny going on with git in cygwin. The following is in a clone of linux 2.6, with no local modifications (only the occasional pull from upstream).
Niklas Hoglund@NIKLAS /c/linux-2.6 $ git pull remote: Generating pack... remote: Done counting 220 objects. remote: Result has 154 objects. remote: Deltifying 154 objects. remote: 100% (154/154) done Unpacking 154 objects remote: Total 154, written 154 (delta 124), reused 105 (delta 86) 100% (154/154) done * refs/heads/origin: fast forward to branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 old..new: a7ec3f5..05a8057 Updating a7ec3f5..05a8057 include/linux/netfilter/xt_CONNMARK.h: needs update include/linux/netfilter/xt_DSCP.h: needs update include/linux/netfilter/xt_MARK.h: needs update include/linux/netfilter_ipv4/ipt_CONNMARK.h: needs update include/linux/netfilter_ipv4/ipt_DSCP.h: needs update include/linux/netfilter_ipv4/ipt_ECN.h: needs update include/linux/netfilter_ipv4/ipt_MARK.h: needs update include/linux/netfilter_ipv4/ipt_TCPMSS.h: needs update include/linux/netfilter_ipv4/ipt_TOS.h: needs update include/linux/netfilter_ipv4/ipt_TTL.h: needs update include/linux/netfilter_ipv6/ip6t_HL.h: needs update include/linux/netfilter_ipv6/ip6t_MARK.h: needs update net/ipv4/netfilter/ipt_ECN.c: needs update net/ipv4/netfilter/ipt_TOS.c: needs update net/ipv4/netfilter/ipt_TTL.c: needs update net/ipv6/netfilter/ip6t_HL.c: needs update net/netfilter/xt_CONNMARK.c: needs update net/netfilter/xt_DSCP.c: needs update net/netfilter/xt_mark.c: needs update Fast forward MAINTAINERS | 6 +- arch/i386/kernel/acpi/boot.c | 2 +- drivers/acpi/ec.c | 2 +- drivers/hid/Kconfig | 18 +++- drivers/net/Space.c | 11 -- drivers/net/ifb.c | 4 +- drivers/net/loopback.c | 4 +- drivers/net/sungem.c | 3 +- drivers/net/sungem_phy.c | 179 ++++++++++++++++++++++++++++++----- drivers/net/sungem_phy.h | 7 +- drivers/usb/input/Kconfig | 6 +- drivers/video/backlight/corgi_bl.c | 2 +- drivers/video/backlight/hp680_bl.c | 2 +-
Niklas Hoglund@NIKLAS /c/linux-2.6 $ git status # Changed but not updated: # (use git-update-index to mark for commit) # # modified: include/linux/netfilter/xt_CONNMARK.h # modified: include/linux/netfilter/xt_DSCP.h # modified: include/linux/netfilter/xt_MARK.h # modified: include/linux/netfilter_ipv4/ipt_CONNMARK.h # modified: include/linux/netfilter_ipv4/ipt_DSCP.h # modified: include/linux/netfilter_ipv4/ipt_ECN.h # modified: include/linux/netfilter_ipv4/ipt_MARK.h # modified: include/linux/netfilter_ipv4/ipt_TCPMSS.h # modified: include/linux/netfilter_ipv4/ipt_TOS.h # modified: include/linux/netfilter_ipv4/ipt_TTL.h # modified: include/linux/netfilter_ipv6/ip6t_HL.h # modified: include/linux/netfilter_ipv6/ip6t_MARK.h # modified: net/ipv4/netfilter/ipt_ECN.c # modified: net/ipv4/netfilter/ipt_TOS.c # modified: net/ipv4/netfilter/ipt_TTL.c # modified: net/ipv6/netfilter/ip6t_HL.c # modified: net/netfilter/xt_CONNMARK.c # modified: net/netfilter/xt_DSCP.c # modified: net/netfilter/xt_mark.c # nothing to commit
Niklas Hoglund@NIKLAS /c/linux-2.6 $ git reset --hard
Niklas Hoglund@NIKLAS /c/linux-2.6 $ git pull Already up-to-date.
Niklas Hoglund@NIKLAS /c/linux-2.6 $ git status # Changed but not updated: # (use git-update-index to mark for commit) # # modified: include/linux/netfilter/xt_connmark.h # modified: include/linux/netfilter/xt_dscp.h # modified: include/linux/netfilter/xt_mark.h # modified: include/linux/netfilter_ipv4/ipt_connmark.h # modified: include/linux/netfilter_ipv4/ipt_dscp.h # modified: include/linux/netfilter_ipv4/ipt_ecn.h # modified: include/linux/netfilter_ipv4/ipt_mark.h # modified: include/linux/netfilter_ipv4/ipt_tcpmss.h # modified: include/linux/netfilter_ipv4/ipt_tos.h # modified: include/linux/netfilter_ipv4/ipt_ttl.h # modified: include/linux/netfilter_ipv6/ip6t_hl.h # modified: include/linux/netfilter_ipv6/ip6t_mark.h # modified: net/ipv4/netfilter/ipt_ecn.c # modified: net/ipv4/netfilter/ipt_tos.c # modified: net/ipv4/netfilter/ipt_ttl.c # modified: net/ipv6/netfilter/ip6t_hl.c # modified: net/netfilter/xt_MARK.c # modified: net/netfilter/xt_connmark.c # modified: net/netfilter/xt_dscp.c # nothing to commit
Notice how all the files in the above list changed case since the previous invocation of git status.
The above has the unfortunate effect that the merge in a pull often refuses to run, requiring "git reset --hard origin" to update the working tree.