summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-04-29Merge branch 'jc/diff' into nextLibravatar Junio C Hamano7-18/+405
* jc/diff: built-in diff: assorted updates. built-in diff.
2006-04-29built-in diff: assorted updates.Libravatar Junio C Hamano4-26/+79
"git diff(n)" without --base, --ours, etc. defaults to --cc, which usually is the same as -p unless you are in the middle of a conflicted merge, just like the shell script version. "git diff(n) blobA blobB path" complains and dies. "git diff(n) tree0 tree1 tree2...treeN" does combined diff that shows a merge of tree1..treeN to result in tree0. Giving "-c" option to any command that defaults to "--cc" turns off dense-combined flag. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-28built-in diff.Libravatar Junio C Hamano4-1/+335
This starts to replace the shell script version of "git diff". Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-28Merge branch 'np/delta' into nextLibravatar Junio C Hamano2-35/+151
* np/delta: replace adler32 with Rabin's polynomial in diff-delta
2006-04-28replace adler32 with Rabin's polynomial in diff-deltaLibravatar Nicolas Pitre2-35/+151
This brings another small repacking speedup for sensibly the same pack size. On the Linux kernel repo, git-repack -a -f is 3.7% faster for a 0.4% larger pack. Credits to Geert Bosch who brought the Rabin's polynomial idea to my attention. This also eliminate the issue of adler32() reading past the data buffer, as noticed by Johannes Schindelin. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-28Merge branch 'master' into nextLibravatar Junio C Hamano13-135/+178
* master: Fix trivial typo in git-log man page. Properly render asciidoc "callouts" in git man pages. Fix up remaining man pages that use asciidoc "callouts". Update the git-branch man page to include the "-r" option, annotate: display usage information if no filename was given annotate: fix warning about uninitialized scalar git-am --resolved: more usable error message.
2006-04-28Merge branch 'fix'Libravatar Junio C Hamano13-135/+178
* fix: Fix trivial typo in git-log man page. Properly render asciidoc "callouts" in git man pages. Fix up remaining man pages that use asciidoc "callouts". Update the git-branch man page to include the "-r" option, annotate: display usage information if no filename was given annotate: fix warning about uninitialized scalar git-am --resolved: more usable error message.
2006-04-28Fix trivial typo in git-log man page.Libravatar Sean Estabrooks1-4/+3
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
2006-04-28Properly render asciidoc "callouts" in git man pages.Libravatar Sean Estabrooks2-1/+17
Adds an xsl fragment to render docbook callouts when converting to man page format. Update the Makefile to have "xmlto" use it when generating man pages. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
2006-04-28Fix up remaining man pages that use asciidoc "callouts".Libravatar Sean Estabrooks6-108/+104
Unfortunately docbook does not allow a callout to be referenced from inside a callout list description. Rewrite one paragraph in git-reset man page to work around this limitation. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
2006-04-28Update the git-branch man page to include the "-r" option,Libravatar Sean Estabrooks2-19/+40
and fix up asciidoc "callouts" Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
2006-04-28annotate: display usage information if no filename was givenLibravatar Matthias Kestenholz1-3/+4
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
2006-04-28annotate: fix warning about uninitialized scalarLibravatar Matthias Kestenholz1-0/+3
Use of uninitialized value in scalar chomp at ./git-annotate.perl line 212, <$kid> chunk 4. Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
2006-04-28git-am --resolved: more usable error message.Libravatar Junio C Hamano1-0/+7
After doing the hard work of hand resolving the conflicts in the working tree, if the user forgets to run update-index to mark the paths that have been resolved, the command gave an unfriendly "fatal: git-write-tree: not able to write tree" error message. Catch the situation early and give more meaningful message and suggestion. Noticed and suggested by Len Brown. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-28Merge branch 'jc/cache-tree' into nextLibravatar Junio C Hamano1-1/+1
* jc/cache-tree: cache-tree.c: typefix
2006-04-27cache-tree.c: typefixLibravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-27Merge branch 'jc/count' into nextLibravatar Junio C Hamano5-4/+129
* jc/count: built-in count-objects. pack-objects: update size heuristucs. verify-pack: check integrity in a saner order.
2006-04-27built-in count-objects.Libravatar Junio C Hamano4-1/+126
Also it learned to do -v (verbose) to report: - number of loose objects - disk occupied by loose objects - number of objects in local packs - number of loose objects that are also in pack - unrecognised garbage in .git/objects/??/. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-27pack-objects: update size heuristucs.Libravatar Junio C Hamano1-6/+6
We used to omit delta base candidates that is much bigger than the target, but delta size does not grow when we delete more, so that was not a very good heuristics. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-27Merge branch 'np/delta' into nextLibravatar Junio C Hamano1-37/+41
* np/delta: use delta index data when finding best delta matches
2006-04-27Merge branch 'jc/cache-tree' into nextLibravatar Junio C Hamano4-18/+62
* jc/cache-tree: test-dump-cache-tree: validate the cached data as well. cache_tree_update: give an option to update cache-tree only.
2006-04-27test-dump-cache-tree: validate the cached data as well.Libravatar Junio C Hamano1-11/+45
While dumping the cached data, try recomputing everything from scratch to make sure things match. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-27cache_tree_update: give an option to update cache-tree only.Libravatar Junio C Hamano3-7/+17
When the extra "dryrun" parameter is true, cache_tree_update() recomputes the invalid entry but does not actually creates new tree object. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-27Merge branch 'fix'Libravatar Junio C Hamano1-3/+3
* fix: verify-pack: check integrity in a saner order.
2006-04-27verify-pack: check integrity in a saner order.Libravatar Junio C Hamano1-3/+3
Check internal integrity to report corrupt pack or idx, and then check cross-integrity between idx and pack. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-27Merge branch 'jc/pathcheck' into nextLibravatar Junio C Hamano3-3/+36
* jc/pathcheck: revision parsing: make "rev -- paths" checks stronger.
2006-04-27Fix mismerged update-index from jc/cache-tree branch.Libravatar Junio C Hamano1-1/+0
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-27Retire rabinpoly fingerprinting codeLibravatar Junio C Hamano7-521/+0
For now let's retire this and reintroduce it as part of the updated pack-objects series from Geert when it is ready. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-27Merge branch 'master' into nextLibravatar Junio C Hamano3-2/+1
* master: Fix "git help -a" terminal autosizing diff-index: fix compilation warnings.
2006-04-27Merge branch 'pb/config'Libravatar Junio C Hamano4-13/+30
* pb/config: git-cvsserver: typofixes Deprecate usage of git-var -l for getting config vars list git-repo-config --list support
2006-04-27Merge branch 'jc/diffstat'Libravatar Junio C Hamano1-4/+14
* jc/diffstat: diff --stat: show complete rewrites consistently.
2006-04-27Fix "git help -a" terminal autosizingLibravatar Linus Torvalds2-1/+1
When I split out the builtin commands into their own files, I left the include of <sys/ioctl.h> in git.c rather than moving it to the file that needed it (builtin-help.c). Nobody seems to have noticed, because everything still worked, but because the TIOCGWINSZ macro was now no longer defined when compiling the "term_columns()" function, it would no longer automatically notice the terminal size unless your system used the ancient "COLUMNS" environment variable approach. Trivially fixed by just moving the header include to the file that actually needs it. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-27diff-index: fix compilation warnings.Libravatar Junio C Hamano1-1/+0
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-27Merge branch 'jc/cache-tree' into nextLibravatar Junio C Hamano3-7/+67
* jc/cache-tree: read-tree: teach 1-way merege and plain read to prime cache-tree. read-tree: teach 1 and 2 way merges about cache-tree. update-index: when --unresolve, smudge the relevant cache-tree entries.
2006-04-27read-tree: teach 1-way merege and plain read to prime cache-tree.Libravatar Junio C Hamano3-3/+54
This teaches read-tree to fully populate valid cache-tree when reading a tree from scratch, or reading a single tree into an existing index, reusing only the cached stat information (i.e. one-way merge). We have already taught update-index about cache-tree, so "git checkout" followed by updates to a few path followed by a "git commit" would become very efficient. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-27read-tree: teach 1 and 2 way merges about cache-tree.Libravatar Junio C Hamano1-4/+13
This teaches one-way and two-way "read-tree -m" (and its special form, "read-tree --reset" as well) not to discard cache-tree but invalidate only the changed parts of the tree. When switching between related branches, this helps the eventual commit (i.e. write-tree) by keeping cache-tree valid as much as possible. This does not prime cache-tree yet, but we ought to be able to do that for no-merge (i.e. reading from a tree object) case and, and also perhaps 1 way merge case. With this patch applied, switching between the tip of Linux 2.6 kernel tree and a branch that touches one path (fs/ext3/Makefile) from it invalidates only 3 paths out of 1201 cache-tree entries in the index, and subsequent write-tree takes about a half as much time as before. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-26update-index: when --unresolve, smudge the relevant cache-tree entries.Libravatar Junio C Hamano1-0/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-26use delta index data when finding best delta matchesLibravatar Nicolas Pitre1-37/+41
This patch allows for computing the delta index for each base object only once and reuse it when trying to find the best delta match. This should set the mark and pave the way for possibly better delta generator algorithms. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-26Merge branch 'jc/cache-tree' into nextLibravatar Junio C Hamano1-0/+28
* jc/cache-tree: t0000-basic: more commit-tree tests.
2006-04-26Merge branch 'master' into jc/cache-treeLibravatar Junio C Hamano7-25/+63
* master: t0000-basic: more commit-tree tests. commit-tree.c: check_valid() microoptimization. Fix filename verification when in a subdirectory rebase: typofix. socksetup: don't return on set_reuse_addr() error
2006-04-26t0000-basic: more commit-tree tests.Libravatar Junio C Hamano1-0/+28
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-26Merge branch 'se/rebase' into nextLibravatar Junio C Hamano2-37/+101
* se/rebase: Add --continue and --abort options to git-rebase.
2006-04-26Merge branch 'nh/fetch-http' into nextLibravatar Junio C Hamano7-29/+47
* nh/fetch-http: git-fetch: resolve remote symrefs for HTTP transport commit-tree.c: check_valid() microoptimization. Fix filename verification when in a subdirectory rebase: typofix. socksetup: don't return on set_reuse_addr() error
2006-04-26git-fetch: resolve remote symrefs for HTTP transportLibravatar Nick Hengeveld1-4/+12
git-fetch validates that a remote ref resolves to a SHA1 prior to calling git-http-fetch. This adds support for resolving a few levels of symrefs to get to the SHA1. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-26Add --continue and --abort options to git-rebase.Libravatar sean2-37/+101
git rebase [--onto <newbase>] <upstream> [<branch>] git rebase --continue git rebase --abort Add "--continue" to restart the rebase process after manually resolving conflicts. The user is warned if there are still differences between the index and the working files. Add "--abort" to restore the original branch, and remove the .dotest working files. Some minor additions to the git-rebase documentation. [jc: fix that applies to the maintenance track has been dealt with separately.] Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-26revision parsing: make "rev -- paths" checks stronger.Libravatar Junio C Hamano3-3/+36
If you don't have a "--" marker, then: - all of the arguments we are going to assume are pathspecs must exist in the working tree. - none of the arguments we parsed as revisions could be interpreted as a filename. so that there really isn't any possibility of confusion in case somebody does have a revision that looks like a pathname too. The former rule has been in effect; this implements the latter. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-26Merge branch 'fix'Libravatar Junio C Hamano6-25/+35
* fix: commit-tree.c: check_valid() microoptimization. Fix filename verification when in a subdirectory rebase: typofix. socksetup: don't return on set_reuse_addr() error
2006-04-26commit-tree.c: check_valid() microoptimization.Libravatar Junio C Hamano1-6/+5
There is no point reading the whole object just to make sure it exists and it is of the expected type. We added sha1_object_info() for such need after this code was written, so use it. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-26Fix filename verification when in a subdirectoryLibravatar Linus Torvalds4-18/+29
When we are in a subdirectory of a git archive, we need to take the prefix of that subdirectory into accoung when we verify filename arguments. Noted by Matthias Lederhofer This also uses the improved error reporting for all the other git commands that use the revision parsing interfaces, not just git-rev-parse. Also, it makes the error reporting for mixed filenames and argument flags clearer (you cannot put flags after the start of the pathname list). [jc: with fix to a trivial typo noticed by Timo Hirvonen] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-26rebase: typofix.Libravatar Junio C Hamano1-1/+1
Noticed by Sean. Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 21:47:06 +0000