| 85c414b | Linus Torvalds | 14 July 2005, 02:40:06 UTC | git-fetch-pack: close output fd after dup'ing the input With the socket case, the input and output fd's might end up being the same, so we want to dup the other before we close either of them. | 14 July 2005, 02:40:06 UTC |
| 2386d65 | Linus Torvalds | 14 July 2005, 01:46:20 UTC | Add first cut at "git protocol" connect logic. Useful for pulling stuff off a dedicated server. Instead of connecting with ssh or just starting a local pipeline, we connect over TCP to the other side and try to see if there's a git server listening. Of course, since I haven't written the git server yet, that will never happen. But the server really just needs to listen on a port, and execute a "git-upload-pack" when somebody connects. (It should read one packet-line, which should be of the format "git-upload-pack directoryname\n" and eventually we migth have other commands the server might accept). | 14 July 2005, 01:46:20 UTC |
| 2408cff | Linus Torvalds | 14 July 2005, 00:27:48 UTC | Make "git-checkout" create files with O_EXCL We should always have unlinked any old ones before, but this just makes sure that we never over-write any old file. A quick "grep" now shows that all the core tools that open files for writing use O_EXCL, ie we never overwrite an existing file in place. | 14 July 2005, 00:27:48 UTC |
| 1b66834 | Linus Torvalds | 14 July 2005, 00:25:53 UTC | git-apply: be a lot more careful when writing files We write them under another name and rename them to their destination, so that if something bad happens in the middle, we won't have caused any bigger harm. Also, this makes the writing be NFS "intr" safe, and as a side effects makes sure that if the target is hardlinked (or symlinked) we will have broken the link. | 14 July 2005, 00:25:53 UTC |
| dda2d79 | Junio C Hamano | 13 July 2005, 19:52:35 UTC | [PATCH] Clean up diff option descriptions. I got tired of maintaining almost duplicated descriptions in diff-* brothers, both in usage string and documentation. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 13 July 2005, 20:09:17 UTC |
| 52f2852 | Junio C Hamano | 13 July 2005, 19:45:51 UTC | [PATCH] git-diff-*: --name-only and --name-only-z. Porcelain layers often want to find only names of changed files, and even with diff-raw output format they end up having to pick out only the filename. Support --name-only (and --name-only-z for xargs -0 and cpio -0 users that want to treat filenames with embedded newlines sanely) flag to help them. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 13 July 2005, 19:55:07 UTC |
| 8a62a30 | Junio C Hamano | 13 July 2005, 19:45:06 UTC | [PATCH] diff-stages: support "-u" as a synonym for "-p". Just to be consistent, support "-u" as a synonym for "-p" like everybody else does. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 13 July 2005, 19:55:07 UTC |
| d6d8dac | Sven Verdoolaege | 12 July 2005, 21:35:32 UTC | [PATCH] git-cvsimport-script: parse multidigit revisions. Previously, git-cvsimport-script would fail on revisions with more than one digit. Signed-off-by: Sven Verdoolaege <skimo@kotnet.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 12 July 2005, 22:37:25 UTC |
| e30e814 | Tony Luck | 12 July 2005, 18:54:21 UTC | [PATCH] git: fix trivial warning from show_rename_copy() apply.c: In function `show_rename_copy': apply.c:1147: warning: field precision is not type int (arg 3) Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 12 July 2005, 20:04:31 UTC |
| 6aa33f4 | Linus Torvalds | 12 July 2005, 18:49:27 UTC | Abstract out the "name <email> date" handling of commit-tree.c We'll want to use it for the tagging too. | 12 July 2005, 18:49:27 UTC |
| 26a2d8a | Linus Torvalds | 12 July 2005, 17:33:06 UTC | parse_date(): allow const date string This is part of breaking up the tag ID patch by Eric Biederman. | 12 July 2005, 17:33:06 UTC |
| ced7c84 | Linus Torvalds | 12 July 2005, 17:12:52 UTC | "make clean" should clean up after a rpm build There's a few generated files that we left behind. | 12 July 2005, 17:12:52 UTC |
| f85639c | Linus Torvalds | 12 July 2005, 17:07:18 UTC | Rename the RPM from "git" to "git-core" That way we avoid any confusion with "GNU Interactive Tools", and it's more descriptive anyway (the rpm documentation talks about how git is split into a "core" part and an "SCM" part, this makes it clear that this is the core one). | 12 July 2005, 17:07:18 UTC |
| 37f1a51 | Linus Torvalds | 12 July 2005, 04:30:23 UTC | Add "git branch" script You can use it as git branch <branchname> [start-point] and it creates a new branch of name <branchname>. If a starting point is specified, that will be where the branch is created, otherwise it will be created at the current HEAD. The sequence git branch xyz abc git checkout xyz can also be written as git checkout -b xyz abc as per the previous commit. | 12 July 2005, 04:30:23 UTC |
| 91dcdfd | Linus Torvalds | 12 July 2005, 03:44:20 UTC | Make "git checkout" create new branches on demand In particular, if we check out something that isn't an old branch, it now requires a new branch-name to check the thing out into. So, for example: git checkout -b my-branch v2.6.12 will create the new branch "my-branch", and start it at v2.6.12, while git checkout master will just switch back to the master branch. Of course, if you want to create a new branch "my-branch" and _not_ check it out, you could have done so with just git-rev-parse v2.6.12^0 > .git/refs/heads/my-branch which I think I will codify as "git branch". | 12 July 2005, 03:44:20 UTC |
| 714fff2 | Linus Torvalds | 12 July 2005, 01:32:30 UTC | Make "git checkout" verify that the argument refers to a commit We still need to create a new branch if it didn't refer to an existing branch, otherwise our HEAD will continue to point to something totally different than what we just checked out. I'll need to think about it. Maybe only do it with "-f" and force it to the "master" branch? | 12 July 2005, 01:32:30 UTC |
| 79162bb | Linus Torvalds | 12 July 2005, 01:27:25 UTC | git-rev-parse: Allow a "zeroth" parent of a commit - the commit itself. This sounds nonsensical, but it's useful to make sure that the result is a commit. For example, "git-rev-parse v2.6.12" will return the _tag_ object for v2.6.12, but "git-rev-parse v2.6.12^0" will return the _commit_ object associated with that tag (and v2.6.12^1 will return the first parent). Also, since the "parent" code will actually parse the commit, this, together with the "--verify" flag, will verify not only that the result is a single SHA1, but will also have verified that it's a proper commit that we can see. | 12 July 2005, 01:27:25 UTC |
| e33b2ef | Linus Torvalds | 12 July 2005, 01:03:34 UTC | git-send-pack: Fix duplicate refname match Cut-and-paste dup noticed by Junio. It's not even harmless, since a match also causes that match to be invalidated, so this made it impossible to update an existing branch by name. I'd only tested the case of "ref doesn't exist at all on the other end", which worked fine. | 12 July 2005, 01:03:34 UTC |
| b1de9de | Chris Wright | 11 July 2005, 21:03:09 UTC | [PATCH] Bootstrap "make dist" Use git-tar-tree directly from git source during make dist. This handles bootstrap issue with git not being installed. Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 11 July 2005, 21:20:10 UTC |
| ab6625e | Junio C Hamano | 11 July 2005, 20:30:54 UTC | [PATCH] git-clone-script local optimization tweaks - When local optimization is used, the variable repo has already been passed through get_repo_base so there is no need to check for .git subdirectory in there. - Use cpio -l instead of "cp -l". Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 11 July 2005, 21:06:57 UTC |
| c1c774e | Sven Verdoolaege | 11 July 2005, 14:57:49 UTC | [PATCH] git-cvsimport-script: add "import only" option git-cvsimport-script: add "import only" option which tells the script not to perform a checkout after importing. This ensures that the working directory and cache remain untouched and will not create them if they do not exist. Acked-by: Matthias Urlichs <smurf@smurf.noris.de> Signed-off-by: Sven Verdoolaege <skimo@kotnet.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 11 July 2005, 17:26:07 UTC |
| 9c1fa70 | Bryan Larsen | 11 July 2005, 03:53:44 UTC | [PATCH] add --missing-ok option to write-tree This option allows a write-tree even if the referenced objects are not in the database. Signed-off-by: Bryan Larsen <bryan.larsen@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 11 July 2005, 17:20:53 UTC |
| ab90ea5 | Junio C Hamano | 11 July 2005, 07:00:55 UTC | [PATCH] Check packs and then files. This reverses the order of object lookup, to check pack index first and then go to the filesystem to find .git/objects/??/ hierarchy. When most of the objects are packed, this saves quite many stat() calls and negative dcache entries; while the price this approach has to pay is negligible, even when most of the objects are outside pack, because checking pack index file is quite cheap. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 11 July 2005, 17:13:09 UTC |
| 013aab8 | Junio C Hamano | 11 July 2005, 06:55:56 UTC | [PATCH] Dereference tag repeatedly until we get a non-tag. When we allow a tag object in place of a commit object, we only dereferenced the given tag once, which causes a tag that points at a tag that points at a commit to be rejected. Instead, dereference tag repeatedly until we get a non-tag. This patch makes change to two functions: - commit.c::lookup_commit_reference() is used by merge-base, rev-tree and rev-parse to convert user supplied SHA1 to that of a commit. - rev-list uses its own get_commit_reference() to do the same. Dereferencing tags this way helps both of these uses. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 11 July 2005, 17:13:09 UTC |
| a3eb250 | Junio C Hamano | 10 July 2005, 22:40:43 UTC | [PATCH] alternate object store and fsck The location alt_odb[j].name[0..] is filled with ??/?{38} to form a sha1 filename to try, but I was too lazy to allocate a copy, so while fsck_object_dir() is running for the directory, the filenames ??/?{38} are filled after NUL (usually and always the location should have '/'), making them "not found". This should fix it. Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 10 July 2005, 23:16:34 UTC |
| cf21919 | Linus Torvalds | 10 July 2005, 23:14:22 UTC | Fix up progress report for off-by-one error We used to print the index of the object we unpacked, not how many we had unpacked. Which caused slightly confusing progress reports like 100% (2/3) done rather than the more obvious "3/3" for 100% ;) | 10 July 2005, 23:14:22 UTC |
| 4bc5fbf | Linus Torvalds | 10 July 2005, 23:10:21 UTC | Make "git log" exit properly if not in a git archive Instead of getting an incomprehensible error message from git-rev-list. | 10 July 2005, 23:10:21 UTC |
| 0ee19dc | Linus Torvalds | 10 July 2005, 22:43:54 UTC | Avoid signedness warnings in sha1_file.c Very irritating. But "snprintf()" wants "char *", and zlib wants "unsigned char *". | 10 July 2005, 22:43:54 UTC |
| d5f1bef | Daniel Barkalow | 10 July 2005, 22:27:02 UTC | [PATCH] Remove map_sha1_file Remove map_sha1_file(), now unused. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 10 July 2005, 22:39:08 UTC |
| a5eda52 | Daniel Barkalow | 10 July 2005, 22:25:38 UTC | [PATCH] write_sha1_to_fd() 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 <barkalow@iabervon.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 10 July 2005, 22:39:08 UTC |
| 454fbbc | Linus Torvalds | 10 July 2005, 22:09:46 UTC | git-rev-list: allow missing objects when the parent is marked UNINTERESTING We still want the "top-most" uninteresting object to exist, so that we know that we have reached it. | 10 July 2005, 22:09:46 UTC |
| 167a4a3 | Linus Torvalds | 09 July 2005, 17:52:35 UTC | Add "-q" flag to "git commit" Maybe you don't want the progress report. | 09 July 2005, 17:52:35 UTC |
| d36f7b8 | Linus Torvalds | 09 July 2005, 17:43:02 UTC | git-unpack-objects: show progress report by default This ends up being very calming for big "git clone"s, since otherwise you just get very frustrated with a long silence, wondering whether it's working at all. Use "-q" to quiet it down. Now if we could just do the same for the initial "figure out what to pack" phase, which can also be quite slow if the other end is busy (or not packed and not in cache)... | 09 July 2005, 17:43:02 UTC |
| 1855c04 | Junio C Hamano | 09 July 2005, 02:27:15 UTC | [PATCH] format-patch: fix skipping of blank-lines If it is fed a commit with more than one leading blank lines, the sed scripts git-format-patch-script used looped forever. Using git-stripspace upfront makes the sed script somewhat simpler to work around this problem. Also use git-rev-parse so that we can say $ git-format-patch-script HEAD^^^^ to prepare the latest four patches for e-mail submission. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 09 July 2005, 02:48:44 UTC |
| ed61604 | Linus Torvalds | 09 July 2005, 01:26:19 UTC | Update the tutorial a bit Add notes on branches, merging, tagging, and update some of the usage to the friendlier "git cmd" syntax. It's still ridiculously lacking, but perhaps it's a _bit_ more useful. | 09 July 2005, 01:26:19 UTC |
| 918c05f | Linus Torvalds | 09 July 2005, 01:23:06 UTC | Make "git tag" more user-friendly Instead of having to cut-and-paste the result, write it to the tag directory directly. Also, start an editor for the tag message, rather than just reading it from stdin. | 09 July 2005, 01:23:06 UTC |
| 3ba513c | Linus Torvalds | 09 July 2005, 00:38:44 UTC | Make "git resolve" take the merge message in $3 It used to do "Merge $3" as the message, but that ends up being inconvenient, and much more easily done inside git-pull-script instead. This makes the third argument to "git resolve" much easier to explain. | 09 July 2005, 00:38:44 UTC |
| 69a97f1 | Bryan Larsen | 08 July 2005, 23:52:28 UTC | [PATCH] Use SHA1 for git-update-cache --refresh Change git-update-cache --refresh behaviour to use sha1's rather than comparing byte by byte. [JC demangled whitespace from the posted patch himself because he liked it so much. Also adjusted to the index_fd() interface slightly done differently from the original one.] Signed-off-by: Bryan Larsen <bryan.larsen@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 09 July 2005, 00:07:37 UTC |
| df6e151 | Bryan Larsen | 08 July 2005, 23:52:12 UTC | [PATCH] Add --info-only option to git-update-cache. Add --info-only option to git-update-cache. [JC demangled whitespace from the posted patch himself because he liked it so much. Also adjusted to the index_fd() interface slightly done differently from the original one.] Signed-off-by: Bryan Larsen <bryan.larsen@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 09 July 2005, 00:07:37 UTC |
| 7672db2 | Bryan Larsen | 08 July 2005, 23:51:55 UTC | [PATCH] Expose object ID computation functions. This patch makes the first half of write_sha1_file() and index_fd() externally visible, to allow callers to compute the object ID without actually storing it in the object database. [JC demangled the whitespaces himself because he liked the patch so much, and reworked the interface to index_fd() slightly, taking suggestion from Linus and of his own.] Signed-off-by: Bryan Larsen <bryan.larsen@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 09 July 2005, 00:07:37 UTC |
| 7558ef8 | Linus Torvalds | 09 July 2005, 00:07:12 UTC | Teach "git clone" about rsync sources That will be the normal way of cloning anonymously for a while, so let's make sure it's easy to use. | 09 July 2005, 00:07:12 UTC |
| 113b947 | Linus Torvalds | 08 July 2005, 23:22:22 UTC | Make "upload-pack" match git-fetch-pack usage Do the default "try xyz.git xyz fails" thing for the directory we get passed in. | 08 July 2005, 23:22:22 UTC |
| 26c8a53 | Linus Torvalds | 08 July 2005, 23:20:59 UTC | Add "mkpath()" helper function I'm bored with doing it by hand all the time. | 08 July 2005, 23:20:59 UTC |
| 5c5dc2f | Linus Torvalds | 08 July 2005, 22:59:29 UTC | Mark git-relink-script and git-repack-script executable Sure, "install" will default to installing it executable anyway, but this is the right thing to do. | 08 July 2005, 22:59:29 UTC |
| ba375ac | Linus Torvalds | 08 July 2005, 22:46:33 UTC | Make "git clone" a lot more user-friendly This silently adds the ".git" directory component if needed, so you don't need to state it explicitly for the source. Also, it turns the source into an absolute pathname when local, so that you can use relative pathnames without losing sight of the source when we cd into the destination. | 08 July 2005, 22:46:33 UTC |
| 51cb06c | Linus Torvalds | 08 July 2005, 21:24:25 UTC | Add "git-push-script" to make a more regular interface It only does local and ssh pushes, because it's really just a wrapper for git-send-pack. We might make it do an rsync mirror or something, of course. | 08 July 2005, 21:24:25 UTC |
| 584c6cc | Linus Torvalds | 08 July 2005, 20:58:40 UTC | Teach 'git-send-pack' to send new branches and tags. The protocol always supported it, but send-pack didn't actually know how to tell the other side about a new branch/tag. NOTE! You'll have to name it explicitly on the command line: if you don't name any branches, git-send-pack will default to the branches that already exist. | 08 July 2005, 20:58:40 UTC |
| 99a0a6e | Linus Torvalds | 08 July 2005, 20:56:05 UTC | Make "for_each_ref()" always use the "canonical" refname. It always uses a git-relative pathname, ie "refs/heads/master" instead of ".git/refs/heads/master" or whatever your GIT_DIR might be. This way when we send refs back-and-forth between repositories, there's never any question about GIT_DIR on either side. | 08 July 2005, 20:56:05 UTC |
| b10d0ec | Junio C Hamano | 08 July 2005, 07:02:52 UTC | [PATCH] Use sq_quote() to properly quote the parameter to call shell. This tries to be more lenient to the users and stricter to the attackers by quoting the input properly for shell safety, instead of forbidding certain characters from the input. Things to note: - We do not quote "prog" parameter (which comes from --exec). The user should know what he is doing. --exec='echo foo' will supply the first two parameters to the resulting command, while --exec="'echo foo'" will give the first parameter, a single string with a space inside. - We do not care too much about leaking the sq_quote() output just before running exec(). Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 08 July 2005, 18:01:10 UTC |
| 6fb737b | Junio C Hamano | 08 July 2005, 06:58:32 UTC | [PATCH] Make sq_expand() available as sq_quote(). A useful shell safety helper sq_expand() was hidden as a static function in diff.c. Extract it out and make it available as sq_quote(). Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 08 July 2005, 18:01:10 UTC |
| b33e966 | Linus Torvalds | 08 July 2005, 17:57:21 UTC | Add "git-sh-setup-script" for common git shell script setup It sets up the normal git environment variables and a few helper functions (currently just "die()"), and returns ok if it all looks like a git archive. So use it something like . git-sh-setup-script || die "Not a git archive" to make the rest of the git scripts more careful and readable. | 08 July 2005, 17:57:21 UTC |
| acb46f8 | Linus Torvalds | 08 July 2005, 17:45:07 UTC | git-diff-*: support "-u" as a synonym for "-p" I'm probably not the only one whose fingers have gotten hard-wired to use "-u" for "unified diff". | 08 July 2005, 17:45:07 UTC |
| 0acfc97 | Junio C Hamano | 05 July 2005, 20:19:05 UTC | [PATCH] git-format-patch: Prepare patches for e-mail submission. This is the script I use to prepare patches for e-mail submission. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 08 July 2005, 01:07:12 UTC |
| 924e121 | Linus Torvalds | 08 July 2005, 00:59:23 UTC | Mark more characters shell-safe. I still worry about just quoting things when passing it off to "ssh" or "sh -c", so I'm being anal. But _, ^ and , are certainly ok and while both ~ and @ can have speacial meaning to shell/ssh they are benign. | 08 July 2005, 00:59:23 UTC |
| 659cacf | Linus Torvalds | 08 July 2005, 00:05:41 UTC | git-fsck-cache: don't complain about lacking references when they are all in packs. We used to not count them at all, which then made us complain that there were no refs. | 08 July 2005, 00:05:41 UTC |
| e27a56a | Linus Torvalds | 07 July 2005, 22:56:49 UTC | Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/git | 07 July 2005, 22:56:49 UTC |
| 1038f0c | Junio C Hamano | 07 July 2005, 22:12:20 UTC | [PATCH] Typofix an error message in pack-check.c The current error message does not make any sense. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 07 July 2005, 22:54:57 UTC |
| 7765660 | Junio C Hamano | 07 July 2005, 18:39:10 UTC | [PATCH] Prevent t6000 series from dropping useless sed.script in t/ The Makefile in the test suite directory considers any file matching t[0-9][0-9][0-9][0-9]-*.sh as the top-level test script to be executed. Unfortunately this was not documented, and the common test library, t6000-lib.sh was named to match that pattern. This caused t6000-lib.sh to be called from Makefile as the top-level program, causing it to leave t/sed.script file behind. Rename it to t6000lib.sh to prevent this, and document the naming convention a bit more clearly. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 07 July 2005, 22:53:35 UTC |
| e95ab1e | Junio C Hamano | 06 July 2005, 20:04:21 UTC | [PATCH] Short-circuit git-clone-pack while cloning locally (take 2). When we are cloning a repository on a local filesystem, it is faster to just create a hard linkfarm of .git/object hierarchy and copy the .git/refs files. By default, the script uses the clone-pack method, but it can be told with the -l flag to do the hard linkfarm (falling back on recursive file copy) to replicate the .git/object hierarchy. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 07 July 2005, 22:53:35 UTC |
| a9db297 | Chris Wright | 07 July 2005, 20:09:50 UTC | Infrastructure for git rpm builds. Adds GIT_VERSION to Makefile and new make targets: git.spec, dist, and rpm. A simple 'make rpm' will build the rpm. Also adds git.spec.in which is used to generate git.spec. Signed-off-by: Chris Wright <chrisw@osdl.org> | 07 July 2005, 20:09:50 UTC |
| dd7ba8b | Linus Torvalds | 07 July 2005, 01:51:56 UTC | git-clone-pack: fix sparse warning Local function that wasn't marked static | 07 July 2005, 01:51:56 UTC |
| 84b18a8 | Jon Seymour | 07 July 2005, 01:26:43 UTC | [PATCH] Tidy up - remove use of (*f)() idiom from epoch.c Replace (*f)() with f() where the former idiom was used in epoch.c Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 07 July 2005, 01:47:38 UTC |
| a7336ae | Jon Seymour | 07 July 2005, 00:59:13 UTC | [PATCH] Ensure list insertion method does not depend on position of --merge-order argument This change ensures that git-rev-list --merge-order produces the same result irrespective of what position the --merge-order argument appears in the argument list. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 07 July 2005, 01:03:53 UTC |
| 28346d2 | Jon Seymour | 07 July 2005, 00:50:07 UTC | [PATCH] Write sed script directly into temp file, rather than a variable When sed uses \n rather than ; as a separator (for BSD sed(1) compat), it is cleaner to use a file directly, rather than an environment variable containing \n characters. This change changes t/t6000 write to sed.script directly and changes the other tests to remove knowledge of sed.script. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 07 July 2005, 01:00:28 UTC |
| f573571 | Jon Seymour | 07 July 2005, 00:50:04 UTC | [PATCH] Add t/t6003 with some --topo-order tests Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 07 July 2005, 01:00:28 UTC |
| 889adfe | Linus Torvalds | 06 July 2005, 23:55:53 UTC | Make gitk use --topo-order instead of --merge-order It's cheaper to calculate, and doesn't give different results depending on the order of the arguments passed in (and is thus more appropriate for something like gitk that can validly take the unordered "--all" flag to show all branches). The previous dup fix seems to have fixed --topo-order. Holler if you still see problems. | 06 July 2005, 23:55:53 UTC |
| 960cea2 | Linus Torvalds | 06 July 2005, 23:52:49 UTC | git-rev-list: remove the DUPCHECK logic, use SEEN instead That's what we should have done in the first place, since it not only avoids another unnecessary flag, it also protects the commits from showing up as duplicates later when they show up as parents of another commit (in the pop_most_recent_commit() path). This will hopefully also fix --topo-sort. | 06 July 2005, 23:52:49 UTC |
| e6c3505 | Linus Torvalds | 06 July 2005, 17:51:43 UTC | Make sure we generate the whole commit list before trying to sort it topologically This was my cherry-pickng merge bug. But topo-order still shows strange behaviour with multiple heads, so keep gitk using --merge-order for now. | 06 July 2005, 17:51:43 UTC |
| f312de0 | Junio C Hamano | 06 July 2005, 08:21:46 UTC | [PATCH] Let umask do its work upon filesystem object creation. IIRC our strategy was to let the users' umask take care of the final mode bits. This patch fixes places that deviate from it. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 06 July 2005, 17:39:59 UTC |
| b2cb942 | Junio C Hamano | 06 July 2005, 08:11:52 UTC | [PATCH] clone-pack.c:write_one_ref() - Create leading directories. The function write_one_ref() is passed the list of refs received from the other end, which was obtained by directory traversal under $GIT_DIR/refs; this can contain paths other than what git-init-db prepares and would fail to clone when there is such. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 06 July 2005, 17:39:58 UTC |
| ff9206e | Jon Seymour | 06 July 2005, 16:39:35 UTC | [PATCH] Fixes a problem with --merge-order A B (A is linear descendent of a merge B) This patch passes the test case introduced by the previous patch. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 06 July 2005, 17:29:30 UTC |
| 4d3a63b | Jon Seymour | 06 July 2005, 16:39:35 UTC | [PATCH] Add a t/t6001 test case for a --merge-order bug This test case demonstrates a problem with --merge-order. A | B |\ C D |/ E | F git-rev-list --merge-order A B doesn't produce the expected output of A B D C E F The problem is fixed by a subsequent patch. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 06 July 2005, 17:29:30 UTC |
| d2775a8 | Jon Seymour | 06 July 2005, 16:39:34 UTC | [PATCH] Tidy up - slight simplification of rev-list.c This patch implements a small tidy up of rev-list.c to reduce (but not eliminate) the amount of ugliness associated with the merge_order flag. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 06 July 2005, 17:28:02 UTC |
| d2d02a4 | Linus Torvalds | 06 July 2005, 17:25:04 UTC | Add "--topo-order" flag to use new topological sort | 06 July 2005, 17:25:04 UTC |
| ab580ac | Jon Seymour | 06 July 2005, 16:39:34 UTC | [PATCH] Add a topological sort procedure to commit.c This introduces an in-place topological sort procedure to commit.c. Given a list of commits, sort_in_topological_order() will perform an in-place topological sort of that list. The invariant that applies to the resulting list is: a reachable from b => ord(b) < ord(a) This invariant is weaker than the --merge-order invariant, but is cheaper to calculate (assuming the list has been identified) and will serve any purpose where only a minimal topological order guarantee is required. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 06 July 2005, 17:19:04 UTC |
| 9e9824b | Linus Torvalds | 06 July 2005, 17:09:58 UTC | Use the new git-rev-parse "--[no-]flags" in "git diff". This allows you to do git diff v2.6.12..v2.6.13-rc1 drivers/pcmcia to see the diff between v2.6.12 and v2.6.13-rc1 as limited by the filename argument. | 06 July 2005, 17:09:58 UTC |
| f79b65a | Linus Torvalds | 06 July 2005, 17:08:08 UTC | Add "--flags" and "--no-flags" arguments to git-rev-parse The scripts that use this (notably "git diff") will want to split up flags and file arguments. | 06 July 2005, 17:08:08 UTC |
| bce6286 | Linus Torvalds | 06 July 2005, 16:56:16 UTC | Remove insane overlapping bit ranges from epoch.c ..and move the DUPCHECK to rev-list.c since both the merge-order and the upcoming topo-sort get confused by dups. | 06 July 2005, 16:56:16 UTC |
| 7e21c29 | Linus Torvalds | 06 July 2005, 16:38:06 UTC | Clean up commit insertion in git-rev-list Jon wants the commits in a different order for merge-order. | 06 July 2005, 16:38:06 UTC |
| f755494 | Linus Torvalds | 06 July 2005, 16:31:17 UTC | Make "insert_by_date()" match "commit_list_insert()" Same argument order, same return type. This allows us to use a function pointer to choose one over the other. | 06 July 2005, 16:31:17 UTC |
| f6069c5 | Jon Seymour | 06 July 2005, 10:11:29 UTC | [PATCH] Change the sed seperator in t/t6000-lib.sh. This trivial patch removes the semicolon as the sed seperator in the t/t6000-lib.sh test script and replaces it with white space. This makes BSD sed(1) much happier. Signed-off-by: Mark Allen <mrallen1@yahoo.com> Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 06 July 2005, 16:26:13 UTC |
| 8904591 | Jon Seymour | 06 July 2005, 10:11:27 UTC | [PATCH] Introduce unit tests for git-rev-list --bisect This patch introduces some unit tests for the git-rev-list --bisect functionality. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 06 July 2005, 16:26:13 UTC |
| ce11895 | Jon Seymour | 06 July 2005, 10:11:24 UTC | [PATCH] Factor out useful test case infrastructure from t/t6001... into t/t6000-lib.sh Functions that are useful to other t6xxx testcases are moved into t6000-lib.sh To use these functions in a test case, use a test-case pre-amble like: . ./test-lib.sh . ../t6000-lib.sh # t6xxx specific functions Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 06 July 2005, 16:26:13 UTC |
| c619ad5 | Sven Verdoolaege | 06 July 2005, 06:37:12 UTC | [PATCH] Fix fd leak in git-cvsimport-script Remember to close temporary file Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 06 July 2005, 15:47:08 UTC |
| 5b35bcd | Junio C Hamano | 06 July 2005, 06:52:17 UTC | [PATCH] sha1_file.c;prepare_packed_git_one() - fix DIR leak The function calls opendir() without a matching closedir(). Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 06 July 2005, 15:47:08 UTC |
| b43d447 | Linus Torvalds | 06 July 2005, 02:00:26 UTC | Merge master.kernel.org:/pub/scm/gitk/gitk | 06 July 2005, 02:00:26 UTC |
| f17a1b1 | Linus Torvalds | 06 July 2005, 01:10:59 UTC | Fix up path-cleanup in git_path() properly GIT_DIR=. ends up being what some of the pack senders use, and we sometimes messed up when cleaning up the path, ie a ".//HEAD" was cleaned up into "/HEAD", not "HEAD" like it should be. We should do some other cleanup, and probably also verify that symlinks don't point to outside the git area. | 06 July 2005, 01:10:59 UTC |
| 319aae2 | Linus Torvalds | 06 July 2005, 00:19:20 UTC | Increase the number of possible heads requested from git-upload-pack Now that git-clone-pack exists, we actually have somebody requesting more than just a single head in a pack. So allow the Jeff's of this world to clone things with tens of heads. | 06 July 2005, 00:19:20 UTC |
| 0271611 | Linus Torvalds | 06 July 2005, 00:08:02 UTC | Add a "git-show-index" helper that shows the contents of a pack index This was invaluable for debugging the zero-sized compression issue, and might be useful for scripting too, if people want to see the contents of a pack. | 06 July 2005, 00:08:02 UTC |
| 291ec0f | Linus Torvalds | 06 July 2005, 00:06:09 UTC | Don't special-case a zero-sized compression. zlib actually writes a header for that case, and while ignoring that header will get us the right data, it will also end up messing up our stream position. So we actually want zlib to "uncompress" even an empty object. | 06 July 2005, 00:06:09 UTC |
| 72347a2 | Linus Torvalds | 05 July 2005, 22:47:34 UTC | Make "git clone" use the new git-clone-pack | 05 July 2005, 22:47:34 UTC |
| 1fcc8ea | Linus Torvalds | 05 July 2005, 22:45:37 UTC | Add "git-clone-pack" program to help with "git clone" | 05 July 2005, 22:45:37 UTC |
| 2f34ba3 | Linus Torvalds | 05 July 2005, 22:45:00 UTC | Fix silly thinko in "head_ref()" It did a "for_each_ref()" in addition to the HEAD case, which was a left-over from an early broken test. | 05 July 2005, 22:45:00 UTC |
| 41cb748 | Linus Torvalds | 05 July 2005, 22:44:09 UTC | Move "get_ack()" to common git_connect functions git-clone-pack will want it too. Soon. | 05 July 2005, 22:44:09 UTC |
| 4f7770c | Linus Torvalds | 05 July 2005, 21:39:30 UTC | Remove multi-head support from fetch-pack It was a misguided attempt to mix fetching and cloning. I'll make a separate clone thing. | 05 July 2005, 21:39:30 UTC |
| 12ba7ea | Linus Torvalds | 05 July 2005, 19:12:50 UTC | Remove unnecessary usage of strncmp() in git-rev-list arg parsing. Not only is it unnecessary, it incorrectly allows extraneous characters at the end of the argument. Junio noticed the --merge-order thing, and Jon points out that if we fix that one, we should fix --show-breaks too. | 05 July 2005, 19:12:50 UTC |
| bbca20a | Linus Torvalds | 05 July 2005, 19:03:14 UTC | Merge head 'cvs2git' of http://netz.smurf.noris.de/git/git | 05 July 2005, 19:03:14 UTC |
| f03f2ba | Linus Torvalds | 05 July 2005, 19:02:10 UTC | Work around git-http-pull breakage in git-fetch-script Need to add a final slash. And make it verbose by default, since it's so slow that otherwise people will think it's died. | 05 July 2005, 19:02:10 UTC |
| 0a623e7 | Linus Torvalds | 05 July 2005, 18:38:37 UTC | git-fetch-script: use git-fetch-pack for local and ssh fetches. Also, clean it up a lot. | 05 July 2005, 18:38:37 UTC |
| 723c31f | Linus Torvalds | 05 July 2005, 18:31:32 UTC | Add "git_path()" and "head_ref()" helper functions. "git_path()" returns a static pathname pointer into the git directory using a printf-like format specifier. "head_ref()" works like "for_each_ref()", except for just the HEAD. | 05 July 2005, 18:31:32 UTC |
