summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-05-18Merge branch 'ts/doctar' into nextLibravatar Junio C Hamano10-30/+59
* ts/doctar: Documentation/Makefile: create tarballs for the man pages and html files SubmittingPatches: The download location of External Editor has moved Make git-check-format-ref a builtin. Make "git rev-list" be a builtin builtin-diff: do not say files are renamed when blob and file are given Provide a way to flush git-diff-tree's output
2006-05-18Merge branch 'lt/dirwalk' into nextLibravatar Junio C Hamano3-64/+67
* lt/dirwalk: Prevent bogus paths from being added to the index.
2006-05-18Documentation/Makefile: create tarballs for the man pages and html filesLibravatar Tilman Sauerbeck2-3/+27
[jc: rewrote by stealing from what I run to update html and man branches automatically] Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-18SubmittingPatches: The download location of External Editor has movedLibravatar Lukas Sandström1-2/+2
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-18Make git-check-format-ref a builtin.Libravatar Lukas Sandström5-20/+19
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-18Make "git rev-list" be a builtinLibravatar Linus Torvalds4-5/+8
This was surprisingly easy. The diff is truly minimal: rename "main()" to "cmd_rev_list()" in rev-list.c, and rename the whole file to reflect its new built-in status. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-18builtin-diff: do not say files are renamed when blob and file are givenLibravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-18Prevent bogus paths from being added to the index.Libravatar Linus Torvalds3-64/+67
With this one, it's now a fatal error to try to add a pathname that cannot be added with "git add", i.e. [torvalds@g5 git]$ git add .git/config fatal: unable to add .git/config to index and [torvalds@g5 git]$ git add foo/../bar fatal: unable to add foo/../bar to index instead of the old "Ignoring path xyz" warning that would end up silently succeeding on any other paths. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-18Merge branch 'lt/dirwalk' into nextLibravatar Junio C Hamano1-1/+1
* lt/dirwalk: builtin-add: fix unmatched pathspec warnings.
2006-05-18builtin-add: fix unmatched pathspec warnings.Libravatar Junio C Hamano1-1/+1
"git add Documentation/" when Documentation directory exists does not barf (as it should not), but "git add ." barfed when it did not add anything. This was because we checked for the path prefix ("Documentation/" in the former case, and an empty string in the latter case) for existence, and lstat("", &st) would say "Huh?". Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-18Provide a way to flush git-diff-tree's outputLibravatar Paul Mackerras1-1/+4
Gitk wants to use git-diff-tree as a filter to tell it which ids from a given list affect a set of files or directories. We don't want to fork and exec a new git-diff-tree process for each batch of ids, since there could be a lot of relatively small batches. For example, a batch could contain as many ids as fit in gitk's headline display window, i.e. 20 or so, and we would be processing a new batch every time the user scrolls that window. The --stdin flag to git-diff-tree is suitable for this, but the main difficulty is that the output of git-diff-tree gets buffered and doesn't get sent until the buffer is full. This provides a way to get git-diff-tree to flush its output buffers. If a blank line is supplied on git-diff-tree's standard input, it will flush its output buffers and then accept further input. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-17Merge branch 'master' into nextLibravatar Junio C Hamano1-1/+1
* master: git-cvsimport: Handle "Removed" from pserver
2006-05-17Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
* maint: git-cvsimport: Handle "Removed" from pserver
2006-05-17git-cvsimport: Handle "Removed" from pserverLibravatar Elrond1-1/+1
Sometimes the pserver says "Removed" instead of "Remove-entry". Signed-off-by: Elrond <elrond+kernel.org@samba-tng.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-17Merge branch 'lt/dirwalk' into nextLibravatar Junio C Hamano2-58/+2
* lt/dirwalk: Remove old "git-add.sh" remnants
2006-05-17Remove old "git-add.sh" remnantsLibravatar Linus Torvalds2-58/+2
Repeat after me: "It's now a built-in" Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-17Merge branch 'sp/reflog' into nextLibravatar Junio C Hamano1-4/+1
* sp/reflog: Remove unnecessary local in get_ref_sha1.
2006-05-17Remove unnecessary local in get_ref_sha1.Libravatar Shawn Pearce1-4/+1
Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-17Merge branch 'jc/apply' into nextLibravatar Junio C Hamano1-4/+6
* jc/apply: apply --cached: do not check newly added file in the working tree
2006-05-17apply --cached: do not check newly added file in the working treeLibravatar Junio C Hamano1-4/+6
The --cached mode does not deal with the working tree, so we should not check it with lstat. An earlier code omitted the call to lstat but forgot to omit the check for the errno. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-17Merge branch 'jc/read-tree-safety' into nextLibravatar Junio C Hamano5-32/+89
* jc/read-tree-safety: read-tree -m -u: do not overwrite or remove untracked working tree files.
2006-05-17Merge branch 'lt/grep' into nextLibravatar Junio C Hamano1-3/+20
* lt/grep: builtin-grep: workaround for non GNU grep.
2006-05-17Merge branch 'jc/grep' into nextLibravatar Junio C Hamano2-30/+3
* jc/grep: Revert "builtin-grep: workaround for non GNU grep."
2006-05-17builtin-grep: workaround for non GNU grep.Libravatar Linus Torvalds1-3/+20
Of course, it still ignores the fact that not all grep's support some of the flags like -F/-L/-A/-C etc, but for those cases, the external grep itself will happily just say "unrecognized option -F" or similar. So with this change, "git grep" should handle all the flags the native grep handles, which is really quite fine. We don't _need_ to expose anything more, and if you do want our extensions, you can get them with "--uncached" and an up-to-date index. No configuration necessary, and we automatically take advantage of any native grep we have, if possible. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-17Merge branch 'ew/pretty-fmt'Libravatar Junio C Hamano1-14/+24
* ew/pretty-fmt: commit: allow --pretty= args to be abbreviated
2006-05-17Merge branch 'jc/apply'Libravatar Junio C Hamano2-57/+55
* jc/apply: git-am: use apply --cached apply --cached: apply a patch without using working tree. apply --numstat: show new name, not old name.
2006-05-17Merge branch 'lt/dirwalk' into nextLibravatar Junio C Hamano7-356/+671
* lt/dirwalk: builtin-add: warn on unmatched pathspecs Do "git add" as a builtin Clean up git-ls-file directory walking library interface libify git-ls-files directory traversal Not a conflict, but builtin-add needed to be adjusted to properly invalidate the cache_tree entry.
2006-05-17builtin-add: warn on unmatched pathspecsLibravatar Linus Torvalds1-19/+58
This is in the same spirit as what bba319b5 and 45e48120 tried to do to help users. A command such as "git add Documentaiton" with misspelled pathspecs would give a friendly reminder with this. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-17Do "git add" as a builtinLibravatar Linus Torvalds4-1/+231
First try. Let's see how well this works. In many ways, the hard parts of "git commit" are not so different from this, and a builtin commit would share a lot of the code, I think. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-17Revert "builtin-grep: workaround for non GNU grep."Libravatar Junio C Hamano2-30/+3
This reverts 518920b764ee9150781e68217181b24d0712748e commit. Linus has a more portable alternative.
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-17Clean up git-ls-file directory walking library interfaceLibravatar Linus Torvalds3-24/+28
This moves the code to add the per-directory ignore files for the base directory into the library routine. That not only allows us to turn the function push_exclude_per_directory() static again, it also simplifies the library interface a lot (the caller no longer needs to worry about any of the per-directory exclude files at all). Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-17libify git-ls-files directory traversalLibravatar Linus Torvalds4-336/+376
This moves the core directory traversal and filename exclusion logic into the general git library, making it available for other users directly. If we ever want to do "git commit" or "git add" as a built-in (and we do), we want to be able to handle most of git-ls-files as a library. NOTE! Not all of git-ls-files is libified by this. The index matching and pathspec prefix calculation is still in ls-files.c, but this is a big part of it. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-17read-tree -m -u: do not overwrite or remove untracked working tree files.Libravatar Junio C Hamano5-31/+88
When a merge results in a creation of a path that did not exist in HEAD, and if you already have that path on the working tree, because the index has not been told about the working tree file, read-tree happily removes it. The issue was brought up by Santi Béjar on the list. 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 05:10:19 +0000