summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [PATCH] Add a t/t6001 test case for a --merge-order bugJon Seymour2005-07-061-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-061-7/+3
| | | | | | | | | 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-061-0/+7
|
* [PATCH] Add a topological sort procedure to commit.cJon Seymour2005-07-062-0/+120
| | | | | | | | | | | | | | | | | | 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-061-2/+3
| | | | | | | | | 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-061-0/+14
| | | | | 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-063-15/+13
| | | | | ..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-061-1/+4
| | | | Jon wants the commits in a different order for merge-order.
* Make "insert_by_date()" match "commit_list_insert()"Linus Torvalds2005-07-064-9/+8
| | | | | 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-061-1/+3
| | | | | | | | | 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-061-0/+247
| | | | | | | 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-062-111/+106
| | | | | | | | | | | | | | 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-061-0/+1
| | | | | | 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-061-0/+1
| | | | | | | 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-051-9/+66
|\
| * Add a menu item for writing out a commit to a file.Paul Mackerras2005-06-291-9/+66
| | | | | | | | | | | | | | 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-051-4/+10
| | | | | | | | | | | | | | | | | | 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-051-1/+1
| | | | | | | | | | | | 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-052-1/+30
| | | | | | | | | | | | 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-051-2/+0
| | | | | | | | | | | | | | 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-051-4/+1
| |
* | Add "git-clone-pack" program to help with "git clone"Linus Torvalds2005-07-052-1/+209
| |
* | Fix silly thinko in "head_ref()"Linus Torvalds2005-07-051-2/+2
| | | | | | | | | | 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-053-18/+20
| | | | | | | | git-clone-pack will want it too. Soon.
* | Remove multi-head support from fetch-packLinus Torvalds2005-07-051-38/+3
| | | | | | | | | | 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-051-2/+2
| | | | | | | | | | | | | | | | 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-055-367/+831
|\ \
| * \ Merge with Linus' current treeMatthias Urlichs2005-07-055-367/+831
| |\ \
| | * \ Merge with http://www.liacs.nl/~sverdool/git.git#cvs2gitMatthias Urlichs2005-07-051-54/+95
| | |\ \
| | | * | git-cvsimport-script: move working directory forwardSven Verdoolaege2005-07-051-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If HEAD happened to point to a cvs branch, move the working directory forward to the tip of the branch. Additionally, if master and "origin" are equal, move master forward to new origin first.
| | | * | git-cvsimport-script: remove unused variableSven Verdoolaege2005-07-041-2/+0
| | | | |
| | | * | git-cvsimport-script: more error handlingSven Verdoolaege2005-07-041-2/+3
| | | | |
| | | * | git-cvsimport-script: provide direct support for cvsps -z optionSven Verdoolaege2005-07-041-4/+5
| | | | |
| | | * | git-cvsimport-script: update cvsps cache instead of rebuilding itSven Verdoolaege2005-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating the cache is sufficient for most purposes. If users really want to rebuild the cache, they can specify the option themselves.
| | | * | git-cvsimport-script: fix branch switchingSven Verdoolaege2005-07-041-1/+2
| | | | | | | | | | | | | | | | | | | | Previous patch broke branch switching.
| | | * | git-cvsimport-script: use private index.Sven Verdoolaege2005-07-041-20/+23
| | | | |
| | | * | git-cvsimport-script: leave working directory alone.Sven Verdoolaege2005-07-041-33/+48
| | | | |
| | | * | git-cvsimport-script: typo head -> headsSven Verdoolaege2005-07-031-1/+1
| | | | |
| | * | | cvsimport: getopt accepted a -q option (undocumented and unused).Matthias Urlichs2005-07-051-1/+1
| | |/ / | | | | | | | | | | | | Removed.
| | * | cvsimport: Missing tests for verbosity flag.Matthias Urlichs2005-07-031-2/+2
| | | |
| | * | Support :ext: access method.Sven Verdoolaege2005-07-032-3/+23
| | | |
| | * | Honour CVS_SERVER.Sven Verdoolaege2005-07-031-1/+3
| | | |
| | * | git-cvsimport-script: clean up documentationSven Verdoolaege2005-07-031-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove documentation of irrelevant "type" option. Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
| | * | Make specification of CVS module to convert optional.Sven Verdoolaege2005-07-032-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we're inside a checked out CVS repository, there is no need to explicitly specify the module as it is available in CVS/Repository. Also read CVS/Root if it's available and -d is not specified. Finally, explicitly pass root to cvsps as CVS/Root takes precedence over CVSROOT. Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
| | * | Fixed a typo in Documentation/git-cvsimport-script.txt.Sven Verdoolaege2005-07-031-1/+1
| | | |
| | * | cvsimport: add documentation.Matthias Urlichs2005-06-301-0/+82
| | | |
| | * | cvsimport: Added option '-p': pass options to cvspsMatthias Urlichs2005-06-301-3/+6
| | | | | | | | | | | | | | | | Added option '-x' to cvsps call
| | * | cvsimport: Exit if an existing repository doesn't have the right branch.Matthias Urlichs2005-06-301-0/+5
| | | |
| | * | cvs import: Strip whitespace at the end of the log entryMatthias Urlichs2005-06-301-1/+6
| | | | | | | | | | | | | | | | for compatibility with old cvs2git.
| | * | cvsimport: perform string comparison on "HEAD"Sven Verdoolaege2005-06-301-1/+1
| | | |
View Lorry Controller Status