Re: refspecs with '*' as part of pattern

2015-07-06 Thread Daniel Barkalow
On Mon, 6 Jul 2015, Junio C Hamano wrote: Jacob Keller jacob.kel...@gmail.com writes: I've been looking at the refspecs for git fetch, and noticed that globs are partially supported. I wanted to use something like: refs/tags/some-prefix-*:refs/tags/some-prefix-* as a refspec, so

Re: [PATCH v4 00/13] New remote-hg helper

2012-10-31 Thread Daniel Barkalow
On Wed, 31 Oct 2012, Felipe Contreras wrote: Hi, On Wed, Oct 31, 2012 at 7:59 PM, Jonathan Nieder jrnie...@gmail.com wrote: Felipe Contreras wrote: On Wed, Oct 31, 2012 at 7:20 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: I just tested this with junio/next and it seems

Re: git-clone ignores umask for working tree

2012-07-06 Thread Daniel Barkalow
On Fri, 6 Jul 2012, Alex Riesen wrote: Hi list, when git-clone was built in, its treatment of umask has changed: the shell version respected umask for newly created directories by using plain mkdir(1), and the builtin version just uses mkdir(work_tree, 0755). Is it intentional? I have

Re: [RFH] Merge driver

2005-09-09 Thread Daniel Barkalow
On Fri, 9 Sep 2005, Junio C Hamano wrote: I have several requests to people who are interested in merges and read-tree changes. I am pretty much set to use the recent read-tree updates Daniel has been working on. The only reason it has not hit the master branch yet, except that it still

Re: [RFH] Merge driver

2005-09-09 Thread Daniel Barkalow
On Fri, 9 Sep 2005, Junio C Hamano wrote: Daniel Barkalow [EMAIL PROTECTED] writes: It tries to make sure that there is room to put stuff for resolving a conflict without messing with modified files in the directory. I agree it can be used that way, but nobody seems to use

Re: Multi-ancestor read-tree notes

2005-09-09 Thread Daniel Barkalow
On Fri, 9 Sep 2005, Junio C Hamano wrote: Daniel Barkalow [EMAIL PROTECTED] writes: In case #16, I'm not sure what I should produce. I think the best thing might be to not leave anything in stage 1. The desired end effect is that the user is given a file with a section like

Re: [PATCH 0/2] A new merge algorithm, take 3

2005-09-08 Thread Daniel Barkalow
On Thu, 8 Sep 2005, Fredrik Kuivinen wrote: On Wed, Sep 07, 2005 at 02:33:42PM -0400, Daniel Barkalow wrote: On Wed, 7 Sep 2005, Fredrik Kuivinen wrote: Of the 500 merge commits that currently exists in the kernel repository 19 produces non-clean merges with git-merge-script

Re: [PATCH 0/2] A new merge algorithm, take 3

2005-09-08 Thread Daniel Barkalow
On Thu, 8 Sep 2005, Fredrik Kuivinen wrote: The first one agrees with what was actually committed. For the second one the difference between the tree produced by the algorithm and what was committed is: diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h ---

Re: Multi-ancestor read-tree notes

2005-09-08 Thread Daniel Barkalow
On Thu, 8 Sep 2005, Darrin Thompson wrote: On Mon, 2005-09-05 at 01:41 -0400, Daniel Barkalow wrote: I've got a version of read-tree which accepts multiple ancestors and does a merge using information from all of them. Do the multiple ancestors have to share a common parent? More

Re: Multi-ancestor read-tree notes

2005-09-08 Thread Daniel Barkalow
On Thu, 8 Sep 2005, Junio C Hamano wrote: Daniel Barkalow [EMAIL PROTECTED] writes: I assume that what you want is something to include everything from two commits, which would give conflicts if a name is reused? My understanding is that Darrin wants to do what Linus did when he

Re: [PATCH 0/2] A new merge algorithm, take 3

2005-09-07 Thread Daniel Barkalow
On Wed, 7 Sep 2005, Fredrik Kuivinen wrote: Of the 500 merge commits that currently exists in the kernel repository 19 produces non-clean merges with git-merge-script. The four merge cases listed in [EMAIL PROTECTED] are cleanly merged by git-merge-script. Every merge commit which is cleanly

Re: Multi-ancestor read-tree notes

2005-09-06 Thread Daniel Barkalow
On Mon, 5 Sep 2005, Junio C Hamano wrote: Daniel Barkalow [EMAIL PROTECTED] writes: I've got a version of read-tree which accepts multiple ancestors and does a merge using information from all of them. After disabling the debugging printf(), I used this read-tree to try resolving

Re: [PATCH] Make sure the diff machinery outputs \ No newline ... in english

2005-09-06 Thread Daniel Barkalow
On Mon, 5 Sep 2005, Linus Torvalds wrote: On Mon, 5 Sep 2005, Fredrik Kuivinen wrote: After a quick look through the diff source I didn't find anything else. It's quite possible that I haved missed something though. Most of the translated messages are related to error reporting, which I

Re: Multi-ancestor read-tree notes

2005-09-06 Thread Daniel Barkalow
On Tue, 6 Sep 2005, Junio C Hamano wrote: Daniel Barkalow [EMAIL PROTECTED] writes: Do you know if there's anything like case #16 in there? I'd be interested to know if there's anything that gets handled automatically in different ways depending on which single base is used

Re: Multi-ancestor read-tree notes

2005-09-06 Thread Daniel Barkalow
On Tue, 6 Sep 2005, Junio C Hamano wrote: Daniel Barkalow [EMAIL PROTECTED] writes: Good. (Although that patch doesn't seem to be directly on top of my version; I can tell what it's doing anyway) That one was against the proposed updates head. I've updated it again to include

[PATCH 1/4] Add a function for getting a struct tree for an ent.

2005-09-05 Thread Daniel Barkalow
Signed-off-by: Daniel Barkalow [EMAIL PROTECTED] --- tree.c | 21 + tree.h |3 +++ 2 files changed, 24 insertions(+), 0 deletions(-) 3bfcc20b6aeff3e1fbcce97a426383c9770a2105 diff --git a/tree.c b/tree.c --- a/tree.c +++ b/tree.c @@ -1,5 +1,7 @@ #include tree.h

[PATCH 2/4] Add function to append to an object_list.

2005-09-05 Thread Daniel Barkalow
Signed-off-by: Daniel Barkalow [EMAIL PROTECTED] --- object.c | 11 +++ object.h |3 +++ 2 files changed, 14 insertions(+), 0 deletions(-) 88cf2db55848e7a2cf655171c7e9fd74c70a0281 diff --git a/object.c b/object.c --- a/object.c +++ b/object.c @@ -184,6 +184,17 @@ struct

[PATCH 3/4] Rewrite read-tree

2005-09-05 Thread Daniel Barkalow
Adds support for multiple ancestors, removes --emu23, much simplification. Signed-off-by: Daniel Barkalow [EMAIL PROTECTED] --- read-tree.c | 811 +++-- t/t1005-read-tree-m-2way-emu23.sh | 422 --- 2 files changed, 425

[PATCH 4/4] Document the trivial merge rules for 3(+more ancestors)-way merges.

2005-09-05 Thread Daniel Barkalow
Signed-off-by: Daniel Barkalow --- Documentation/technical/trivial-merge.txt | 92 + 1 files changed, 92 insertions(+), 0 deletions(-) create mode 100644 Documentation/technical/trivial-merge.txt 7544be0a8eda7b796150729a7795c2639278da62 diff --git a/Documentation

Re: Moved files and merges

2005-09-04 Thread Daniel Barkalow
On Sun, 4 Sep 2005, Junio C Hamano wrote: Sam Ravnborg [EMAIL PROTECTED] writes: If the problem is not fully understood it can be difficult to come up with the proper solution. And with the example above the problem should be really easy to understand. Then we have the tree as used by

[PATCH 0/4] Support multiple ancestors in read-tree

2005-09-04 Thread Daniel Barkalow
Various messages have already described this series. There's still a memory leak that should get resolved, but otherwise it should work. I'm not entirely sure that all directory-file conflict cases are handled properly, and some undefined cases behave differently. Also, I was a bit careless

[PATCH 3/2] Remove emu23, fix entry order

2005-09-02 Thread Daniel Barkalow
A few things to improve testing. I'll clean up the series as a whole once it's tested. This removes the emu23 tests; I think that the only DF conflict tests were in that set, however, so these should be fished out and added to something else. Signed-off-by: Daniel Barkalow [EMAIL PROTECTED

Re: Tool renames? was Re: First stab at glossary

2005-09-02 Thread Daniel Barkalow
On Thu, 1 Sep 2005, Junio C Hamano wrote: Tim Ottinger [EMAIL PROTECTED] writes: git-update-cache for instance? I am not sure which 'cache' commands need to be 'index' now. Logically you are right, but I suspect that may not fly well in practice. Too many of us have already got our

Re: Couple of read-tree questions

2005-09-01 Thread Daniel Barkalow
On Wed, 31 Aug 2005, Junio C Hamano wrote: Daniel Barkalow [EMAIL PROTECTED] writes: Is there any current use for read-tree with multiple trees without -m or equivalent? I did not know it even allowed multiple trees without -m, but you are right. It does not seem to complain. I

Re: Reworked read-tree.

2005-09-01 Thread Daniel Barkalow
On Thu, 1 Sep 2005, Junio C Hamano wrote: Daniel, I do not know what your current status is, but I think you need something like this. Yup, I forgot to actually test that functionality. --- diff --git a/tree.c b/tree.c --- a/tree.c +++ b/tree.c @@ -224,10 +224,12 @@ struct tree

Re: [PATCH 0/2] Reorganize read-tree

2005-08-31 Thread Daniel Barkalow
On Tue, 30 Aug 2005, Junio C Hamano wrote: Dan, I really really *REALLY* wanted to try this out in pu branch and even was about to rig some torture chamber for testing before applying the patch, but you got the shiny blue bat X-. I'll send a replacement with the settings correct. A patch

[PATCH 1/2 (resend)] Object model additions for read-tree

2005-08-31 Thread Daniel Barkalow
Adds object_list_append() and a function to get the struct tree from an ent. Signed-off-by: Daniel Barkalow [EMAIL PROTECTED] --- object.c | 11 +++ object.h |3 +++ tree.c | 19 +++ tree.h |3 +++ 4 files changed, 36 insertions(+), 0 deletions

Re: [PATCH 0/2] Reorganize read-tree

2005-08-31 Thread Daniel Barkalow
On Wed, 31 Aug 2005, Catalin Marinas wrote: Daniel Barkalow [EMAIL PROTECTED] wrote: I got mostly done with this before Linus mentioned the possibility of having multiple index entries in the same stage for a single path. I finished it anyway, but I'm not sure that we won't want to know

Re: [RFC] Stgit - patch history / add extra parents

2005-08-31 Thread Daniel Barkalow
On Tue, 30 Aug 2005, Catalin Marinas wrote: Back from holiday. Thanks to all who replied to this thread. On Tue, 2005-08-23 at 14:05 -0400, Daniel Barkalow wrote: Having a useful diff isn't really a requirement for a parent; the diff in the case of a merge is going to be the total

[PATCH 0/2] Reorganize read-tree

2005-08-30 Thread Daniel Barkalow
I got mostly done with this before Linus mentioned the possibility of having multiple index entries in the same stage for a single path. I finished it anyway, but I'm not sure that we won't want to know which of the common ancestors contributed which, and, if some of them don't have a path, we

[PATCH 1/2] Object model additions for read-tree

2005-08-30 Thread Daniel Barkalow
Adds object_list_append() and a function to get the struct tree from an ent. Signed-off-by: Daniel Barkalow [EMAIL PROTECTED] --- object.c | 11 +++ object.h |3 +++ tree.c | 19 +++ tree.h |3 +++ 4 files changed, 36 insertions(+), 0 deletions

[PATCH] Change read-tree to merge before using the index.

2005-08-30 Thread Daniel Barkalow
Signed-off-by: Daniel Barkalow [EMAIL PROTECTED] --- read-tree.c | 522 ++- 1 files changed, 297 insertions(+), 225 deletions(-) d0f45ad81db2e133c49c23bd09c5615da344bb5c diff --git a/read-tree.c b/read-tree.c --- a/read-tree.c +++ b/read

Comments in read-tree about #nALT

2005-08-27 Thread Daniel Barkalow
I've gotten to the point of having all of the entries for a given path ready to put into the cache at the same, and now I want to convert the merge functions to take their data directly, rather than in the cache, so that they can take extra entries for extra ancestors. Part of threeway_merge,

Re: Merges without bases

2005-08-27 Thread Daniel Barkalow
On Sat, 27 Aug 2005, Martin Langhoff wrote: On 8/27/05, Daniel Barkalow [EMAIL PROTECTED] wrote: The problem with both of these (and doing it in the build system) is that, when a project includes another project, you generally don't want whatever revision of the included project happens

Re: Comments in read-tree about #nALT

2005-08-27 Thread Daniel Barkalow
On Sat, 27 Aug 2005, Linus Torvalds wrote: On Sat, 27 Aug 2005, Daniel Barkalow wrote: What I missed was that the effect of causes_df_conflict is to give no merge for the entry, rather than giving an error overall. So I do need an equivalent. Daniel, I'm not 100% sure what you're

Re: Merges without bases

2005-08-25 Thread Daniel Barkalow
On Thu, 25 Aug 2005, Junio C Hamano wrote: One thing that makes me reluctant to recommend this merging unrelated projects business is that I suspect that it makes things _much_ harder for the upstream project that is being merged, and should not be done without prior arrangement; Linus

Re: [RFC] Looking at multiple ancestors in merge

2005-08-25 Thread Daniel Barkalow
On Wed, 24 Aug 2005, Daniel Barkalow wrote: Of course, this is going to take a bit of work, because read-tree currently puts all of its arguments into the cache and then works on merging, and taking multiple ancestors requires putting them somewhere else, because they won't fit in the cache

Re: baffled again

2005-08-24 Thread Daniel Barkalow
On Wed, 24 Aug 2005, Junio C Hamano wrote: [EMAIL PROTECTED] writes: So I have another anomaly in my GIT tree. A patch to back out a bogus change to arch/ia64/hp/sim/boot/bootloader.c in my release branch at commit 62d75f3753647656323b0365faa43fc1a8f7be97 appears to have been

Re: Query about status of http-pull

2005-08-24 Thread Daniel Barkalow
On Wed, 24 Aug 2005, Martin Schlemmer wrote: Hi, Recently cogito again say that the rsync method will be deprecated in future (due to http-pull now supporting pack objects I suppose), but it seems to me that it still have other issues: - lycan linux-2.6 # git pull origin Fetching

Re: baffled again

2005-08-24 Thread Daniel Barkalow
On Wed, 24 Aug 2005, Linus Torvalds wrote: Now, if the shared patch hadn't been a patch, but a shared _commit_, then the thing would have been unambiguous - the shared commit would have been the merge point, and the revert would have clearly undone that shared commit. Actually, it was a

Re: [RFC] undo and redo

2005-08-24 Thread Daniel Barkalow
On Wed, 24 Aug 2005, Carl Baldwin wrote: This brings up a good point (indirectly). git prune would destroy the undo objects. I had thought of this but decided to ignore it for the time being. If you made undo store the tree under refs somewhere, git prune would preserve it. -Daniel

Re: [RFC] Looking at multiple ancestors in merge

2005-08-24 Thread Daniel Barkalow
On Wed, 24 Aug 2005, A Large Angry SCM wrote: Daniel Barkalow wrote: I'm starting to work on letting the merging process see multiple ancestors, and I think it's messy enough that I should actually discuss it. Review of the issue: It is possible to lost reverts in cases when

Re: [RFC] Stgit - patch history / add extra parents

2005-08-23 Thread Daniel Barkalow
On Tue, 23 Aug 2005, Catalin Marinas wrote: So the point is that there are things which are, in fact, parents, but we don't want to list them, because it's not desired information. What's the definition of a parent in GIT terms? What are the restriction for a commit object to be a parent?

Re: [RFC] Removing deleted files after checkout

2005-08-23 Thread Daniel Barkalow
On Tue, 23 Aug 2005, Carl Baldwin wrote: Hello, I recently started using git to revision control the source for my web-page. I wrote a post-update hook to checkout the files when I push to the 'live' repository. In this particular context I decided that it was important to me to remove

Re: [RFC] Removing deleted files after checkout

2005-08-23 Thread Daniel Barkalow
On Tue, 23 Aug 2005, Carl Baldwin wrote: On Tue, Aug 23, 2005 at 03:43:56PM -0400, Daniel Barkalow wrote: On Tue, 23 Aug 2005, Carl Baldwin wrote: Hello, I recently started using git to revision control the source for my web-page. I wrote a post-update hook to checkout the files

Re: [RFC] Removing deleted files after checkout

2005-08-23 Thread Daniel Barkalow
On Tue, 23 Aug 2005, Carl Baldwin wrote: The point is to push and use a post-update hook to do the checkout. So, this won't be possible. You could have the remote repository be something like ~/git/website.git, and have a hook which does: cd ~/www; git pull ~/git/website.git/. That is, have

Re: [RFC] Stgit - patch history / add extra parents

2005-08-23 Thread Daniel Barkalow
On Tue, 23 Aug 2005, Jan Veldeman wrote: Daniel Barkalow wrote: On Tue, 23 Aug 2005, Catalin Marinas wrote: Something is legitimate as a parent if someone took that commit and did something to it to get the new commit. The operation which caused the change is not specified. But you

Re: [RFC] Removing deleted files after checkout

2005-08-23 Thread Daniel Barkalow
On Tue, 23 Aug 2005, Carl Baldwin wrote: The thing that this doesn't do is remove empty directories when the last file is deleted. I once expressed the opinion in a previous thread that directories should be added and removed explicitly in git. (Thus allowing an empty directory to be

Re: Automatic merge failed, fix up by hand

2005-08-23 Thread Daniel Barkalow
On Tue, 23 Aug 2005, Junio C Hamano wrote: Only lightly tested, in the sense that I did only this one case and nothing else. For a large repository and with complex merges, merge-base -a _might_ end up reporting many candidates, in which case the pre-merge step to figure out the best merge

Re: [RFC] Stgit - patch history / add extra parents

2005-08-22 Thread Daniel Barkalow
On Sun, 21 Aug 2005, Jan Veldeman wrote: Catalin Marinas wrote: So for example, you only tag (freeze) the history when exporting the patches. When an error is being reported on that version, it's easy to view it and also view the progress that was already been made on those

Re: Subject: [PATCH] Updates to glossary

2005-08-18 Thread Daniel Barkalow
On Thu, 18 Aug 2005, Johannes Schindelin wrote: tree object:: - An object containing a list of blob and/or tree objects. - (A tree usually corresponds to a directory without - subdirectories). + An object containing a list of file names and modes along with refs + to

Re: First stab at glossary

2005-08-17 Thread Daniel Barkalow
On Wed, 17 Aug 2005, Johannes Schindelin wrote: Hi, long, long time. Here?s my first stab at the glossary, attached the alphabetically sorted, asciidoc marked up txt file (Comments? Suggestions? Pizzas?): object:: The unit of storage in GIT. It is uniquely identified by the

Re: Git 1.0 Synopis (Draft v4)

2005-08-16 Thread Daniel Barkalow
On Tue, 16 Aug 2005, Johannes Schindelin wrote: Hi, On Tue, 16 Aug 2005, Junio C Hamano wrote: - Are all the files in Documentation/ reachable from git(7) or otherwise made into a standalone document using asciidoc by the Makefile? I haven't looked into documentation

Re: [PATCH] Alternate object pool mechanism updates.

2005-08-16 Thread Daniel Barkalow
On Tue, 16 Aug 2005, Linus Torvalds wrote: Finally, I have to say that that info directory is confusing. Namely, there's two of them - the git info and the object info directories are totally different directories - maybe logical, but to me it smells like info is here a code-name for misc

Re: [RFC PATCH] Add support for figuring out where in the git archive we are

2005-08-16 Thread Daniel Barkalow
On Tue, 16 Aug 2005, Linus Torvalds wrote: If you use the GIT_DIR environment variable approach, it assumes that all filenames you give it are absolute and acts the way it always did before. Comments? Like? Dislike? I'm all in favor, at least in the general case. I suspect there'll be some

Re: Cloning speed comparison

2005-08-15 Thread Daniel Barkalow
On Sat, 13 Aug 2005, Petr Baudis wrote: Hello, I've wondered how slow the protocols other than rsync are, and the (well, a bit dubious; especially wrt. caching on the remote side) results are: git clone-pack:ssh 25s git rsync 27s git

Re: Git 1.0 Synopis (Draft v4)

2005-08-15 Thread Daniel Barkalow
On Mon, 15 Aug 2005, Junio C Hamano wrote: Ryan Anderson [EMAIL PROTECTED] writes: I was waiting until you said, Ok, 1.00 tomorrow morning Makes sense. There would be some weeks until that happens I am afraid. It might be worth putting the list of things left to do before 1.0 in the

Re: Cloning speed comparison

2005-08-15 Thread Daniel Barkalow
On Mon, 15 Aug 2005, Junio C Hamano wrote: Daniel Barkalow [EMAIL PROTECTED] writes: I should be able to get http-pull down to the neighborhood of (current) ssh-pull; http-pull is that slow (when the source repository isn't packed) because it's entirely sequential, rather than

[PATCH] Add function to read an index file from an arbitrary filename.

2005-08-15 Thread Daniel Barkalow
Note that the pack file has to be in the usual location if it gets installed later. Signed-off-by: Daniel Barkalow [EMAIL PROTECTED] --- cache.h |2 ++ sha1_file.c | 10 -- 2 files changed, 10 insertions(+), 2 deletions(-) 59e5c6d163edae5da6136560d48a4750cceacdc6 diff --git

[PATCH] Support packs in local-pull

2005-08-15 Thread Daniel Barkalow
If it doesn't find an object, it looks for an index that contains it and uses the same methods on that instead. Signed-off-by: Daniel Barkalow [EMAIL PROTECTED] --- local-pull.c | 112 +++--- 1 files changed, 91 insertions(+), 21 deletions

Re: [OT?] git tools at SourceForge ?

2005-08-12 Thread Daniel Barkalow
On Fri, 12 Aug 2005, Wolfgang Denk wrote: This is somewhat off topic here, so I apologize, but I didn't know any better place to ask: Has anybody any information if SourceForge is going to provide git / cogito / ... for the projects they host? I asked SF, and they openend a new Feature

Re: [OT?] git tools at SourceForge ?

2005-08-12 Thread Daniel Barkalow
On Fri, 12 Aug 2005, Linus Torvalds wrote: And it's possible that git usage won't expand all that much either. But quite frankly, I think git is a lot better than CVS (or even SVN) by now, and I wouldn't be surprised if it started getting some use outside of the git-only and kernel projects

[PATCH] Re: git-http-pull broken in latest git

2005-08-11 Thread Daniel Barkalow
). Synchronously process anything you already have. Signed-off-by: Daniel Barkalow [EMAIL PROTECTED] --- pull.c | 57 - 1 files changed, 32 insertions(+), 25 deletions(-) 9b6b4b259c6b00d5b2502c158bc800d7623352bc diff --git a/pull.c b/pull.c

Re: [PATCH] Re: git-http-pull broken in latest git

2005-08-11 Thread Daniel Barkalow
On Thu, 11 Aug 2005, Junio C Hamano wrote: Daniel Barkalow [EMAIL PROTECTED] writes: It should work anyway,... That is true. Please forget about the recommendation to slurp packs and not falling back on commit walker. Thanks for the patch. No problem; I had been wondering what

Re: Bootstrapping into git, commit gripes at me

2005-07-12 Thread Daniel Barkalow
On Mon, 11 Jul 2005, Junio C Hamano wrote: Linus Torvalds [EMAIL PROTECTED] writes: But what about the branch name? Should we just ask the user? Together with a flag, like git checkout -b new-branch v2.6.12 for somebody who wants to specify the branch name? Or should we pick a

Re: [PATCH 0/2] Support for packs in HTTP

2005-07-11 Thread Daniel Barkalow
On Mon, 11 Jul 2005, Linus Torvalds wrote: On Mon, 11 Jul 2005, Daniel Barkalow wrote: On Sun, 10 Jul 2005, Linus Torvalds wrote: You really _mustn't_ try to create the pack directly to the $GIT_DIR/objects/pack subdirectory - that would make git itself start possibly using

Re: [PATCH 2/2] Demo support for packs via HTTP

2005-07-11 Thread Daniel Barkalow
On Mon, 11 Jul 2005, Darrin Thompson wrote: On Sun, 2005-07-10 at 15:56 -0400, Daniel Barkalow wrote: + curl_easy_setopt(curl, CURLOPT_FILE, indexfile); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite); + curl_easy_setopt(curl, CURLOPT_URL, url); I was hoping to send

[PATCH 1/2] Management of packs not yet installed

2005-07-10 Thread Daniel Barkalow
Support for parsing index files without pack files, installing pack files while running, and checking what pack files are available. Signed-off-by: Daniel Barkalow [EMAIL PROTECTED] --- commit b686d7a0377c24e05dbed0dafe909dda6c3dfb48 tree ce285b1a0adb4f8d415f72668a77bc1f1f92e1e1 parent

[PATCH 0/2] Support for packs in HTTP

2005-07-10 Thread Daniel Barkalow
This series has one patch which is ready to go in and one that's not (although it's a reasonable phony for the current state of the git world). 1: Several additional functions are needed in the library to support progressively getting pack data from some remote location and using it to

[PATCH 2/2] Demo support for packs via HTTP

2005-07-10 Thread Daniel Barkalow
Support for downloading the pack file e3117bbaf6a59cb53c3f6f0d9b17b9433f0e4135 when appropriate. (Will support other pack files when the repository has a list of them.) Signed-off-by: Daniel Barkalow [EMAIL PROTECTED] --- commit 74132562a2f6cfce9690a5091de7e85bd51d88af tree

Re: [RFC] Design for http-pull on repo with packs

2005-07-10 Thread Daniel Barkalow
On Sun, 10 Jul 2005, Dan Holmsand wrote: Daniel Barkalow wrote: I have a design for using http-pull on a packed repository, and it only requires one extra file in the repository: an append-only list of the pack files (because getting the directory listing is very painful and failure

[PATCH] Make --recover cause pull to trace everything

2005-07-10 Thread Daniel Barkalow
Make the --recover flag check the parents of commits which are already available. This is needed currently to deal with cases where a parent is pulled along with a commit (in a pack, e.g.) and references above that parent aren't also pulled together. Signed-off-by: Daniel Barkalow [EMAIL

[PATCH 2/2] Remove map_sha1_file

2005-07-10 Thread Daniel Barkalow
Remove map_sha1_file(), now unused. Signed-off-by: Daniel Barkalow [EMAIL PROTECTED] --- commit c21a02262f770a25b005378e06354e582aa1bfd8 tree 7ac9fabe666f00f37572e7b349fdb859bf8a6491 parent 264ff9f3dcde5553728b34fa08e04643b2b55946 author Daniel Barkalow [EMAIL PROTECTED] 1121033599 -0400

[PATCH 1/2] write_sha1_to_fd()

2005-07-10 Thread Daniel Barkalow
Add write_sha1_to_fd(), which writes an object to a file descriptor. This includes support for unpacking it and recompressing it. Signed-off-by: Daniel Barkalow [EMAIL PROTECTED] --- commit 264ff9f3dcde5553728b34fa08e04643b2b55946 tree 353fe33ae9c7265d7b685bca864d657e3efe2849 parent

[PATCH] Better error message from git-ssh-push

2005-07-04 Thread Daniel Barkalow
If git-ssh-push can't interpret the commit-id, there are various possible issues. Just giving the usage message makes it hard to identify what could be wrong. Signed-off-by: Daniel Barkalow [EMAIL PROTECTED] --- commit 7a274ce1f93e6092dcf226d546a58d2d6df9d13c tree

Re: Last mile for 1.0 again

2005-07-04 Thread Daniel Barkalow
On Mon, 4 Jul 2005, Linus Torvalds wrote: On Mon, 4 Jul 2005, Daniel Barkalow wrote: How about an option to git-rev-list to take a path, and (1) exclude any branch where the version at that path ends up ignored in a merge and (2) not list any revision where the version at that path

Re: Last mile for 1.0 again

2005-07-04 Thread Daniel Barkalow
On Mon, 4 Jul 2005, Junio C Hamano wrote: DB == Daniel Barkalow [EMAIL PROTECTED] writes: DB Junio: what's missing from annotate/blame? Which one are you talking about? What I use to generate http://members.cox.net/junkio/Summary.txt is an implementation of an algorithm I consider

Re: [3/5] Add http-pull

2005-04-23 Thread Daniel Barkalow
On Sat, 23 Apr 2005, Petr Baudis wrote: Dear diary, on Sat, Apr 23, 2005 at 01:00:33AM CEST, I got a letter where Daniel Barkalow [EMAIL PROTECTED] told me that... On Sat, 23 Apr 2005, Petr Baudis wrote: Dear diary, on Fri, Apr 22, 2005 at 09:46:35PM CEST, I got a letter where Daniel

Re: Change pull to _only_ download, and git update=pull+merge?

2005-04-19 Thread Daniel Barkalow
On Tue, 19 Apr 2005, Petr Baudis wrote: I disagree. This already forces you to have two branches (one to pull from to get the data, mirroring the remote branch, one for your real work) uselessly and needlessly. If you pull in a non-tracked tree, it certainly won't apply the changes, so you

Re: [0/5] Parsers for git objects, porting some programs

2005-04-18 Thread Daniel Barkalow
On Mon, 18 Apr 2005, Junio C Hamano wrote: I was looking at the tree part and am thinking that it would make it much nicer if your tree object records path for each entry. You're entirely right, and I've actually now written the code that does it. I'm planning to send out a patch for that

More patches

2005-04-18 Thread Daniel Barkalow
Here are the things I was saving for after the previous set: 1: Report the actual contents of trees 2: Add functions for scanning history by date 3: Add http-pull, a program to fetch the objects you need by HTTP 4: Change merge-base to find the most recent common ancestor 1 and 2 are core

[1/4] Report info from trees

2005-04-18 Thread Daniel Barkalow
This patch adds actual information to struct tree, making it possible to tell what sorts of things the referenced objects are. This is needed for http-pull, and Junio wanted something of the sort. Signed-Off-By: Daniel Barkalow [EMAIL PROTECTED] Index: tree.c

[2/4] Sorting commits by date

2005-04-18 Thread Daniel Barkalow
Functions for a date-ordered queue of commits, progressively pulled out of the history incrementally. Linus wanted this for finding the most recent common ancestor, and it might be relevant to logging. Signed-Off-By: Daniel Barkalow [EMAIL PROTECTED] Index: commit.c

[3/4] Add http-pull

2005-04-18 Thread Daniel Barkalow
This adds a command to pull a commit and dependant objects from an HTTP server. Signed-Off-By: Daniel Barkalow [EMAIL PROTECTED] Index: Makefile === --- 50afb5dd4184842d8da1da8dcb9ca6a591dfc5b0/Makefile (mode:100644 sha1

[2/5] Add merge-base

2005-04-17 Thread Daniel Barkalow
merge-base finds one of the best common ancestors of a pair of commits. In particular, it finds one of the ones which is fewest commits away from the further of the heads. Signed-Off-By: Daniel Barkalow [EMAIL PROTECTED] Index: Makefile

[3/5] Add http-pull

2005-04-17 Thread Daniel Barkalow
in the README again. Signed-Off-By: Daniel Barkalow [EMAIL PROTECTED] Index: Makefile === --- d662b707e11391f6cfe597fd4d0bf9c41d34d01a/Makefile (mode:100644 sha1:b2ce7c5b63fffca59653b980d98379909f893d44

[2.1/5] Add merge-base

2005-04-17 Thread Daniel Barkalow
merge-base finds one of the best common ancestors of a pair of commits. In particular, it finds one of the ones which is fewest commits away from the further of the heads. Signed-Off-By: Daniel Barkalow [EMAIL PROTECTED] Index: Makefile

Re: [patch] fork optional branch point normazilation

2005-04-17 Thread Daniel Barkalow
On Sun, 17 Apr 2005, Linus Torvalds wrote: On Sun, 17 Apr 2005, Brad Roberts wrote: (ok, author looks better, but committer doesn't obey the AUTHOR_ vars yet) They should't, but maybe I should add COMMITTER_xxx overrides. I just do _not_ want people to think that they should claim to be

Re: [3/5] Add http-pull

2005-04-17 Thread Daniel Barkalow
On Sun, 17 Apr 2005, Petr Baudis wrote: Index: Makefile === --- d662b707e11391f6cfe597fd4d0bf9c41d34d01a/Makefile (mode:100644 sha1:b2ce7c5b63fffca59653b980d98379909f893d44) +++

[3.1/5] Add http-pull

2005-04-17 Thread Daniel Barkalow
http-pull is a program that downloads from a (normal) HTTP server a commit and all of the tree and blob objects it refers to (but not other commits, etc.). Options could be used to make it download a larger or different selection of objects. Signed-Off-By: Daniel Barkalow [EMAIL PROTECTED] Index

Re: [1/5] Parsing code in revision.h

2005-04-17 Thread Daniel Barkalow
On Sun, 17 Apr 2005, Linus Torvalds wrote: On Sun, 17 Apr 2005, Daniel Barkalow wrote: --- 45f926575d2c44072bfcf2317dbf3f0fbb513a4e/revision.h (mode:100644 sha1:28d0de3261a61f68e4e0948a25a416a515cd2e83) +++ 37a0b01b85c2999243674d48bfc71cdba0e5518e/revision.h (mode:100644 sha1

Re: [3/5] Add http-pull

2005-04-17 Thread Daniel Barkalow
On Sun, 17 Apr 2005, Petr Baudis wrote: Dear diary, on Sun, Apr 17, 2005 at 08:49:11PM CEST, I got a letter where Daniel Barkalow [EMAIL PROTECTED] told me that... I'm not too kind at this. Either make it totally separate commands, or make a required switch specifying what to do. Otherwise

Re: [2.1/5] Add merge-base

2005-04-17 Thread Daniel Barkalow
On Sun, 17 Apr 2005, Petr Baudis wrote: Dear diary, on Sun, Apr 17, 2005 at 06:51:59PM CEST, I got a letter where Daniel Barkalow [EMAIL PROTECTED] told me that... merge-base finds one of the best common ancestors of a pair of commits. In particular, it finds one of the ones which is fewest

[2/5] Implementations of parsing functions

2005-04-17 Thread Daniel Barkalow
This implements the parsing functions. Signed-Off-By: Daniel Barkalow [EMAIL PROTECTED] Index: blob.c === --- /dev/null (tree:5ca133e1b74aee39b2124c0ec9fd51539babb5e0) +++ 1172a9b8f45b2fd640985595cc5258db3b027828/blob.c (mode

Re: [PATCH] Get commits from remote repositories by HTTP

2005-04-16 Thread Daniel Barkalow
On Sat, 16 Apr 2005, Tony Luck wrote: On 4/16/05, Daniel Barkalow [EMAIL PROTECTED] wrote: +buffer = read_sha1_file(sha1, type, size); You never free this buffer. Ideally, this should all be rearranged to share the code with read-tree, and it should be fixed in common. It would

Re: [PATCH] Get commits from remote repositories by HTTP

2005-04-16 Thread Daniel Barkalow
On Sun, 17 Apr 2005, Martin Mares wrote: Hello! This adds a program to download a commit, the trees, and the blobs in them from a remote repository using HTTP. It skips anything you already have. Is it really necessary to write your own HTTP downloader? If so, is it necessary to forget

Re: [PATCH] Get commits from remote repositories by HTTP

2005-04-16 Thread Daniel Barkalow
On Sat, 16 Apr 2005, Adam Kropelin wrote: Tony Luck wrote: Otherwise this looks really nice. I was going to script something similar using wget ... but that would have made zillions of seperate connections. Not so kind to the server. How about building a file list and doing a batch

Re: Re: Add clone support to lntree

2005-04-16 Thread Daniel Barkalow
On Sun, 17 Apr 2005, Petr Baudis wrote: Dear diary, on Sat, Apr 16, 2005 at 05:06:54AM CEST, I got a letter where Daniel Barkalow [EMAIL PROTECTED] told me that... I think fork is as good as anything for describing the operation. I had thought about clone because it seemed to fill the role

Re: Re: Re: Add clone support to lntree

2005-04-16 Thread Daniel Barkalow
On Sun, 17 Apr 2005, Petr Baudis wrote: Dear diary, on Sat, Apr 16, 2005 at 05:17:00AM CEST, I got a letter where Daniel Barkalow [EMAIL PROTECTED] told me that... On Sat, 16 Apr 2005, Petr Baudis wrote: Dear diary, on Sat, Apr 16, 2005 at 04:47:55AM CEST, I got a letter where Petr

[PATCH] Use libcurl to use HTTP to get repositories

2005-04-16 Thread Daniel Barkalow
post 7.7 or so. Signed-Off-By: Daniel Barkalow [EMAIL PROTECTED] Index: Makefile === --- ed4f6e454b40650b904ab72048b2f93a068dccc3/Makefile (mode:100644 sha1:b39b4ea37586693dd707d1d0750a9b580350ec50

  1   2   >