git mailing list

FromSubjectsort iconDate
Petr Baudis
[PATCH] Do not ignore hidden refs
Some of the ref manipulation tools (git-for-each-ref and git-show-ref in particular) would not handle hidden (~ /^\./) refs. This may be an acceptable or possibly even desirable behaviour for the ref walkers and repackers, but git-show-ref hiddenrefname must work. This makes Git not ignore hidden refs at all. I'm not opposed to making some particular parts of the ref interface to continue to ignore hidden refs, but the restriction cannot be so deep. Signed-off-by: Petr Baudis <pasky@suse.cz&gt...
Nov 18, 12:11 am 2006
Junio C Hamano
Re: [PATCH] Do not ignore hidden refs
refs.c::check_ref_format() seems to suggest that any ref whose path component begins with a dot is invalid (since October last year), so I am a bit surprised you are bringing this up now. Do you know of specific examples where this is not enforced? It could even be argued that the places in the system that allow such a ref are buggy. I do not recall why we decided that this particular restriction was needed (I do understand the other three restrictions --- see commit log of 03feddd6), although...
Nov 18, 12:39 am 2006
Petr Baudis
Re: [PATCH] Do not ignore hidden refs
Cogito creates such refs for internal purposes in two scenarios, on the other hand it could be argued that in one of those cases the file has no business in refs/ at all (temporary fetching refs, but they may be actually symrefs) and in the other case it has no business in refs/heads/ at all (pointers to shelved changes in a branch). However, I in fact *did* intend to make leading-dot refnames a public interface. The thing is, I need a way to mark some tags as private to your repository if Cogi...
Nov 18, 12:53 am 2006
George Sherwood
http git and curl 7.16.0
I seem to be having a problem doing an http checkout with git built with curl 7.16.0 enabled. If I build against curl 7.16.0 and try a clone, I get: git clone http://dmlb2000.homelinux.org/~dmlb2000/git-repos/local/castfs.git error: Unable to start request error: Could not interpret heads/master as something to pull If I rebuild git against curl 7.15.5 then I get: git clone http://dmlb2000.homelinux.org/~dmlb2000/git-repos/local/castfs.git got 9a985de4a4cfa973a4573828df4cbb2e4f66c419 walk 9a9...
Nov 18, 12:07 am 2006
Petr Baudis
[PATCH] Fix git-for-each-refs broken for tags
Unfortunately, git-for-each-refs is currently unusable for peeking into tag comments, since it uses freed pointers, so it just prints out all sort of garbage. This makes it strdup() contents and body values. Signed-off-by: Petr Baudis <pasky@suse.cz> --- builtin-for-each-ref.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c index 173bf38..227aa3c 100644 --- a/builtin-for-each-ref.c +++ b/builtin-for-each-ref...
Nov 17, 10:56 pm 2006
Junio C Hamano
Re: [PATCH] Fix git-for-each-refs broken for tags
Thanks for noticing. This is not like rev-list where we walk all over the map of ancestry graph, so it might be a simpler and better to keep the buffer than to keep duplicate copies of pieces. -
Nov 18, 12:45 am 2006
Petr Baudis
Re: [PATCH] Fix git-for-each-refs broken for tags
I would rather not do that in any new code since it's gonna be a problem if you use this outside of the standalone command as part of libgit. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ The meaning of Stonehenge in Traflamadorian, when viewed from above, is: "Replacement part being rushed with all possible speed." -- Kurt Vonnegut, Sirens from Titan -
Nov 18, 12:54 am 2006
Bobbi Jones
New software uploaded by Victor on Nov 18 05:00:00 MSK 2006
Victor has uploaded some new software for you! Click here to view available updated software from Victor: http://deda-baba.org/?Victor # cd databases J. Random Provider specify: 0xd8 read - NS16450 use this script instead: and modify it by for more info. When parity is enabled, setting this To single-step the kernel, try man/man1/oneko.1.gz prompt at the specified initial line speed. getty watches to see if delta is applied to it instead. This way the foo/bar.c file can...
Nov 17, 10:16 pm 2006
Chris Riddoch
[PATCH] Move --pretty options into Documentation/pretty-form...
Asciidoc-include it into the manuals for programs that use the --pretty command-line option, for consistency among the docs. Signed-off-by: Chris Riddoch <chris@syntacticsugar.org> --- Documentation/git-diff-tree.txt | 7 +++---- Documentation/git-log.txt | 3 +-- Documentation/git-rev-list.txt | 6 +----- Documentation/git-show.txt | 5 +---- Documentation/pretty-formats.txt | 29 +++++++++++++++++++++++++++++ 5 files changed, 35 insertions(+), 15 deletions(-...
Nov 17, 8:58 pm 2006
Junio C Hamano
Re: [PATCH] Move --pretty options into Documentation/pretty-...
Beautiful, although I doubt we would want to spell out the exact output format in that documentation (if so you would need to talk about Merge: entries that we conditionally give and how commit object names are abbreviated and such). On the other hand, we might want to talk about Merge: entries anyway to say the values can be affected by merge simplification. Independent of the above concerns, I trust somebody else will follow this up with a patch to describe missing pretty formats? -
Nov 17, 9:15 pm 2006
Star Allen
New software uploaded by Gary on Nov 18 03:20:00 MSK 2006
Gary has uploaded some new software for you! Click here to view available updated software from Gary: http://mama-papap.org/?Gary machine ``i386'' authentication and to forward packets, possibly on a multi-homed total 337.00 154 $ 6.74 4 7 CA 105 RTS DTE Request to Send conversion of newlines, and more. But there is no way to specify a ll recommended. -m Send mail after completing the print job. With this option, the these or any of the formatting options ...
Nov 17, 8:41 pm 2006
Jakub Narebski
Re: [DRAFT] Branching and merging with git
linux@horizon.com wrote: See commit d425142e2a045a9dd7879d028ec68bd748df48a3 (most legged octopus I found in git.git repository). Doing git-rev-parse --parents -all, or git log --all and greppoing for merges is a good idea to find octopi. The commit is both v1.1.2-gd425142 (git describe) and tags/v1.2.0^0~143 (git name-rev --tags) -- Jakub Narebski Warsaw, Poland ShadeHawk on #git -
Nov 17, 8:32 pm 2006
Petr Baudis
Re: [DRAFT] Branching and merging with git
It's not about documentation but ease to use. I agree and sympathise very much with the effort of making core Git more easy to use and obsoleting Cogito, but until it gets there we should have what's nicest If someone writes a crash course in pure Git covering the same grounds as the current ones (possibly by just extending/retouching the tutorial) (it does not necessarily need to be a "refugee" crash course, it can build up from scratch), I can add it on the web. If it becomes as easy to use and...
Nov 17, 5:31 pm 2006
Sean
Re: [DRAFT] Branching and merging with git
On Fri, 17 Nov 2006 22:31:26 +0100 As some new users have already tried to tell you, it's confusing for _them_ when they're trying to learn Git to be confronted with Cogito documentation. The way we're going to get Git to be better is to expose new people to it and respond to their comments, complaints and ideas about how to make it better and easier to understand as they get up to speed. Having Cogito plastered all over the Git website as the _easy_ alternative is counterproductive to that e...
Nov 17, 7:30 pm 2006
Chris Riddoch
Re: [DRAFT] Branching and merging with git
As a relatively new user myself, I ran into the same confusion when I came to the website for the first time. One of the most prominent things on the front page is the "Git Crash Courses." Clicking on that gives me the crash courses, all of which are about Cogito, not for Git. So why doesn't the front page say "Cogito Crash Courses" instead? And I don't think it matters much whether Cogito makes things easier or not -- the Git website really should make Git's documentation more prominent than...
Nov 17, 6:36 pm 2006
Petr Baudis
Re: [DRAFT] Branching and merging with git
I think the difference here is the Git _tool_ vs. the Git version control system. Cogito is an element of the second: To use Git, you can either use the Git tool or the Cogito tool or the StGIT tool or even just the qgit tool (which also lets you inspect the working copy and commit). I believe the tool best suited for general usage by newbies _at this point_ is Cogito, so that's what I use for introduction to Git. I'm not saying this is ideal situation and I and others are/will be working to fix it...
Nov 17, 6:50 pm 2006
Jakub Narebski
Re: [DRAFT] Branching and merging with git
But it is encouraged (also for example by git-completion.bash) to use "git foo" form in command line (because git commands can be not in the PATH, It would be useful to cover all non-reductible cases of recursive merge strategy (the default merge strategy for two-head merges) conflicts: contents (covered), add/add, rename/modify etc. So some info about recirsive merge strategy would be useful. -- Jakub Narebski Warsaw, Poland ShadeHawk on #git -
Nov 17, 2:16 pm 2006
Jakub Narebski
[RFC] gitweb TODO
These are a few gitweb issues and features I'm currently working on (or plan working on). 1. New patchset view (commitdiff, blobdiff) In "old" gitweb commitdiff view was generated by iterating over lines of git-diff-tree raw format output, and generating diffs using git-cat-file and external diff utility (/usr/bin/diff). This required having temporary directory for diff generation, and of course diffs didn't have extended git headers. The "new" commitdiff view is generated from single git...
Nov 17, 2:01 pm 2006
Junio C Hamano
Re: [RFC] gitweb TODO
This is the most appropriate. Right now it is not independently controllable but it is not so inplausible for somebody to want to get non recursive view of 'raw' part along with textual diffs when running "--raw -p" diff and your solution c. is robust against even such changes. I would probably not call that "caching" but keeping track of where you are, and you would need to know in which filepair you are in anyway when you want to implement links to blob view from I am not sure what's more u...
Nov 17, 3:22 pm 2006
Jakub Narebski
Re: [RFC] gitweb TODO
What about the fact that git-diff -M is _not_ patch-compatibile; does creating two patches for one difftree raw format line for mode change/'T' status (I guess only for "type" mode changes, i.e. file to/from symlink, file to/from directory) helps understanding the change? If not, perhaps it would be better to introduce option I'd say "buffering" rather than "caching". The problem is that you have to read up to the "index <hash>..<hash>[ <mode>]" to check if you have to go to the...
Nov 17, 4:30 pm 2006
Junio C Hamano
Re: [RFC] gitweb TODO
What about it? I've never said patch compatibility is an issue. We have something patch cannot represent or understand and you should admit it. The point is to make it easier to massage by hand, when the recipient does not have git handy. With -M, the recipient can read and understand the patch text better than "remove this oldfile and create this newfile that the diff output does not tell you is related" diff. And we say "rename" in plain language so the recipient _can_ do "mv A B" then "pat...
Nov 17, 5:08 pm 2006
Jakub Narebski
Re: [RFC] gitweb TODO
So we split patch for "type change" mode change for patch -p1 safety. But for gitweb more important than producing safe patch is producing _readable_ patch[*1*]. Hence request for -T option (or under other, better name) to git-diff which would _not_ split patch (not create two patches for one raw difftree line). Sorry, perhaps I was not clear. I'd like for git-diff-tree --cc --raw -p to output both raw part (perhaps taken from -c) and patch part[*2*]. Gitweb needs raw part for both whatchange...
Nov 17, 5:24 pm 2006
Junio C Hamano
Re: [RFC] gitweb TODO
Honestly, I do not have strong feeling either way. As you say, I suspect diff to change between symlink and regular file is not readable no matter how you present it, and it is a corner case that is not very interesting. It happens in real life but it is rare enough that split patches or a single patch would not make much difference either way. So I would not oppose to a patch to add an option to update git-diff to produce either format, but I doubt it is worth the effort required to make sure...
Nov 17, 8:04 pm 2006
Petr Baudis
Re: [DRAFT] Branching and merging with git
It doesn't - look at the "Maintaining external patches" crash course. Porcelains are integral part of the Git environment. I think several people have already tried to explain it before. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ #!/bin/perl -sp0777i<X+d*lMLa^*lN%0]dsXx++lMlN/dsM0<j]dsj $/=unpack('H*',$_);$_=`echo 16dio\U$k"SK$/SM$n\EsN0p[lN*1 lK[d2%Sa2/d0$^Ixp"|dc`;s/\W//g;$_=pack('H*',/((..)*)$/) -
Nov 17, 12:53 pm 2006
Sean
Re: [DRAFT] Branching and merging with git
On Fri, 17 Nov 2006 17:53:33 +0100 There is enough native Git documentation and hopefully more coming that third party tools should be pushed behind the scenes a bit. At least on the GIT website. Of course there is nothing wrong with having information there, but the main thrust should be about Git and how to use it directly without porcelains. Especially in the light that people have recently expressed a desire to advocate and document the use of native Git more strongly. Having a link to C...
Nov 17, 1:01 pm 2006
Jakub Narebski
Re: Cleaning up git user-interface warts
git diff --root HEAD, perhaps? -- Jakub Narebski Warsaw, Poland ShadeHawk on #git -
Nov 17, 9:45 am 2006
Jakub Narebski
Re: Cleaning up git user-interface warts
What about proposed (and I think not accepted) merge strategy "rebase" (formerly called "subordinate" or something like that)? -- Jakub Narebski Warsaw, Poland ShadeHawk on #git -
Nov 17, 9:32 am 2006
Alexandre Julliard
Re: Cleaning up git user-interface warts
That sounds very interesting. Has it ever been implemented, or only discussed? -- Alexandre Julliard julliard@winehq.org -
Nov 17, 12:49 pm 2006
Jakub Narebski
Re: Cleaning up git user-interface warts
There was some implementation with warts http://thread.gmane.org/gmane.comp.version-control.git/30068 Message-Id: <20061025155009.GD5591@parisc-linux.org> which didn't got corrected and resent. -- Jakub Narebski Poland -
Nov 17, 1:41 pm 2006
Jakub Narebski
Re: Cleaning up git user-interface warts
Han-Wen Nienhuys wrote: > As another example:
Nov 17, 9:25 am 2006
Jakub Narebski Nov 17, 8:53 am 2006
Jakub Narebski
Re: Cleaning up git user-interface warts
> created only by "git clone" or by hand.
Nov 17, 8:25 am 2006
Jakub Narebski
Re: [DRAFT] Branching and merging with git
> You can specify what to fetch on the git-fetch command line.
Nov 17, 6:37 am 2006
Nicolas Vilz
Re: git-PS1 bash prompt setting
That one did the job... funny, removing these two // did the job, for both versions, GNU bash, version 3.1.17(1)-release (powerpc-unknown-linux-gnu) and GNU bash, version 3.2.5(1)-release (x86_64-pc-linux-gnu). Thx for fixing that script. It really helps me. Sincerly Nicolas -
Nov 17, 5:52 am 2006
Jakub Narebski
Re: [DRAFT] Branching and merging with git
linux@horizon.com wrote: > There is always a current head, known as HEAD.
Nov 17, 5:41 am 2006
Jakub Narebski
Re: [DRAFT] Branching and merging with git
> object ID, plus a newline.
Nov 17, 5:37 am 2006
Nicolas Vilz
Re: git-PS1 bash prompt setting
Just a note: this doesn't work with bash 3.2. I think they altered the way of trimming variables in this version. on systems with bash 3.2 installed, i get [master!linus-2.6/vm/vm]$ with the example above. on systems with bash 3.1, it works properly. unfortunatelly, i am not so good in bash scripting, so it will take some time for me to fix it. Sincerly Nicolas -
Nov 17, 4:38 am 2006
Sean
Re: git-PS1 bash prompt setting
On Fri, 17 Nov 2006 09:38:02 +0100 Sorry bout that, I knew it was a bit fragile. Was rather comical reading Junio's recent message about all the things not to do if you want portable shell code and noticing my 6 line script did 90% of them ;o) Strange though, I downloaded Bash 3.2 and gave it a try and didn't see the problem here.. Wanna try this small change, to see if it helps? : #!/bin/bash BR=$(git symbolic-ref HEAD 2>/dev/null) || { echo "$@" ; exit ; } BR=${BR#refs/heads/} REL=$(g...
Nov 17, 5:20 am 2006
Junio C Hamano
Re: [PATCH] Make "git checkout <branch> <path>" ...
Actually it is not pushed out anywhere yet but will appear on both 'maint' and 'master' along with other post 1.4.4 fixes and will be contained in the 1.4.4.1 maintenance release. The role of each branch at my public repository is desribed in this message: Message-ID: <7vk62qhy4k.fsf@assigned-by-dhcp.cox.net> http://article.gmane.org/gmane.comp.version-control.git/29951 In general, if your changes and fixes are applicable in isolation to "master", it is most appropriate to send patch...
Nov 17, 4:15 am 2006
Linus Torvalds
"git fmt-merge-msg" SIGSEGV
Ok, this is a _really_ stupid case, and I don't think it matters, but hey, we should never SIGSEGV. Steps to reproduce: mkdir duh cd duh git init-db git-fmt-merge-msg < /dev/null will cause a SIGSEGV in cmd_fmt_merge_msg(), because we're doing a strncmp() with a NULL current_branch. And yeah, it's an insane schenario, and no, it doesn't really matter. The only reason I noticed was that a broken version of my "git pull" into an empty directory would cause this. This silly p...
Nov 17, 2:57 am 2006
Michael K. Edwards
[PATCH] Make "git checkout <branch> <path>" work...
This improves the workflow for, say, kernel subsystem backporting. Signed-off-by: Michael K. Edwards <medwards-linux@gmail.com> --- git-checkout.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/git-checkout.sh b/git-checkout.sh index dd47724..5866604 100755 --- a/git-checkout.sh +++ b/git-checkout.sh @@ -106,7 +106,8 @@ Did you intend to checkout '$@' which ca git-ls-tree --full-name -r "$new" "$@" | git-update-index --index-info || exit $? fi - gi...
Nov 17, 1:49 am 2006
Junio C Hamano
Re: [PATCH] Make "git checkout <branch> <path>" ...
Thanks. I think I sent out the same yesterday morning, though. Message-ID: <7vbqn8msuw.fsf@assigned-by-dhcp.cox.net> The difference is that the one tries to catch misspelled <path>. -
Nov 17, 2:04 am 2006
Michael K. Edwards
Re: [PATCH] Make "git checkout <branch> <path>" ...
Ah. Missed that patch, which is indeed a superset of mine. Looks like you committed it on branch "next"; is that a personal experimental branch, or the integration branch against which patches should be generated? Cheers, - Michael -
Nov 17, 2:18 am 2006
linux
Re: multi-project repos (was Re: Cleaning up git user-interf...
"The only intuitive user interface is the nipple; all else is learned." As Linus is explaining, the fundamental *problem* is the mental model. Once you know how to break your goals apart into the right kind of pieces, little things like terminology are truly little. I'm not sure that git is sufficiently like anything else that a few well-chosen command names can bring a good analogy to mind. There just isn't a simple analogy that won't lead you astray; you have to understand the thing on its o...
Nov 17, 1:11 am 2006
Johannes Schindelin
Re: multi-project repos (was Re: Cleaning up git user-interf...
Hi, I show him how to use it. And that's actually a fine analogy: While the principle of a screw is quite clever, working with it -- even with an electric screwdriver -- is easy. And the most important part: I never read instructions on how to use it. I saw somebody use it and -- voila! -- I I think that the importance of documentation is overrated. Users have come to expect to use programs without reading a manual. DWIM comes to mind. Ciao, Dscho -
Nov 17, 6:02 am 2006
Sean
Re: multi-project repos (was Re: Cleaning up git user-interf...
On 17 Nov 2006 00:11:57 -0500 The thing is that other SCM's like hg look a lot more like a nipple than Git. And they have the same conceptual models, more or less, to deal with as Git. So why is it so many people think Git has a UI problem where the same complaint isn't levelled at Mercurial? The thing is, the focus of Git has been different, it's been about creating great plumbing. It's had great success at doing that, and anyone who warms up to Git is well rewarded with a tool that gives th...
Nov 17, 1:42 am 2006
J. Bruce Fields
Re: [DRAFT] Branching and merging with git
This has some useful material that fills gaps in the existing documentation. We need to think a little more about the intended audience, and about how to fit it in with existing documentation. Who's the audience for the above? I can see that it's useful for administrators, who may need help deciding how to install stuff, and for developers, who need to know where the heck the code for "git-add" came from. But the case I'm most interested in is the user whose distribution installs git for them,...
Nov 17, 1:44 pm 2006
Theodore Tso
Re: [DRAFT] Branching and merging with git
This is really, really good stuff that you've written! Have you any thoughts or suggestions about where this text should end up? Personally, I think this information is actually more important to an end-user than the current "part two" of the tutorial, which discusses the object database and the index file. Perhaps this should be "part 2", and the object database and index file should become "part 3"? It might also be a good to consider moving some of the "discussion" portion the top-level gi...
Nov 17, 11:32 am 2006
J. Bruce Fields
Re: [DRAFT] Branching and merging with git
Yeah, the really difficult problem here is figuring out how to organize the documentation. There are a few needs: 1. Quick-start/task-based documentation - We want to "sell" git to the beginning user by getting them up and running as quickly as possible. - We need to help people with some limited needs-- testers who just need to download the latest linux git tree, or bisect, or whatever. - It's also a fun way to demonstrate the richness of some git features (e.g. history...
Nov 17, 2:21 pm 2006
linux
Re: [DRAFT] Branching and merging with git
I'm working on incorporating all of the comments I've received, so thank you all! (BTW, the reason I didn't document git-describe is that I didn't know about it! You fixed the latter, so I'll fix the former.) I'm glad if others like it, but I was really scratching my own itch. I'm still wrapping my head around how to work with git, and writing this was my own learning experience. Even writing it out in full rather than as rougher notes wasn't an entirely unselfish act; it ensures: 1) I do...
Nov 17, 8:13 pm 2006
previous daytodaynext day
November 16, 2006November 17, 2006November 18, 2006