git mailing list

FromSubjectsort iconDate
Junio C Hamano
Re: [PATCH] Update, and clear up the pack format documen ...
Your understanding is correct. Throughout the pack-objects program, delta_size is always expressed in uncompressed number of bytes. The original description you quoted above does not even say "the size of the delta data (compressed)", so in that sense I do not think the original description is really an error; if the update makes the description Hmm. This is just terminology, but I think calling ref-delta and ofs-delta "type of object", is confusing. This "type" field is about ...
Apr 5, 4:58 pm 2008
Pat Maddox
How do I set the committer with cherry-pick? (or is ther ...
I'm helping to maintain a project, so people send me requests to pull from their repos. So I create a branch and then pull their stuff in, taking a look at the various different commits. I write the commit numbers that I want to cherry pick to a file (also is there a better way of handling this? it's a bit tedious. it'd be nice to mark certain commits for cherry picking and then suck them all in later). Then when I've gone through all the new commits and chosen the ones I want, I check out ...
Apr 5, 4:42 pm 2008
Pat Maddox
Updating submodules
Do I need to cd into each submodule dir and fetch/rebase? git submodule update doesn't seem to do anything, though I would assume it's used to update the submodules... Pat --
Apr 5, 3:46 pm 2008
Pat Maddox
Re: Updating submodules
Okay. So I've got a parent repo with three submodules. I've been working in one submodule and have been committing changes. Now I wanted to get the latest changes upstream...I have to rebase that repo individually, right? Pat --
Apr 5, 4:08 pm 2008
Avery Pennarun
Re: Updating submodules
Yes. Be careful of which branch your submodule is on; if "git submodule update" has done anything in the past, you might not be on a branch at all, in which case you have to create a local branch with your changes before you can safely rebase or push. Avery --
Apr 5, 4:11 pm 2008
Avery Pennarun
Re: Updating submodules
"git submodule update" updates each submodule to the version that was checked into the supermodule. It doesn't do anything like fetch, rebase, or pull. Avery --
Apr 5, 4:01 pm 2008
Peter Eriksen
[PATCH] git-pack-objects.txt: Make wording slightly less ...
It is a bit confusing on first read, that "The packed archive format (.pack) is designed to be unpackable..." Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> --- Documentation/git-pack-objects.txt | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index eed0a94..3a1be08 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -22,8 ...
Apr 5, 12:46 pm 2008
Kevin Ballard
[PATCH] git-fetch: Don't trigger a bus error when given ...
When git-fetch encounters the refspec "tag" it assumes that the next argument will be a tag name. If there is no next argument, it should die gracefully instead of erroring. Signed-off-by: Kevin Ballard <kevin@sb.org> --- builtin-fetch.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/builtin-fetch.c b/builtin-fetch.c index a11548c..5841b3e 100644 --- a/builtin-fetch.c +++ b/builtin-fetch.c @@ -637,6 +637,8 @@ int cmd_fetch(int argc, const char **argv, const char ...
Apr 5, 11:28 am 2008
Kevin Ballard
Re: [PATCH] git-fetch: Don't trigger a bus error when gi ...
So that `git fetch origin tag` will try and fetch the branch named tag? Given that we treat "tag foo" as shorthand for refs/tags/foo:refs/ tags/foo it seems like it would be unexpected to treat "tag" as just a plain ref. I much prefer to die in this situation, let the user fix the refspec to mean exactly what they want (either by adding a tag name, or by using tag: if they really want a branch named tag). -Kevin -- Kevin ...
Apr 5, 11:46 am 2008
Johannes Schindelin
Re: [PATCH] git-fetch: Don't trigger a bus error when gi ...
Hi, Would it not be better to check in the if() above? IOW if (i + 1 < argc && !strcmp(argv[i], "tag")) { Hmm? Ciao, Dscho --
Apr 5, 11:33 am 2008
Peter Eriksen
[PATCH] Update, and clear up the pack format documentati ...
The current documentation does not mention the ofs_delta pack object type. This patch is also supposed to make the text a bit more readable, since it moves the object entry header description earlier. I fixes one error in these lines: If it is DELTA, then 20-byte base object name SHA1 (the size above is the size of the delta data that follows). The size given in the object header is actually the inflated size of the delta data that follows, since the call ...
Apr 5, 11:07 am 2008
Junio C Hamano
Re: git clone error
The original repository you are cloning from is owned by somebody else, and a file in it is not readable by you. Bad. No, .keep is not a stale lock. It is active and valid --- do not remove it --- it prevents the corresponding pack from being subject to repacking. The bug is that index-pack.c::final() tries to make the resulting pack and idx readable with chmod(0444), but it forgets to make .keep readable. To unblock you, you would need to ask the user "dab143" to make the repository ...
Apr 5, 1:09 pm 2008
Chuck Ritter
git clone error
Hello, I'm getting an error when I try to clone a git repo: $ git clone ~dab143/src/OVER-REL/SOURCE-GIT-TEST OVER-REL Initialized empty Git repository in /home/cfr100/OVER-REL/.git/ cpio: objects/pack/pack-80a0460fc07be5e0628b02549fdaa186b792d3f3.keep: Permission denied 888 blocks # cat pack-80a0460fc07be5e0628b02549fdaa186b792d3f3.keep fetch-pack 31620 on githost.arl.psu.edu Permission on the keep file are 600. Of course this looks like a stale lock of some sort. We are using git ...
Apr 5, 10:20 am 2008
Stephan Beyer
rebase--interactive in C vs. sequencer
Hi Daniel, in [1] you have told that you are working on porting rebase--interactive to the C programming language. In reply, Junio pointed out that a consolidated "git sequencer" is desired. The sequencer became a project idea for Google Summer of Code and I am currently applying for that project. But I had your mail in mind and=20 do not want that any work of yours is thrown away. ;-) So... what is the current state? Are you still working on it? Is there a code stub or even more code ...
Apr 5, 5:22 am 2008
Stephan Beyer
[PATCH] alias.c: use git_config_string() to get alias_val
Signed-off-by: Stephan Beyer <s-beyer@gmx.net> --- Hi, This is a `Janitor patch' to get involved ;-) See http://git.or.cz/gitwiki/Janitor It does not (at least, should not) change any functionality and it has been tested using some aliases. Regards, Stephan alias.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/alias.c b/alias.c index 116cac8..ac88d38 100644 --- a/alias.c +++ b/alias.c @@ -4,12 +4,8 @@ static const char *alias_key; static ...
Apr 5, 5:18 am 2008
Christian Couder
Re: [PATCH] alias.c: use git_config_string() to get alias_val
Did you see: "(And no, casting the "char **" into a "const char **" is not a good solution either.)" Are you sure this ugly cast to "const char**" is needed ? Thanks, Christian. --
Apr 5, 9:19 am 2008
Stephan Beyer
Re: [PATCH] alias.c: use git_config_string() to get alias_val
Well, because alias_val is not a constant[1], changing static char *alias_val; to static const char *alias_val; is not an option. The only other way I see[2] atm is a brain-damaged: -- static int alias_lookup_cb(const char *k, const char *v) { if (!prefixcmp(k, "alias.") && !strcmp(k+6, alias_key)) { const char *tmp; int ret = git_config_string(&tmp, k, v); alias_val = xstrdup(tmp); /* actually, tmp should be free()'d. */ return ret; } return 0; } -- But instead ...
Apr 5, 10:39 am 2008
Miklos Vajna
Re: sunos nay install nay ginstall nay
On Sat, Apr 05, 2008 at 07:07:53AM +0200, Jan Engelhardt <jengelh@computerg= afaik, GNU/* has ginstall as well. at least this is what i have here: $ ls -l `which ginstall` or maybe time to fix your system :)
Apr 5, 4:53 am 2008
Jan Engelhardt
sunos nay install nay ginstall nay
Hi, I found myself in a position to compile Git on Nexenta, and ran into the incredibly smart Makefile logic to pick "ginstall" when `uname -s` equals SunOS. Except that on GNU/*, it's install, not ginstall. Would not it be time to completely use automake? --
Apr 4, 10:07 pm 2008
Jakub Narebski
Re: sunos nay install nay ginstall nay
First, you can use ./configure when installing git, but as a way to set Makefile variables rather than as a way to build Makefile. By decision autoconf is _optional_. Now autoconf macro AC_PROG_INSTALL requires to have ubstall-sh or install.sh fallback script version of install in sources. We need to have minimal version; it doesn't need to be insanely portable, just as portable as git would be enough. So if you are interested in ./configure detecting proper 'install' binary (or fallback ...
Apr 5, 5:08 am 2008
Christian Couder
[PATCH] Git Gui: update french translation.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- po/fr.po | 78 ++++++++++++++++++++++++++----------------------------------- 1 files changed, 33 insertions(+), 45 deletions(-) Carefull, the encoding of this patch is probably broken. Please get it from the mob branch of git-gui-i18n.git instead. diff --git a/po/fr.po b/po/fr.po index d281938..89b6d51 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" ...
Apr 4, 9:06 pm 2008
Steven Walter
Re: git repository size vs. subversion repository size
git-gc is such an important step in importing a repository from svn. Why doesn't git-svn take this vital step automatically? -- -Steven Walter <stevenrwalter@gmail.com> Freedom is the freedom to say that 2 + 2 = 4 B2F1 0ECC E605 7321 E818 7A65 FC81 9777 DC28 9E8F --
Apr 4, 5:01 pm 2008
Shawn O. Pearce
Re: git repository size vs. subversion repository size
The last command there didn't get you the most efficiently packed repository possible. More recent versions of git-clone will prefer to hardlink all of the loose objects and packs from the source to the destination, so the clone can occur more quickly when they are on the same filesystem. Really what you want to do here is repack the cloned directory (cd git-samplesite && git repack -a -d -f) and maybe include some aggressive --depth and --window options (e.g. 100/100) if you have some CPU ...
Apr 4, 8:11 pm 2008
Björn
Re: git repository size vs. subversion repository size
[Stephan, please stop dropping me from Cc:, thanks] Starting from 1.5.4 (IIRC) git-svn will repack every 1000 revisions (by default). That won't give you a reeeeally tiny pack but OTOH it won't take ages to do the repacks either. Björn --
Apr 4, 5:18 pm 2008
Björn
Re: git repository size vs. subversion repository size
Uhm, you forgot to use -s when doing the clone. That would have created real git branches instead of the directories... What you are counting is the size of the checked out, uncompressed files of _all_ branches and _all_ tags (and trunk). The repo size of basically what "du -sh .git" would give. Björn --
Apr 4, 7:34 pm 2008
Stephen Bannasch
Re: git repository size vs. subversion repository size
I think because it is not necessary for continued productive use of git and the gc operation is expensive. On the repo above it took about 8 hours running in the background while I was working on other stuff. --
Apr 4, 5:04 pm 2008
Sean Brown
Re: git repository size vs. subversion repository size
The svn folder (in the.git directory) was only about 4.2 MB. After running the repack (and then after that git gc as mentioned by another in this thread), it's still about 3.5 GB. git-samplesite (master)]$ du -hs ./* 2.1G ./branches 1.4G ./tags 66M ./trunk The site does have a lot of binary files (PDFs, photographs an such). I suppose we could leave all of the branches and tags in subversion and just move the trunk to git, but I was hoping to make a clean break from subversion. If ...
Apr 4, 7:27 pm 2008
Johannes Schindelin
Re: What's cooking in git.git (topics)
Hi, On Fri, 4 Apr 2008, Junio C Hamano wrote: > Kristian H
Apr 4, 5:26 pm 2008
Junio C Hamano
Re: What's cooking in git.git (topics)
Yes, which means somebody needs to present a mergeable history rather sooner than later, and that somebody does not have to be me ;-) --
Apr 4, 10:51 pm 2008
Shawn O. Pearce
Re: What's in git.git (stable)
0.10 is a dud on Linux. My master branch has a bug fix, but I'm considering bringing in Michele's patch before tagging 0.10.1. So 0.10.1, most likely tagged in a few hours, should be in 1.5.5. Otherwise Linux users of git-gui will be sort of pissed. Damn. -- Shawn. --
Apr 4, 8:13 pm 2008
Jakub Narebski
[PATCH] Revert "gitweb: Add 'status_str' to parse_difftr ...
This reverts commit 6aa6f92fda47cc4ee5f599895e8a5a327fb6f9ab. It caused is_deleted() subroutine to output warnings when dealing with old, legacy gitweb blobdiff URLs without either 'hb' or 'hpb' parameters. This fixes http://bugs.debian.org/469083 Signed-off-by: Jakub Narebski <jnareb@gmail.com> And here it is... gitweb/gitweb.perl | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 1be75c6..1501ec8 100755 --- ...
Apr 5, 1:13 pm 2008
Junio C Hamano
Re: [PATCH (BUGFIX)] gitweb: Fix "Use of uninitialized v ...
Thanks, does gitweb itself generate such a link? I can _artificially_ reproduce this, and I can also see that the patch would solve it, so I do not mind applying it, but I am curious how this was originally triggered. --
Apr 5, 12:51 am 2008
Jakub Narebski
Re: [PATCH (BUGFIX)] gitweb: Fix "Use of uninitialized v ...
No it does not. I have found what causes this bug. When adding is_deleted() subroutine I have forgot about old/legacy URL support[1], where gitweb doesn't have enough information to get raw diff info, and gitweb has to generate required info itself, i.e. the part in git_blobdiff(), around # old/legacy style URI if (!%diffinfo && # if new style URI failed defined $hash && defined $hash_parent) { # fake git-diff-tree raw output $diffinfo{'from_mode'} = $diffinfo{'to_mode'} = ...
Apr 5, 10:16 am 2008
Jakub Narebski
Re: [PATCH (BUGFIX)] gitweb: Fix "Use of uninitialized v ...
Actually I came across this error when testing the "context-sensitive feed links" patch, and was hand-crafting (munging) gitweb URLs. But after thinking about this bug a bit I have realized that this situation _can_ happen with link generated by gitweb, only in very rare cases. It is enough if you use 'history' view link without $hash ('h') parameter, and with transient $hash_base ('hb') parameter, i.e. either name of branch, or "HEAD", or not set (implies "HEAD"), and happen into situation ...
Apr 5, 1:09 am 2008
Gerrit Pape
Re: [PATCH (BUGFIX)] gitweb: Fix "Use of uninitialized v ...
Do you know whether this fixes http://bugs.debian.org/469083 too? I took a short look back then to fix it, but didn't manage it in a reasonable amount of time. Thanks, Gerrit. --
Apr 5, 9:43 am 2008
Jakub Narebski
Re: [PATCH (BUGFIX)] gitweb: Fix "Use of uninitialized v ...
It should be enough to revert commit 6aa6f92 (gitweb: Add 'status_str' to parse_difftree_raw_line output); it should fix this bug. P.S. Mentioned commit was done for micro-optimization: "<str> =~ /D/" is a bit faster than "<str> eq ('0' x 40)" in the case when it doesn't match. -- Jakub Narebski Poland --
Apr 5, 10:38 am 2008
David Tweed
Re: using git for file management while writing a thesis...
Not really directly relevant, but since no-one has replied: I daily copy several revisions onto (git push) and back from (git pull) to USB key (MS-DOS) on x86-Linux and it never takes more than a couple of seconds. (Repo is around 17MB packed, maybe 10-400 objects updated per push.) I know nothing about OS X, but the discrepancy between firewire and usb suggests some performance issue in usb handling. I don't know off the top of my head if packs on the receiveing end of a push are mmap()'d (to ...
Apr 5, 12:17 am 2008
Shawn O. Pearce
Re: Achieving efficient storage of weirdly structured repos
Even though we don't have native tree walking, I think the right way to do this is to put in pack v4 with "canonical tree, canonical commit" mode, where it inflates its native tree/commit encoding into the canonical forms, then come back later with native walking. Canonical mode is still faster than pack v2 inflate is for these types, so it does (slightly) boost rev-list performance. It might chop a solid 30% off the CPU time jgit spends in its equivilant of revision.c, and that's without ...
Apr 4, 8:24 pm 2008
Shawn O. Pearce
Re: [REGRESSION] git-gui
Sadly Mac OS X does not like this accelerator in the menu. It drops the accelerator entirely and just shows nothing. I changed it to show "$M1T-=", but kept the bindings as -- Shawn. --
Apr 4, 9:01 pm 2008
Teemu Likonen
Re: [PATCH] merge, pull: introduce '--diffstat' option
I very much agree with you: --summary/--no-summary are logical and intuitive equivalents of merge.summary, as are --diffstat/--no-diffstat to merge.diffstat. How about this: Officially and explicitly deprecate --(no-)summary and advertise --(no-)diffstat as replacement. Also advertise that in some future release --(no-)summary will have different meaning (i.e. equivalent to merge.summary). There would be a reasonable (?) period before changing the meaning of --(no-)summary. This is a ...
Apr 5, 8:35 am 2008
Junio C Hamano
Re: [PATCH] merge, pull: introduce '--diffstat' option
I'd favor, in the longer run: * --stat option to mean "show the diffstat between ORIG_HEAD and merge result" (i.e. current --summary); * perhaps a new configuration merge.stat to control the default for the above; * merge.log configuration to mean "add list of one-line log to the merge commit message" (i.e. current merge.summary); * perhaps a --log option to override the config default for each invocation. * deprecate --summary and merge.summary and remove them long ...
Apr 5, 11:51 am 2008
SZEDER Gábor
[PATCH] merge, pull: introduce '--diffstat' option
At present, the 'merge --summary' command line option and 'merge.diffstat' config variable are controlling the same thing: whether to show a diffstat at the end of the merge or not. This is inconsistent and confusing. This patch adds the '--diffstat' and '--no-diffstat' options to 'merge' and 'pull', making the name of the command line option and the config variable consistent. Documentation, tests, and bash completion are also updated accordingly. The '--summary' and '--no-summary' ...
Apr 5, 7:48 am 2008
Björn
Re: Can I switch a git-svn clone from a file => http url?
[missed the message because you dropped me from Cc:...] Ouch, that replaced your commit messages with the sha1 hashes... Should have been something like: git filter-branch --msg-filter 'sed "s,file:///....,http:///,"' -- --all Björn --
Apr 4, 5:23 pm 2008
Gerrit Pape
Re: [PATCH] tcl/tk8.5: fix changing colors through Edit- ...
Hi, any comments on this patch? I can reproduce the problem on Debian with tcl/tk 8.5.1 and git 1.5.5.rc3. Thanks, Gerrit. --
Apr 5, 9:38 am 2008
Gerrit Pape
[PATCH amend] gitweb: fallback to system-wide config fil ...
From a distribution point of view, configuration files for applications should reside in /etc/. On the other hand it's convenient for multiple instances of gitweb (e.g. virtual web servers on a single machine) to have a per-instance configuration file, just as gitweb currently supports through the file gitweb_config.perl next to the cgi. To support both at runtime, this commit introduces GITWEB_CONFIG_SYSTEM as a system-wide configuration file which will be used as a fallback if the config ...
Apr 5, 9:37 am 2008
previous daytodaynext day
April 4, 2008April 5, 2008April 6, 2008