aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* [PATCH] Remove map_sha1_fileDaniel Barkalow2005-07-10
| | | | | | | Remove map_sha1_file(), now unused. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] write_sha1_to_fd()Daniel Barkalow2005-07-10
| | | | | | | | 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>
* git-rev-list: allow missing objects when the parent is marked UNINTERESTINGLinus Torvalds2005-07-10
| | | | | We still want the "top-most" uninteresting object to exist, so that we know that we have reached it.
* Add "-q" flag to "git commit"Linus Torvalds2005-07-09
| | | | Maybe you don't want the progress report.
* git-unpack-objects: show progress report by defaultLinus Torvalds2005-07-09
| | | | | | | | | | | | 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)...
* [PATCH] format-patch: fix skipping of blank-linesJunio C Hamano2005-07-08
| | | | | | | | | | | | | | | | 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>
* Update the tutorial a bitLinus Torvalds2005-07-08
| | | | | | | 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.
* Make "git tag" more user-friendlyLinus Torvalds2005-07-08
| | | | | | 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.
* Make "git resolve" take the merge message in $3Linus Torvalds2005-07-08
| | | | | | | 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.
* [PATCH] Use SHA1 for git-update-cache --refreshBryan Larsen2005-07-08
| | | | | | | | | | | | | 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>
* [PATCH] Add --info-only option to git-update-cache.Bryan Larsen2005-07-08
| | | | | | | | | | | | 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>
* [PATCH] Expose object ID computation functions.Bryan Larsen2005-07-08
| | | | | | | | | | | | | | 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>
* Teach "git clone" about rsync sourcesLinus Torvalds2005-07-08
| | | | | That will be the normal way of cloning anonymously for a while, so let's make sure it's easy to use.
* Make "upload-pack" match git-fetch-pack usageLinus Torvalds2005-07-08
| | | | | Do the default "try xyz.git xyz fails" thing for the directory we get passed in.
* Add "mkpath()" helper functionLinus Torvalds2005-07-08
| | | | I'm bored with doing it by hand all the time.
* Mark git-relink-script and git-repack-script executableLinus Torvalds2005-07-08
| | | | | Sure, "install" will default to installing it executable anyway, but this is the right thing to do.
* Make "git clone" a lot more user-friendlyLinus Torvalds2005-07-08
| | | | | | | | 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.
* Add "git-push-script" to make a more regular interfaceLinus Torvalds2005-07-08
| | | | | | 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.
* Teach 'git-send-pack' to send new branches and tags.Linus Torvalds2005-07-08
| | | | | | | | | 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.
* Make "for_each_ref()" always use the "canonical" refname.Linus Torvalds2005-07-08
| | | | | | | | 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.
* [PATCH] Use sq_quote() to properly quote the parameter to call shell.Junio C Hamano2005-07-08
| | | | | | | | | | | | | | | | | | | | 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>
* [PATCH] Make sq_expand() available as sq_quote().Junio C Hamano2005-07-08
| | | | | | | | | 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>
* Add "git-sh-setup-script" for common git shell script setupLinus Torvalds2005-07-08
| | | | | | | | | | 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.
* git-diff-*: support "-u" as a synonym for "-p"Linus Torvalds2005-07-08
| | | | | I'm probably not the only one whose fingers have gotten hard-wired to use "-u" for "unified diff".
* [PATCH] git-format-patch: Prepare patches for e-mail submission.Junio C Hamano2005-07-07
| | | | | | | 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>
* Mark more characters shell-safe.Linus Torvalds2005-07-07
| | | | | | 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.
* git-fsck-cache: don't complain about lacking references when they are all in ↵Linus Torvalds2005-07-07
| | | | | | | packs. We used to not count them at all, which then made us complain that there were no refs.
* Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/gitLinus Torvalds2005-07-07
|\
| * Infrastructure for git rpm builds. Adds GIT_VERSION to Makefile and new makeChris Wright2005-07-07
| | | | | | | | | | | | | | 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>
* | [PATCH] Typofix an error message in pack-check.cJunio C Hamano2005-07-07
| | | | | | | | | | | | | | 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>
* | [PATCH] Prevent t6000 series from dropping useless sed.script in t/Junio C Hamano2005-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | [PATCH] Short-circuit git-clone-pack while cloning locally (take 2).Junio C Hamano2005-07-07
|/ | | | | | | | | | | | 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>
* git-clone-pack: fix sparse warningLinus Torvalds2005-07-06
| | | | Local function that wasn't marked static
* [PATCH] Tidy up - remove use of (*f)() idiom from epoch.cJon Seymour2005-07-06
| | | | | | | 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>
* [PATCH] Ensure list insertion method does not depend on position of ↵Jon Seymour2005-07-06
| | | | | | | | | | | --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>
* [PATCH] Write sed script directly into temp file, rather than a variableJon Seymour2005-07-06
| | | | | | | | | | | | 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>
* [PATCH] Add t/t6003 with some --topo-order testsJon Seymour2005-07-06
| | | | | Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Make gitk use --topo-order instead of --merge-orderLinus Torvalds2005-07-06
| | | | | | | | | | 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.
* git-rev-list: remove the DUPCHECK logic, use SEEN insteadLinus Torvalds2005-07-06
| | | | | | | | | 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.
* Make sure we generate the whole commit list before trying to sort it ↵Linus Torvalds2005-07-06
| | | | | | | 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.
* [PATCH] Let umask do its work upon filesystem object creation.Junio C Hamano2005-07-06
| | | | | | | | 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>
* [PATCH] clone-pack.c:write_one_ref() - Create leading directories.Junio C Hamano2005-07-06
| | | | | | | | | | | 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>
* [PATCH] Fixes a problem with --merge-order A B (A is linear descendent of a ↵Jon Seymour2005-07-06
| | | | | | | | | 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>
* [PATCH] Add a t/t6001 test case for a --merge-order bugJon Seymour2005-07-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* [PATCH] Tidy up - slight simplification of rev-list.cJon Seymour2005-07-06
| | | | | | | | | 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>
* Add "--topo-order" flag to use new topological sortLinus Torvalds2005-07-06
|
* [PATCH] Add a topological sort procedure to commit.cJon Seymour2005-07-06
| | | | | | | | | | | | | | | | | | 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>
* Use the new git-rev-parse "--[no-]flags" in "git diff".Linus Torvalds2005-07-06
| | | | | | | | | 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.
* Add "--flags" and "--no-flags" arguments to git-rev-parseLinus Torvalds2005-07-06
| | | | | The scripts that use this (notably "git diff") will want to split up flags and file arguments.
* Remove insane overlapping bit ranges from epoch.cLinus Torvalds2005-07-06
| | | | | ..and move the DUPCHECK to rev-list.c since both the merge-order and the upcoming topo-sort get confused by dups.
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-01 02:16:39 +0000