summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-05-17Merge branch 'jc/gitlink' into nextLibravatar Junio C Hamano1-6/+6
* jc/gitlink: read-tree: reorganize bind_merge code.
2006-05-17read-tree: reorganize bind_merge code.Libravatar Junio C Hamano1-6/+6
This does not change the logic but moves the order of checks around so that merging of read-tree safety code would become easier. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-17Merge branch 'ew/pretty-fmt' into nextLibravatar Junio C Hamano1-16/+25
* ew/pretty-fmt: commit: allow --pretty= args to be abbreviated Conflicts: commit.c - adjust to --pretty=email
2006-05-17Merge branch 'jc/grep' into nextLibravatar Junio C Hamano2-3/+30
* jc/grep: builtin-grep: workaround for non GNU grep.
2006-05-17commit: allow --pretty= args to be abbreviatedLibravatar Eric Wong1-14/+24
Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-17builtin-grep: workaround for non GNU grep.Libravatar Junio C Hamano2-3/+30
Some implementations do not know what to do with -H; define NO_H_OPTION_IN_GREP when you build git if your grep lacks -H. Most of the time, it can be worked around by prepending /dev/null to the argument list, but that causes -L and -c to slightly misbehave (they both expose /dev/null is given), so when these options are given, do not run external grep that does not understand -H. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-16Merge branch 'master' into nextLibravatar Junio C Hamano4-71/+23
* master: Remove old "git-grep.sh" remnants merge-base: Clarify the comments on post processing. Update the documentation for git-merge-base
2006-05-16Remove old "git-grep.sh" remnantsLibravatar Linus Torvalds2-64/+3
It's built-in now. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-16Merge branch 'maint'Libravatar Junio C Hamano2-7/+20
* maint: merge-base: Clarify the comments on post processing. Update the documentation for git-merge-base
2006-05-16Merge branch 'np/pack'Libravatar Junio C Hamano2-13/+16
* np/pack: improve depth heuristic for maximum delta size pack-object: slightly more efficient simple euristic for further free packing improvements
2006-05-16merge-base: Clarify the comments on post processing.Libravatar Junio C Hamano1-3/+6
The comment fooled myself believing that we still had an unsolved horizon effect. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-16Merge branch 'np/pack' into nextLibravatar Junio C Hamano1-2/+5
* np/pack: improve depth heuristic for maximum delta size
2006-05-16improve depth heuristic for maximum delta sizeLibravatar Nicolas Pitre1-2/+5
This provides a linear decrement on the penalty related to delta depth instead of being an 1/x function. With this another 5% reduction is observed on packs for both the GIT repo and the Linux kernel repo, as well as fixing a pack size regression in another sample repo I have. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-15Merge branch 'se/tag'Libravatar Junio C Hamano1-5/+3
* se/tag: Strip useless "tags/" prefix from git-tag -l output
2006-05-15Merge branch 'se/rev-parse'Libravatar Junio C Hamano5-7/+48
* se/rev-parse: Add "--branches", "--tags" and "--remotes" options to git-rev-parse.
2006-05-15Merge branch 'se/diff'Libravatar Junio C Hamano6-6/+96
* se/diff: Convert some "apply --summary" users to "diff --summary". Add "--summary" option to git diff.
2006-05-15Merge branch 'se/rebase'Libravatar Junio C Hamano3-13/+30
* se/rebase: Make git rebase interactive help match documentation.
2006-05-15Update the documentation for git-merge-baseLibravatar Fredrik Kuivinen1-4/+14
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-15Merge branch 'jc/diff' into nextLibravatar Junio C Hamano1-3/+5
* jc/diff: builtin-diff: fix comparison between two blobs.
2006-05-15builtin-diff: fix comparison between two blobs.Libravatar Junio C Hamano1-3/+5
The code forgot that setup_revisions() leaves parsed object names in reverse in the list. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-15Merge branch 'master' into nextLibravatar Junio C Hamano4-6/+6
* master: Fix silly typo in new builtin grep Fix pack-index issue on 64-bit platforms a bit more portably. Install git-send-email by default Fix compilation on newer NetBSD systems
2006-05-15Merge branch 'lt/oneway'Libravatar Junio C Hamano2-48/+17
* lt/oneway: read-tree --reset -u fix. read-tree -u one-way merge fix to check out locally modified paths. Simplify "git reset --hard" Allow one-way tree merge to remove old files
2006-05-15Merge branch 'ew/send-email'Libravatar Junio C Hamano1-23/+52
* ew/send-email: send-email: quiet some warnings, reject invalid addresses send-email: allow sendmail binary to be used instead of SMTP
2006-05-15Merge branch 'lt/config'Libravatar Junio C Hamano1-1/+0
* lt/config:
2006-05-15Merge branch 'jc/grep'Libravatar Junio C Hamano5-24/+951
* jc/grep: (22 commits) Fix silly typo in new builtin grep builtin-grep: unparse more command line options. builtin-grep: use external grep when we can take advantage of it builtin-grep: -F (--fixed-strings) builtin-grep: -w fix builtin-grep: typofix builtin-grep: tighten argument parsing. builtin-grep: documentation Teach -f <file> option to builtin-grep. builtin-grep: -L (--files-without-match). builtin-grep: binary files -a and -I builtin-grep: terminate correctly at EOF builtin-grep: tighten path wildcard vs tree traversal. builtin-grep: support -w (--word-regexp). builtin-grep: support -c (--count). builtin-grep: allow more than one patterns. builtin-grep: allow -<n> and -[ABC]<n> notation for context lines. builtin-grep: printf %.*s length is int, not ptrdiff_t. builtin-grep: do not use setup_revisions() builtin-grep: support '-l' option. ...
2006-05-15Merge branch 'lt/diff'Libravatar Junio C Hamano3-1/+53
* lt/diff: git diff: support "-U" and "--unified" options properly
2006-05-15Fix silly typo in new builtin grepLibravatar Linus Torvalds1-1/+1
The "-F" flag apparently got mis-translated due to some over-eager copy-paste work into a duplicate "-H" when using the external grep. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-15Merge branch 'jc/apply' into nextLibravatar Junio C Hamano2-56/+54
* jc/apply: git-am: use apply --cached apply --cached: apply a patch without using working tree.
2006-05-15git-am: use apply --cachedLibravatar Junio C Hamano1-36/+2
Now 'git apply' can apply patch without working tree, preparation of pristine preimage and postimage trees that are done when falling back on 3-way merge by "git am" can do so without temporary files. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-15apply --cached: apply a patch without using working tree.Libravatar Junio C Hamano1-20/+52
A new flag "--cached" takes the cached data, applies the patch and stores the result in the index, without using the working tree. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-15Merge branch 'jc/grep' into nextLibravatar Junio C Hamano1-8/+57
* jc/grep: builtin-grep: unparse more command line options.
2006-05-15Merge branch 'ew/send-email' into nextLibravatar Junio C Hamano1-23/+52
* ew/send-email: send-email: quiet some warnings, reject invalid addresses send-email: allow sendmail binary to be used instead of SMTP
2006-05-15Merge branch 'np/pack' into nextLibravatar Junio C Hamano2-12/+12
* np/pack: pack-object: slightly more efficient simple euristic for further free packing improvements
2006-05-15Merge branch 'lt/oneway' into nextLibravatar Junio C Hamano1-4/+12
* lt/oneway: read-tree --reset -u fix.
2006-05-15Merge branch 'fix'Libravatar Junio C Hamano6-26/+96
* fix: Fix pack-index issue on 64-bit platforms a bit more portably. Install git-send-email by default Fix compilation on newer NetBSD systems git config syntax updates Another config file parsing fix. checkout: use --aggressive when running a 3-way merge (-m).
2006-05-15builtin-grep: unparse more command line options.Libravatar Junio C Hamano1-8/+57
The earlier one to use external grep missed some often used options. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-15Fix pack-index issue on 64-bit platforms a bit more portably.Libravatar Junio C Hamano2-4/+2
Apparently <stdint.h> is not enough for uint32_t on OpenBSD; use "unsigned int" -- hopefully that would stay 32-bit on every platform we care about, at least until we update the pack-index file format. Our sha1 routines optimized for architectures use uint32_t and expects '#include <stdint.h>' to be enough, so OpenBSD on arm or ppc might have similar issues down the road, I dunno. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-15Install git-send-email by defaultLibravatar Eric Wong2-7/+4
After 567ffeb7722eefab3991cb894c96548b92b57cc2 and 4bc87a28be020a6bf7387161c65ea3d8e4a0228b, git-send-email no longer requires any non-standard Perl modules, so there's no reason to special-case it. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-15Fix compilation on newer NetBSD systemsLibravatar Dennis Stosberg1-1/+3
NetBSD >=2.0 has iconv() in libc. A libiconv is not required and does not exist. See: http://netbsd.gw.com/cgi-bin/man-cgi?iconv+3+NetBSD-2.0 [jc: with a bit of simplification later discussed on the list.] Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-15pack-object: slightly more efficientLibravatar Nicolas Pitre2-7/+10
Avoid creating a delta index for objects with maximum depth since they are not going to be used as delta base anyway. This also reduce peak memory usage slightly as the current object's delta index is not useful until the next object in the loop is considered for deltification. This saves a bit more than 1% on CPU usage. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-15simple euristic for further free packing improvementsLibravatar Nicolas Pitre1-5/+2
Given that the early eviction of objects with maximum delta depth may exhibit bad packing on its own, why not considering a bias against deep base objects in try_delta() to mitigate that bad behavior. This patch adjust the MAX_size allowed for a delta based on the depth of the base object as well as enabling the early eviction of max depth objects from the object window. When used separately, those two things produce slightly better and much worse results respectively. But their combined effect is a surprising significant packing improvement. With this really simple patch the GIT repo gets nearly 15% smaller, and the Linux kernel repo about 5% smaller, with no significantly measurable CPU usage difference. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-15read-tree --reset -u fix.Libravatar Linus Torvalds1-4/+12
The previous commit makes -u to mean "I do want to remove the local changes, just update it from the read tree" only for one-way merge. It makes sense to have it depend on the "--reset" flag instead. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-15send-email: quiet some warnings, reject invalid addressesLibravatar Eric Wong1-3/+12
I'm not sure why we never actually rejected invalid addresses in the first place. We just seemed to be using our email validity checkers to kill duplicates. Now we just drop invalid email addresses completely and warn the user about it. Since we support local sendmail, we'll also accept username-only addresses. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-15send-email: allow sendmail binary to be used instead of SMTPLibravatar Eric Wong1-20/+40
This should make local mailing possible for machines without a connection to an SMTP server. It'll default to using /usr/sbin/sendmail or /usr/lib/sendmail if no SMTP server is specified (the default). If it can't find either of those paths, it'll fall back to connecting to an SMTP server on localhost. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-15Merge branch 'se/tag' into nextLibravatar Junio C Hamano1-5/+3
* se/tag: Strip useless "tags/" prefix from git-tag -l output
2006-05-15Strip useless "tags/" prefix from git-tag -l outputLibravatar Sean1-5/+3
2006-05-15Merge branch 'jc/grep' into nextLibravatar Junio C Hamano1-0/+79
* jc/grep: builtin-grep: use external grep when we can take advantage of it
2006-05-15Merge branch 'jc/apply' into nextLibravatar Junio C Hamano6-10/+62
* jc/apply: apply --numstat: show new name, not old name. Ensure author & committer before asking for commit message. Install git-send-email by default send-email: address expansion for common mailers diffstat rename squashing fix.
2006-05-15apply --numstat: show new name, not old name.Libravatar Junio C Hamano1-1/+1
Somehow --stat showed the new name but --numstat showed the old name for renamed/copied paths. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-15Merge branch 'fix'Libravatar Junio C Hamano1-0/+2
* fix: Ensure author & committer before asking for commit message.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 17:33:27 +0000