From: "Niklas Höglund" <nhoglund@gmail.com>
To: git@vger.kernel.org
Subject: git and file name case on cygwin
Date: Sat, 3 Feb 2007 22:00:40 +0000 [thread overview]
Message-ID: <ad8ce5c20702031400h78ddc11o34f98a461339bb55@mail.gmail.com> (raw)
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.
next reply other threads:[~2007-02-03 22:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-03 22:00 Niklas Höglund [this message]
2007-02-04 1:17 ` git and file name case on cygwin Linus Torvalds
2007-02-04 1:25 ` Junio C Hamano
2007-02-04 1:38 ` Linus Torvalds
2007-02-04 1:44 ` Junio C Hamano
2007-02-04 13:59 ` Niklas Höglund
2007-02-04 14:17 ` Mark Levedahl
2007-02-04 14:27 ` Jakub Narebski
2007-02-04 15:01 ` Sam Ravnborg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ad8ce5c20702031400h78ddc11o34f98a461339bb55@mail.gmail.com \
--to=nhoglund@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).