login
Header Space

 
 

git mailing list

FromSubjectsort iconDate
Stephen R. van den Berg
RFC822 From: fields
I noticed that the From: field generated by git-format-patch does not conform to RFC822 format when the realname contains a dot (like mine). Do we want to fix that in git-format-patch (only), or do we even want to fix that in the stored commit author and committer fields? -- Sincerely, srb@cuci.nl Stephen R. van den Berg. --
Apr 25, 7:51 pm 2008
Stephen R. van den Berg
[PATCH] Simplify and fix --first-parent implementation
--- revision.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/revision.c b/revision.c index 4231ea2..bcfcd2a 100644 --- a/revision.c +++ b/revision.c @@ -415,7 +415,6 @@ static int add_parents_to_list(struct rev_info *revs, struct commit *commit, str { struct commit_list *parent = commit->parents; unsigned left_flag; - int add, rest; if (commit->object.flags & ADDED) return 0; @@ -462,19 +461,18 @@ static int add_parents_to_list(struc...
Apr 25, 2:10 pm 2008
John Wiegley
Problem with git fetch over http://
Hello, I'm using the Builtbot to pull sources from a Git repository, and have found that the Buildbot's Git step always uses git-fetch -- a detail of Buildbot which I currently have little control over. This is no problem if the git:// protocol is used, but using fetch with http:// doesn't work. This has been mentioned elsewhere: http://lists.berlios.de/pipermail/bitbake-dev/2007-November/000765.html Here's a quick example of what I mean: cd /tmp ; mkdir foo ; cd foo ; git init ...
Apr 25, 4:42 pm 2008
Daniel Barkalow
Re: Problem with git fetch over http://
John mentioned on IRC that clone works. $ git-ls-remote http://newartisans.com/git/ledger.git 96751442d9eda537480867e599e4c604663f4530 refs/heads/master 365baca5174232cc35e4ed190fd8ce93c3611c84 refs/heads/v2.4.1 f972a89073843fdbb2a1bef969d9ca70509d4bfe refs/heads/v2.5 6a81d760dc4ab9028b27430124702c28c0b894ed refs/tags/cvs-20040410 fed3956a310a2ea8c8595b7fde7aaa0623492ca6 refs/tags/v0.1 ... $ git-ls-remote git://newartisans.com/ledger.git 96751442d9eda5374808...
Apr 25, 6:04 pm 2008
Junio C Hamano
Re: Problem with git fetch over http://
Wait a minute. How did "git fetch http://host/repo.git" work before C rewrite? The reason I ask is because info/refs traditionally did not list HEAD and fetch either would have failed to start walking from HEAD (iow, the issue was very old), or it didn't care (iow, the issue is a regression after C rewrite). --
Apr 25, 6:29 pm 2008
Daniel Barkalow
Re: Problem with git fetch over http://
I never managed to trace through the shell fetch code, but I suspect that it broke quite a long time ago (git-ls-remote.sh didn't list HEAD for http:// URLs, anyway). clone works because it uses entirely different code, and "git fetch origin" (when origin is an http URL) works, and "git fetch http://... branch" works (and is a workaround), and that's probably all that people use regularly. This only comes up because there's an automated fetch-and-build system that uses "<vcs> command &lt...
Apr 25, 7:35 pm 2008
Junio C Hamano
Re: Problem with git fetch over http://
Is this related to this independent observation? $ wget http://newartisans.com/git/ledger.git --14:23:54-- http://newartisans.com/git/ledger.git => `ledger.git' Resolving newartisans.com... 208.70.150.153 Connecting to newartisans.com|208.70.150.153|:80... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: http://git.newartisans.com//ledger.git [following] --14:23:55-- http://git.newartisans.com//ledger.git => `ledger.git' Resolving...
Apr 25, 5:24 pm 2008
Mike Hommey
Re: Problem with git fetch over http://
Probably, but even then, it also doesn't have a HEAD. Mike --
Apr 25, 5:34 pm 2008
Junio C Hamano
Re: [PATCH 03/11] git-cat-file: Make option parsing a little...
Hmm. Makes one wonder "why not parse-options"?... --
Apr 25, 2:04 pm 2008
Junio C Hamano
Re: [PATCH 01/11] Add tests for git cat-file
"function " noiseword is unnecessary and unportable. echo "\c" is unportable. Traditional trick to do this is to pipe it to tr to strip "\010". When you see "<anything>$@<anything>" in shell scripts, you usually do not mean it, but instead mean "<anything>$*<anything>". It does not make difference if you always feed a single parameter, but it is a good habit It is quite hard to read with backslashes inside dq. Please use single quote pairs without excess backslash...
Apr 25, 2:03 pm 2008
Kevin Ballard
[PATCH] filter-branch: Fix word usage in documentation
The documentation for --commit-filter in git-filter-branch talks about setting multiple parents for the "ancestors of the original commit". This is logically impossible. I believe the intended word was "descendants". Signed-off-by: Kevin Ballard <kevin@sb.org> --- Documentation/git-filter-branch.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt index 9d11b41..1fe2b42 100644 --- a/Document...
Apr 25, 12:16 pm 2008
Jakub Narebski
[RFC] gitweb wishlist and TODO list
This is yet another series of planned gitweb features. It expands more on tasks improving gitweb; new features are mentioned only in general view. Which tasks / features are most requested? Which tasks should be done first? All comments appreciated. 1. Cleanup * HTML: use classes for styling elements. There are still some places where we use presentational HTML elements like <i>. I'd rather have it replaced by adding class to appropriate element, and adding proper rule to CS...
Apr 25, 9:14 am 2008
Jörg
Re: [BUG] --pretty=format does not work ok with rev-list
Hi, Is this a bug? I've the same “problem” in my rebase with merge patch series and added a “|grep -v ^commit”. But if this is a bug, I can remove it. Schöne Grüße, Jörg. -- Viele Leute glauben, dass sie denken, wenn sie lediglich ihre Vorurteile neu ordnen. --
Apr 25, 5:14 am 2008
Junio C Hamano
Re: [BUG] --pretty=format does not work ok with rev-list
I personally do not think the above is a particularly desirable output, but that's how rev-list worked for a long time and existing scripts probably expect it that way. rev-list is for script consumption, and giving --pretty=format that has %H in it would be asking for redundant information. --
Apr 25, 2:24 pm 2008
Christian Couder
[PATCH 5/5] documentation: web--browse: add a note about kon...
This note explains how to work around the fact that we try to use kfmclient to launch konqueror. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- Documentation/git-web--browse.txt | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt index ddbae5b..92ef574 100644 --- a/Documentation/git-web--browse.txt +++ b/Documentation/git-web--browse.txt @@ -20,7 +20,7 @@ The ...
Apr 25, 2:25 am 2008
Christian Couder
[PATCH 4/5] documentation: help: add info about "man.<too...
This patch also describes the current behavior for "konqueror" and how to modify it using "man.<tool>.cmd" if needed. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- Documentation/config.txt | 5 ++++ Documentation/git-help.txt | 48 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index c1c72e7..411e367 100644 --- a/Documentation/config.txt +++ b/Docu...
Apr 25, 2:25 am 2008
Christian Couder
[PATCH 3/5] help: use "man.<tool>.cmd" as custom man v...
Currently "git help -m GITCMD" is restricted to a set of man viewers defined at compile time. You can subvert the "man.<tool>.path" to force "git help -m" to use a different man, viewer, but if you have a man viewer whose invocation syntax does not match one of the current tools then you would have to write a wrapper script for it. This patch adds a git config variable "man.<tool>.cmd" which allows a more flexible man viewer choice. If you run "git help -m GITCMD" with the "man.viewer...
Apr 25, 2:24 am 2008
Christian Couder
[PATCH 2/5] documentation: help: add "man.<tool>.path"...
This patch documents the "man.<tool>.path" configuration variable. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- Documentation/config.txt | 4 ++++ Documentation/git-help.txt | 9 +++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index b109bdf..c1c72e7 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -773,6 +773,10 @@ man.viewer:: Specify the programs that ...
Apr 25, 2:24 am 2008
Christian Couder
[PATCH 1/5] help: use man viewer path from "man.<tool>...
This patch implements reading values from "man.<tool>.path" configuration variables, and using these values as pathes to the man viewer <tool>s when lauching them. This makes it possible to use different version of the tools than the one on the current PATH, or maybe a custom script. In this patch we also try to launch "konqueror" using "kfmclient" even if a path to a konqueror binary is given in "man.konqueror.path". The "man_viewer_list" becomes a simple string list to simplify ...
Apr 25, 2:24 am 2008
Bill Lear
Branch "ahead of tracked remote branch"
I had some work in master, I decided to move to a branch to complete, so: % git checkout -b branch % git commit -a -m "Insightful message" Then, I decided this was not such a good idea, so I did a git reset --soft HEAD^, then git reset HEAD for each file I committed, thinking that this was a complete "undo". I then switched to branch master and got this: Switched to branch "master" Your branch is ahead of the tracked remote branch 'origin/master' by 1 commit. I'm not sure this is accurate...
Apr 24, 10:03 pm 2008
Daniel Barkalow
Re: Branch "ahead of tracked remote branch"
It's certainly possible. It looks like you committed once on your own master branch before you did any of the things mentioned in this message. Then you created a new branch, made a commit on it, undid the commit, and switched back to "master". "git log origin/master..master" will show you the 1 commit that you have on master. -Daniel *This .sig left intentionally blank* --
Apr 24, 11:59 pm 2008
Bill Lear
Re: Branch "ahead of tracked remote branch"
Ah, ok, now I think I understand --- if I do a fetch (or pull) on master, switch over to the other branch, and then back, I see no such message. Thanks. Bill --
Apr 25, 12:39 pm 2008
Stephen Hemminger
submodules and branches
Our CM team likes to use both submodules and branches and it doesn't always work cleanly. Some examples: 1. The new release on branch "next_release" adds a submodule, but then the submodule shows up on all branches including the production branch. 2. For next release on branch "next_release" a submodule was renamed by moving the target directory, but now git submodule update makes two copies. Git generally does a good job of tracking renames and deletions, so the fact that submodules leave stu...
Apr 24, 8:41 pm 2008
René Scharfe
Re: [PATCH/RFC] More colors for pretty format: yellow, purpl...
Hmm. Currently you can get the same effect by adding the escape codes to the format string directly. Arguably, --pretty=format should honour the config variable color.diff and the options --color and --no-color to make the colour placeholders useful (both your extended set and the current one). René --
Apr 25, 4:42 pm 2008
Jakub Narebski
Re: [PATCH 5/5] Introduce fast forward option only
I'd rather have description of the change in the commit message itself. You can add "See the documentation for details", but the basic description, like: This commit introcudes fast forward option 'only'. With --ff=only merge succeeds only if it resolves to fast-forward merge. It would be nice to have described either in commit message, or in the documentation, _why_ it is needed for integration with AccuRev, i.e. what features of AccuRev or of integration requires this. -- Jakub ...
Apr 25, 6:46 am 2008
Junio C Hamano
Re: [PATCH 5/5] Introduce fast forward option only
Including this message, I agree with what Jakub said as comments to this series. Readers of "git log" 6 months from now should not have to suffer "See Documentation", and reviewers of this series right now should not have to guess why it is a good idea and is worth reviewing by actually reading the patch. --
Apr 25, 2:59 pm 2008
Sverre Hvammen Johansen
Re: [PATCH 5/5] Introduce fast forward option only
It will probably take more than a week before I have time to look into this as I am out of town this weekend. I will then rebase the patches on top of 1.5.5.1, test them, and send them as attachments to one mail. -- Sverre Hvammen Johansen --
Apr 25, 5:00 pm 2008
Jakub Narebski
Re: [PATCH 4/5] Head reduction before selecting merge strategy
I think I get the idea now. You want to generalize fast-forward merge, or what's equivalent make fast-formard merge to be special case of head reduction. This should be written both in commit message and in documentation. Do I understand your goal correctly? With head reduction comes three things: * the merge strategy used * recorded parents * generated merge commit message The simplest way would be to use reduced head for all three things, I think. But I also think that this commit ...
Apr 25, 6:31 am 2008
Jakub Narebski
Re: [PATCH 1/5] New merge tests
I think you should describe here _what_ is tested by the new test(s), and how it is named. It would be nice to have 1 or 2 lines description of those functions, perhaps with calling convention. See for example comments in What are conventions used by other tests? Somehow I doublt is is "[OOPS]"... Instead of if test $(git ls-files -u | wc -l) -gt 0 you should write IMHO if test -n "$(git ls-files -u)" or just if test "$(git ls-files -u)" It would be nice if y...
Apr 25, 5:37 am 2008
Eric Wong
Re: Speed up git-svn fetch
Thanks for following up on this, the Perl bits look good to me[1]. I commented in a separate email about the shell incompatibilities I experienced. Trivial fix: --- a/hash-object.c +++ b/hash-object.c @@ -6,6 +6,7 @@ */ #include "cache.h" #include "blob.h" Ugh, you added long (>80 char) lines to this and I'm having trouble following it. I believe the git (like Linux) coding style calls for 80 char lines unless there is really no other way[2]. This is also a gcc isn't smar...
Apr 25, 3:15 am 2008
Eric Wong
Re: [PATCH 01/11] Add tests for git cat-file
The "function " keyword is a bashism and not needed, this breaks I guess we have different bash versions/options, because this breaks for me in bash (3.1dfsg-8 from Debian etch). It would need -e to handle to handle escape sequence, but that's a bashism, too. Use printf "$@" here instead. So yes, this test was broken in both dash and bash for me without the above fixes. -- Eric Wong --
Apr 25, 2:56 am 2008
Junio C Hamano
Re: [PATCH 01/11] Add tests for git cat-file
Looking at the callers, I do not think you want that. I would suggest something defensive like: printf '%s' "$*" --
Apr 25, 2:06 pm 2008
Jeffrey Ollie
Re: Problems importing from Apache SVN
Huh, I see the same thing. Anyone have any clues? I normally use "git svn init", edit the .git/config to customize what's getting pulled and then use "git svn fetch" from there, so I'm not usually using "git svn clone". Jeff --
Apr 25, 12:07 pm 2008
Jakub Narebski
Re: Welcome to Git's GSoC 2008!
I have found three another Git-related Google Summer of Code 2008 projects by other organizations: Git plugin for Anjuta IDE (GNOME) KDevelop DVCS support (KDE) Git# implementation (Mono Project) Info from Shawn message, and above info can be found on git wiki at http://git.or.cz/gitwiki/SoC2008Projects -- Jakub Narebski Poland ShadeHawk on #git --
Apr 25, 12:46 pm 2008
Shawn O. Pearce
Re: git-gui hangs on read
Indeed. The git-gui options dialog lets you select this value, but you can't get into git-gui far enough to open that dialog. As far as documenting the git-gui options, maybe they should go into either Documentation/git-gui.txt or into Documentation/config.txt in the main git.git project. The latter almost makes sense because git-gui does store its preferences in the same config file, and that file describes the valid keys and what they mean. -- Shawn. --
Apr 24, 9:02 pm 2008
Gustaf Hendeby
Re: git-gui hangs on read
My first thought about the documentation was to put it in Documentation/config.txt but wouldn't that be strange if someone uses a git-gui other than the one bundled with the git version used? On the other hand, if the keys don't ever change that is not a big problem. I'll try to have a go at writing some docs, but it won't be until late next week because my daytime work is killing me right now. /Gustaf --
Apr 25, 2:45 am 2008
Jörg Sommer
[PATCH v2] Make mark parsing much more restrictive
The current implementation of mark parsing doesn't care for trailing garbage like in :12a and doesn't check for unsigned numbers, i.e. it accepts :-12 as a valid mark. This patch enforces a number follows the colon and there comes nothing after the bignum. Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de> --- fast-import.c | 49 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 38 insertions(+), 11 deletions(-) Then I propose the following patch. diff --git a/fas...
Apr 25, 5:04 am 2008
Jörg
Re: [PATCH v2 04/13] Teach rebase interactive the mark command
Hi Junio, I think it should be the other way: unremovable marks should leave the DOTEST behind. This way a rebase should refuse to start a new session and stumble accross the old marks and it's possible to run git rebase --abort after manually removing the marks. Bye, J=F6rg. --=20 Damit das M=F6gliche entsteht, mu=DF immer wieder das Unm=F6gliche versucht werden. (Hermann Hesse)
Apr 25, 5:11 am 2008
Jörg Sommer
[PATCH v2.2] Teach rebase interactive the mark command
This new command can be used to set symbolic marks for an commit while doing a rebase. This symbolic name can later be used for merges or resets. The decision to use references for the marks and not files like done with the rewritten commits for preserve merges was made to ensure no commit objects get lost if prune is started while (a long term) rebase is running. This also unifies the checking of the validity of marks and references by using rev-parse for it. The format of the marks is as close...
Apr 25, 5:44 am 2008
previous daytodaynext day
April 24, 2008April 25, 2008April 26, 2008
speck-geostationary