aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* [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.
* Clean up commit insertion in git-rev-listLinus Torvalds2005-07-06
| | | | Jon wants the commits in a different order for merge-order.
* Make "insert_by_date()" match "commit_list_insert()"Linus Torvalds2005-07-06
| | | | | Same argument order, same return type. This allows us to use a function pointer to choose one over the other.
* [PATCH] Change the sed seperator in t/t6000-lib.sh.Jon Seymour2005-07-06
| | | | | | | | | 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>
* [PATCH] Introduce unit tests for git-rev-list --bisectJon Seymour2005-07-06
| | | | | | | 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>
* [PATCH] Factor out useful test case infrastructure from t/t6001... into ↵Jon Seymour2005-07-06
| | | | | | | | | | | | | | 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>
* [PATCH] Fix fd leak in git-cvsimport-scriptSven Verdoolaege2005-07-06
| | | | | | Remember to close temporary file Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] sha1_file.c;prepare_packed_git_one() - fix DIR leakJunio C Hamano2005-07-06
| | | | | | | 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>
* Merge master.kernel.org:/pub/scm/gitk/gitkLinus Torvalds2005-07-05
|\
| * Add a menu item for writing out a commit to a file.Paul Mackerras2005-06-29
| | | | | | | | | | | | | | This just invokes git-diff-tree. Also changed the readonly entry widgets in the "write patch" and "generate tag" windows to have flat relief, so it doesn't look like you should be able to modify what's in them.
* | Fix up path-cleanup in git_path() properlyLinus Torvalds2005-07-05
| | | | | | | | | | | | | | | | | | 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.
* | Increase the number of possible heads requested from git-upload-packLinus Torvalds2005-07-05
| | | | | | | | | | | | 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.
* | Add a "git-show-index" helper that shows the contents of a pack indexLinus Torvalds2005-07-05
| | | | | | | | | | | | 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.
* | Don't special-case a zero-sized compression.Linus Torvalds2005-07-05
| | | | | | | | | | | | | | 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.
* | Make "git clone" use the new git-clone-packLinus Torvalds2005-07-05
| |
* | Add "git-clone-pack" program to help with "git clone"Linus Torvalds2005-07-05
| |
* | Fix silly thinko in "head_ref()"Linus Torvalds2005-07-05
| | | | | | | | | | It did a "for_each_ref()" in addition to the HEAD case, which was a left-over from an early broken test.
* | Move "get_ack()" to common git_connect functionsLinus Torvalds2005-07-05
| | | | | | | | git-clone-pack will want it too. Soon.
* | Remove multi-head support from fetch-packLinus Torvalds2005-07-05
| | | | | | | | | | It was a misguided attempt to mix fetching and cloning. I'll make a separate clone thing.
* | Remove unnecessary usage of strncmp() in git-rev-list arg parsing.Linus Torvalds2005-07-05
| | | | | | | | | | | | | | | | 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.
* | Merge head 'cvs2git' of http://netz.smurf.noris.de/git/gitLinus Torvalds2005-07-05
|\ \
| * \ Merge with Linus' current treeMatthias Urlichs2005-07-05
| |\ \
generated by cgit v1.2.1 (git 2.18.0) at 2024-08-01 19:48:54 +0000