git mailing list

FromSubjectsort iconDate
Aidan Van Dyk
Trying to get GIT running on SCO OpenServer
I know - openserver, yuch, bla bla bla... Not my choice, but sometimes we have to do things we don't like... But, I've come across this in strbuf.c: va_start(ap, fmt); len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap); va_end(ap); if (len < 0) die("your vsnprintf is broken"); Now, that would seem to be the interpretation of vsnprintf I'm familiar with too, but I read this in the SCO vsnprintf man page: snprint...
Jan 23, 5:26 pm 2008
Johannes Schindelin
Re: Trying to get GIT running on SCO OpenServer
Hi, FWIW we had the same problem in MinGW, and Hannes Sixt solved it: http://repo.or.cz/w/git/mingw/j6t.git?a=commitdiff;h=b8e84a68f01a2386b2071e1bdc8e24de8... That might give you an idea how to solve the issue. Maybe you even make a git patch out of it? With a Makefile variable BROKEN_SNPRINTF=YesPlease, maybe? Hth, Dscho -
Jan 23, 7:48 pm 2008
JM Ibanez
Stripping 'git-svn-id' from commit messages, and switching t...
Hi, I've been trying to convert an existing git-svn clone to noMetadata (i.e. get rid of git-svn-id in the commit messages), primarily because I've been using it to track two SVN repos which were originally just a single repo-- they have the same UUID but are located on different machines, and have branched significantly, so content-wise are no longer the same repo. Because the two repos have a single line of commits which they share, it would be best if I could store that history in my git re...
Jan 23, 5:00 pm 2008
David Mansfield
newbie branch repo migration question
Hi, Suppose I have a local repo with a branch, 'master'. And I create a branch based on it called, 'topic1'. And I work and commit etc., make changes on 'master' and merge them back and forth etc. Now I want to move the 'master' to a remote repository, but not 'topic1', and then I want to switch 'topic1' as a branch of the remote 'master' and not the local one. In fact, I want to 'get rid' of master locally (or, rather, have 'master' be a tracking branch of remotes/foo/master). How is this...
Jan 23, 12:03 pm 2008
Johannes Sixt
git-clean buglet
Try this in your favorite git repo: git clean -n / Here, it responds with: fatal: oops in prep_exclude I don't know what the expected behavior should be, but certainly not this. Maybe just do nothing like 'git ls-files /'. I'm not familiar with either builtin-clean.c nor dir.c; perhaps someone else can fix this? -- Hannes -
Jan 23, 11:14 am 2008
Johannes Schindelin
Re: git-clean buglet
Hi, That's an absolute path. Like almost _all_ git commands, clean only takes relative ones. You probably meant "git clean -n". Hth, Dscho -
Jan 23, 11:29 am 2008
Johannes Sixt
Re: git-clean buglet
I know it's an absolute path, but, no, I said git clean -n \*.vcproj on Windows, which the MinGW port internally transforms into git clean -n /*.vcproj (which was not exactly what I meant, but that's a different story). And this also reports, just like on Linux: fatal: oops in prep_exclude There remain the questions whether we want to do something about absolute paths in general or this oops in particular. -- Hannes -
Jan 23, 11:40 am 2008
Johannes Sixt
Re: git-clean buglet
Well, 'git ls-files -o /' would be more similar, but that one lists the entire disk contents - not what I would have expected, either. Hmm... -- Hannes -
Jan 23, 11:24 am 2008
pradeep singh rautela
Why does git track directory listed in .gitignore/".git/info...
Hi All, I have an source directory, which in turn has some other directories too. I do not want to track one of these directories. So i added the directory name in .gitignore as well as in .git/info/exclude for my repo. i.e i have added following line to both of them - xen-3.1.0-src/ I copied xen-3.1.0-src from archives in the git repo's base directory. Now when i do a git-status i get # On branch master # Untracked files: # (use "git add <file>..." to include in what will be comm...
Jan 23, 9:54 am 2008
Wayne Davison
Re: Why does git track directory listed in .gitignore/".git/...
That doesn't match the directory due to the trailing slash. If you remove that slash, it will match the dir, and then ignore anything you place inside. ..wayne.. -
Jan 23, 5:11 pm 2008
pradeep singh rautela
Re: Why does git track directory listed in .gitignore/".git/...
Apologies to all.Kindly pardon my novice experiments with git. Some more trial and error method led to find that you have to put a * at the end of the directory too. i.e xen-3.1.0-src/* But i still would like to ask git gurus here. Isn't it fine to include a directory name as $directory_name/ instead of $directory_name/* ? Thoughts? Thanks, --Pradeep -- -- pradeep singh rautela http://eagain.wordpress.com http://emptydomain.googlepages.com -
Jan 23, 10:04 am 2008
Linus Torvalds
Re: Why does git track directory listed in .gitignore/".git/...
Heh. I think your problem is that "/" itself. By adding it, the exclude information does *not* match the directory entry itself (because the directory entry itself is called just "xen-3.1.0-src" - note no slash!), and since you added it, it also doesn't match any names _under_ that directory exactly. So what you *should* have done is to just tell git to ignore the directory named "xen-3.1.0-src", and you'd have been ok. Using "xen-3.1.0-src/*" works too, but it is heavy-handed and u...
Jan 23, 5:17 pm 2008
Shawn O. Pearce
[RFC/PATCH] git-gui: Use gitattribute "encoding" for file co...
I've got the following change in my "pu" right now and am considering adding it to git-gui 0.9.2, which would be in git 1.5.4. I've CC'd a number of people who have emailed me in the past about git-gui's diff or blame failing to display a non US-ASCII file content correctly and I am interested to hear if this would resolve the issue for you. Its configurable on a per-path basis by an "encoding" attribute in .gitattributes (see git-gui's own example below). If we go this route we'll also want to...
Jan 23, 1:47 am 2008
Pedro Melo
Re: [RFC/PATCH] git-gui: Use gitattribute "encoding" for fil...
Hi, This solves the problem for me. The diff display correctly display utf-8 characters. Best regards, -- Pedro Melo Blog: http://www.simplicidade.org/notes/ XMPP ID: melo@simplicidade.org Use XMPP! -
Jan 23, 3:02 am 2008
Junio C Hamano
Re: [RFC/PATCH] git-gui: Use gitattribute "encoding" for fil...
Hmmm. At least for now in 1.5.4, I'd prefer the way gitk shows UTF-8 (if I recall correctly latin-1 or other legacy encoding, as long as LANG/LC_* is given appropriately, as well) contents without per-path configuration without introducing new attributes. -
Jan 23, 1:55 am 2008
Steffen Prohaska
Re: [RFC/PATCH] git-gui: Use gitattribute "encoding" for fil...
Shouldn't we first try harder to get things right without adding an attribute? Maybe we could continue a good tradition and look at the content of the first: we could first look for hints in the file about the encoding. XML and many text files contain such hints already to help editors. For example, Python source can explicitly contain the encoding [1]; and I guess there are many other examples. If we don't find a direct hint, we could have some magic auto-detection similar to what we do for...
Jan 23, 4:41 am 2008
Jakub Narebski
Re: [RFC/PATCH] git-gui: Use gitattribute "encoding" for fil...
For example LaTeX files either use inputenc package to set encoding (e.g. \usepackage[latin2]{inputenc}) or use magic first line to specify TCX (TeX character translation) file (e.g. %& -translate-file=il2-t1). Emacs encourages to use file variables, either in the form of magic first line, or file variables at the end of file; I think the same is true for Vim. I'd like then for it to be at least as configurable as diff.*.funcname We can at least try to and check for UTF-16 magic firs...
Jan 23, 6:28 am 2008
Jon Smirl
stgit: config option for diff-opts
Could I get a config option added to stgit for diff-opts? So that I can always have git diff -M set on renames. -- Jon Smirl jonsmirl@gmail.com -
Jan 22, 11:04 pm 2008
Karl
Re: stgit: config option for diff-opts
Good idea. I've often needed this myself, without consciously realizing it -- my bash is set to save an infinite amount of history, so Ctrl+R always helps me out ... Will whip up, unless someone beats me to it. It's getting sorta late, so I won't have time for at least a day or two. -- Karl Hasselström, kha@treskal.com www.treskal.com/kalle -
Jan 22, 11:18 pm 2008
Theodore Tso
Re: git on MacOSX and files with decomposed utf-8 file names
I did some research on this point, since if we really are going to be compatible with MacOS X's crappy HFS+ system, we need to know what the decomposition algorithm actually is. Turns out, there are *two* of them. Kevin didn't know what he was talking about. In fact, different versions of Mac OS X use different normalization algorithms. Mac OS X 8.1 through 10.2.x used decompositions based on Unicode 2.1. Mac OS X 10.3 and later use decompositions based on Unicode 3.2.[1] As I correctly pred...
Jan 22, 8:08 pm 2008
Linus Torvalds
Re: git on MacOSX and files with decomposed utf-8 file names
One thing I'd like somebody to check: what _does_ happen with OS X and NFS (OS X as a client, not server)? In particular: - Is it suddenly sane and case-sensitive? - Does the NFS client do any unicode conversion? I tried to google for it, but didn't find the right keywords to get anything useful out of that modern-day internet oracle. Linus -
Jan 22, 8:38 pm 2008
Theodore Tso
Re: git on MacOSX and files with decomposed utf-8 file names
Using a Linux server, and a OS X client, over NFS, it is in case-sensitive. This is not unexpected, since you can mount UFS partitions on Mac OS X, or reformat HFS+ filesystems and make them be Nope: # perl -CO -e 'print pack("U",0x00C4)."\n"' | xargs touch # ls -l | cat -v total 0 0 -rw-r--r-- 1 nobody nobody 0 Jan 22 20:30 M-CM-^D It's pretty clear the Unicode conversion is being done in HFS+, not in the VFS layer of Mac OS X. So presumably if and when Mac OS adopts ZFS, they wil...
Jan 22, 9:33 pm 2008
Mike Hommey
Re: git on MacOSX and files with decomposed utf-8 file names
There must be something at the VFS layer, or some other layer: - IIRC, Joliet iso9660 volumes end up being mounted with files names in NFS when the real file names are NFC on the disk. - Likewise for Samba shares. - When I had my problems with iso9660 rockridge volumes using NFC (you can create that just fine with mkisofs), the volume is mounted without normalisation, i.e. if you get to a shell and want to access files, you must use NFC, but at least the Finder does transliteration at some ...
Jan 23, 2:41 am 2008
Kevin Ballard
Re: git on MacOSX and files with decomposed utf-8 file names
I assume you mean NFD, not NFS, but here's what one of the HFS+ =20 engineers had to say: "In Mac OS X, SMB, MSDOS, UDF, ISO 9660 (Joliet), NTFS and ZFS file =20 systems all store in one form -- NFC. We store in NFC since that what =20= Can you produce a reproducible set of steps for this? Because the =20 Finder shouldn't be doing any of this work on its own, all the =20 Entirely possible, though renormalizing file contents seems a bit less =20= likely. I will point out that the text ...
Jan 23, 4:15 am 2008
Mike Hommey
Re: git on MacOSX and files with decomposed utf-8 file names
Simple : on a Linux host, create files with NFC names, and create an iso image with mkisofs, with rockridge but no joliet. Burn this to a disc, and insert the disc in your OSX host, and try to open files from the finder. Interestingly, IIRC, Finder is able to copy the files, though. As a bonus, try the same with an iso volume name in NFC, it's even better : the created mount point is NFD, but it tries to mount on the name in NFC and fails. And then you just can't eject the CD anymore. Mike ...
Jan 23, 5:40 am 2008
Kevin Ballard
Re: git on MacOSX and files with decomposed utf-8 file names
I was actually asking for you to show this instead of just asserting it, but I realized I have access to an SMB share myself so I just tested. And you're right. That's very curious. I guess they did that because the entire Carbon stack was written assuming NFD (back at the same time HFS+ was created), and they wanted to provide a consistent interface to applications. Since the filesystem already uses NFC, renormalizing to NFD shouldn't lose anything (want the original I was actua...
Jan 23, 12:58 pm 2008
Dmitry Potapov
Re: git on MacOSX and files with decomposed utf-8 file names
Wait, did you tell us some time ago that normalization does not matter and you just need to treat strings "as text"? Now, it looks like the Carbon stack does not treat strings "as text". How come? Maybe, you should stop lying and admit that changing Unicode On Windows, you can create two *different* files -- one with NFC and the other with NFD name. I wonder, how it is going to work with your renormalization back and force. Dmitry -
Jan 23, 1:39 pm 2008
Kevin Ballard
Re: git on MacOSX and files with decomposed utf-8 file names
I'm not sure what you're trying to say here. As near as I can tell, SMB already does encoding conversions itself when talking to different clients, so you can hardly say OS X is doing something bad by converting between local NFD and NFC on SMB. -Kevin Ballard -- Kevin Ballard http://kevin.sb.org kevin@sb.org http://www.tildesoft.com
Jan 23, 1:47 pm 2008
Theodore Tso
Re: git on MacOSX and files with decomposed utf-8 file names
Here's a reliable test case to test filename normalization on Mac OS. ------ cut here ------- cat > test.pl << EOF #!/usr/bin/perl -CO print "M".pack("U",0x00E4)."rchen\n"; print "Ma".pack("U",0x0308)."rchen\n"; EOF chmod +x test.pl ./test.pl | xargs touch echo M* | xxd -g1 ------ cut here ------- On an NFS mounted filesystem, what you will get is this: 0000000: 4d 61 cc 88 72 63 68 65 6e 20 4d c3 a4 72 63 68 Ma..rchen M..rch 0000010: 65 6e 0a ...
Jan 23, 9:38 am 2008
Linus Torvalds
Re: git on MacOSX and files with decomposed utf-8 file names
Well, it demonstrates that (a) the OS and (b) _perl_ don't mangle filenames on non-HFS+ filesystems. The problem is that since most native applications *expect* that name mangling, they'll probably do name mangling of their own (internally) just to compare the names! So I would not be surprised if the globbing libraries, for example, will do NFD-mangling in order to glob "correctly", so even programs ported from real Unix might end up getting pathnames subtly changed into NFD as part ...
Jan 23, 12:16 pm 2008
Kevin Ballard
Re: git on MacOSX and files with decomposed utf-8 file names
Well yes, any context in which a string is treated as Unicode instead =20= of an opaque sequence of bytes will probably lead to normalization at =20= some point (e.g. when searching text, I'm going to want M=E4rchen and =20= M=E4rchen to be treated as the same string). The Mac OS X APIs use NFD, =20= Why would the globbing libraries have to do anything special to =20 understand NFD? In fact, I prefer that they don't - it's very handy to =20= be able to type Ma* and have that match M=E4rc...
Jan 23, 1:19 pm 2008
Martin Langhoff
Re: git on MacOSX and files with decomposed utf-8 file names
Because in a modern Internet-aware world, whoever designs a FS needs to acknowledge that they will need to store files from other systems that have other assumptions. That is, if they want to interoperate. As you noted not long ago, it is a serious problem if an HFS+ partition is shared over NFS. If you look at all the apps that have problems with this aspect of HFS+ , they are all apps that transfer files over the network over diverse protocols. That's why it's a problem with git, because the fi...
Jan 23, 7:37 pm 2008
Jay Soffian
Re: git on MacOSX and files with decomposed utf-8 file names
How about this: it's lossy. It's lossy in a similar sense that TIFF -> JPEG -> TIFF doesn't give you back exactly the same bytes, even though (modulo the compression level) the two TIFFs might be visually indistinguishable. You seem to have an issue with calling this "corruption", but to most of us, if you have a system where you don't get back *exactly the same data* that you put in, then the data has been corrupted. Now, please stop trolling this point, agree to disagree, and either co...
Jan 23, 4:18 pm 2008
Linus Torvalds
Re: git on MacOSX and files with decomposed utf-8 file names
As pointed out (multiple times), this is only true if the programmer is a moron. You do not need to - and *should* not - convert to a common normalization in order to compare to Uncode strings. You should just compare them with a Unicode-aware comparison routine. It will be faster, and it will avoid corrupting the input. Sadly, stupid people are much too common. Linus -
Jan 23, 1:32 pm 2008
Theodore Tso
Re: git on MacOSX and files with decomposed utf-8 file names
Well "touch" actually since that was what was actually creating the files; I only used perl because it was easist way to gaurantee exactly It's worse than that. You can specify at format time whether or not HFS+ does case-sensitivity or not, and of course, there is UFS, which I expect does no Unicode normalization at all, much like NFS. I suspect what you've pointed out is why certain MacOS programs break horribly when run on non-HFS+ filesystems, though. And if that is the case, then those sa...
Jan 23, 1:12 pm 2008
Dmitry Potapov
Re: git on MacOSX and files with decomposed utf-8 file names
I wonder what happens if you do this: touch 'Märchen' echo M*rchen | xxd -g1 Will that produce NFC or NFD? Dmitry -
Jan 23, 4:43 am 2008
Jonathan del Strother
Re: git on MacOSX and files with decomposed utf-8 file names
0000000: 4d 61 cc 88 72 63 68 65 6e 0a Ma..rchen. -
Jan 23, 5:02 am 2008
Dmitry Potapov
Re: git on MacOSX and files with decomposed utf-8 file names
This is NFC! Did you do that on HFS+? If so, it means that shell on Mac also converts filenames to NFC when it reads them from the disk. Dmitry -
Jan 23, 5:12 am 2008
Mike Hommey Jan 23, 5:19 am 2008
Dmitry Potapov Jan 23, 5:32 am 2008
Linus Torvalds
Re: git on MacOSX and files with decomposed utf-8 file names
Ok. That's going to make it both easier and harder for them in the future. In particular, it probably means that their VFS layer really has no notion of this at all, and it's going to be fairly hard to support any kind of I wouldn't hold my breadth on ZFS, considering the memory requirements. ZFS apparently wants *lots* of memory: http://www.solarisinternals.com/wiki/index.php/ZFS_Best_Practices_Guide#ZFS_Administra... http://wiki.freebsd.org/ZFSTuningGuide in fact i...
Jan 22, 9:56 pm 2008
Kevin Ballard
Re: git on MacOSX and files with decomposed utf-8 file names
HFS+ was developed on Mac OS 8, which I believe didn't have the notion of a VFS, or at least not one that would have been in any way capable of doing the case-insensitivity and normalization necessary. However, I'm not sure what you mean by a "backwards compatibility" layer on other filesystems - if you mean treating another filesystem like HFS+, well, if you're using a filesystem that doesn't do normalization then Actually, interestingly the new MacBook Air comes with 2GB stock (I'm ...
Jan 22, 10:02 pm 2008
Kevin Ballard Jan 22, 9:16 pm 2008
Martin Langhoff
Re: git on MacOSX and files with decomposed utf-8 file names
So this bit of insanity can affect users on other OSs too, if they use git on an NFS mountpoint hosted on OSX/HFS+. IIRC Apple does recommend UFS for servers though. I wonder how XServe machines ship by default. m -
Jan 22, 9:27 pm 2008
Martin Langhoff
Re: git on MacOSX and files with decomposed utf-8 file names
Yes. Similarlty with UFS partitions. After much grief with case-insensitivity on OSX I reinstalled the OS on a UFS partition, only to find that most 3rd party apps can't cope with case-sensitive Don't know, unfortunately. I suspect both bits of mangling happen in the fs code. martin -
Jan 22, 9:14 pm 2008
Kevin Ballard
Re: git on MacOSX and files with decomposed utf-8 file names
http://osdir.com/ml/network.gnutella.limewire.core.devel/2003-01/msg00000.= I just finished talking to one of the HFS+ developers, so I suspect I =20= know a lot more on this subject now than you do. Here's some of the =20 relevant information: * Any new characters added to Unicode will only have one form =20 (decomposed), so HFS+ will always accept new characters as they will =20 be NFD. The only exception is case-sensitivity, as the case-folding =20 tables in HFS+ are static, so new character...
Jan 22, 8:38 pm 2008
David Kastrup
Re: git on MacOSX and files with decomposed utf-8 file names
Uh, Ted is a filesystem developer. I can't count the hours I spent talking with my father, a theoretical physicist, but that does not make me qualified to consider myself a better authority on physics than a sub-average actual grad student of the matter. If you don't manage to check your arrogance eventually, you'll be causing more damage to your cause than if you just shut up. You make abundantly clear that you don't understand the _implications_ of the details you may or not may happen to fin...
Jan 23, 4:45 am 2008
Theodore Tso
Re: git on MacOSX and files with decomposed utf-8 file names
Except there *are* problems, because this promise doesn't apply to Unicode 2.1 (Mac OS 10.2 and before) and Unicode 3.2 (Mac OS 10.3 and above). And there were changes between the normalization algorithm between Unicode 3.2 and the Unicode version 4.1. So taking a hard drive between Mac OS X 10.2 and 10.3 *will* cause problems. The guarantees of Unicode stability didn't come until well past Unicode 2.1. Also, I know of no guarantee that there will be no more new compositions. According to Un...
Jan 22, 10:06 pm 2008
Martin Langhoff
Re: git on MacOSX and files with decomposed utf-8 file names
Don't ruin it. You were silent for 12hs and lots of patches and research on the problem started flowing. If you keep making a nuisance of yourself, people will turn from helping you to beating you up for being so annoying. Perhaps help prepare those tests you said it was a good idea to work on. If you manage to stay silent a bit, we'll need them soon ;-) m -
Jan 22, 9:47 pm 2008
Andreas Ericsson
Re: I'm a total push-over..
Insofar as hashes go, it's not that shabby for hashing filenames. Here's the test output from a small hash-comparison program I've got, which runs the test-input through a series of different hashes to compare dispersion, collisions, lookup- and insert times and other things that are interesting from a practical PoV. Fowler/Noll/Vo cheap hash Collisions: 1829, 7.91%. Depth max: 3, average: 0.09. Time spent in lookups: 167.859ms. Per entry: 0.145us Time spent inserting: 2.753ms. Per entry: 0.11...
Jan 23, 4:32 am 2008
previous daytodaynext day
January 22, 2008January 23, 2008January 24, 2008