summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-05-22Merge branch 'master' into nextLibravatar Junio C Hamano1-0/+8
* master: diff: minor option combination fix.
2006-05-22diff: minor option combination fix.Libravatar Junio C Hamano1-0/+8
output_format == DIFFSTAT and with_stat == true does not make sense, and the way the code is structured it causes trouble. Avoid it. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-21Merge branch 'jc/mailinfo' into nextLibravatar Junio C Hamano11-65/+750
* jc/mailinfo: mailinfo: skip bogus UNIX From line inside body tutorial-2: typofix in examples. tutorial: add discussion of index file, object database tutorial: expanded discussion of commit history tutorial: replace "whatchanged" by "log" NO_INET_NTOP and compat/inet_ntop.c for some systems (e.g. old Cygwin). remove superflous "const" checkdiff_consume: strtol parameter fix. Elaborate on why ':' is a bad idea in a ref name. Reference git-check-ref-format in git-branch.
2006-05-21mailinfo: skip bogus UNIX From line inside bodyLibravatar Junio C Hamano1-0/+7
Sometimes people just include the whole format-patch output in the commit e-mail. Detect it and skip the bogus ">From " line. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-21tutorial-2: typofix in examples.Libravatar Junio C Hamano1-2/+2
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-21tutorial: add discussion of index file, object databaseLibravatar J. Bruce Fields3-6/+414
Add a sequel to tutorial.txt which discusses the index file and the object database. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-21tutorial: expanded discussion of commit historyLibravatar J. Bruce Fields1-53/+112
Expand the history-browsing section of the tutorial a bit, in part to address Junio's suggestion that we mention "git grep" and Linus's complaint that people are missing the flexibility of the commandline interfaces for selecting commits. This reads a little more like a collection of examples than a "tutorial", but maybe that's what people need at this point. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-21tutorial: replace "whatchanged" by "log"Libravatar J. Bruce Fields1-6/+6
Junio suggested changing references to git-whatchanged to git-log. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-21NO_INET_NTOP and compat/inet_ntop.c for some systems (e.g. old Cygwin).Libravatar Yakov Lerner2-0/+203
For systems which lack inet_ntop(), this adds compat/inet_ntop.c, and related build constant, NO_INET_NTOP. Older Cygwin(s) lack inet_ntop(). Signed-off-by: Yakov Lerner <iler.ml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-21remove superflous "const"Libravatar Alex Riesen1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-21Merge branch 'js/fmt-patch' into nextLibravatar Junio C Hamano1-1/+1
* js/fmt-patch: git-rebase: use canonical A..B syntax to format-patch
2006-05-21git-rebase: use canonical A..B syntax to format-patchLibravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-21checkdiff_consume: strtol parameter fix.Libravatar Junio C Hamano1-1/+1
The second parameter is not the end of string input; it is the optional return value to retrieve where the parser stopped. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-21Merge branch 'js/fmt-patch' into nextLibravatar Junio C Hamano13-361/+190
* js/fmt-patch: git-format-patch: now built-in. fmt-patch: Support --attach diff family: add --check option Document that "git add" only adds non-ignored files.
2006-05-21git-format-patch: now built-in.Libravatar Junio C Hamano3-347/+3
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-21Elaborate on why ':' is a bad idea in a ref name.Libravatar Shawn Pearce1-0/+2
With the new cat-file syntax of 'v1.3.3:refs.c' we should mention it as part of the reason why ':' is not permitted in a ref name. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-21Reference git-check-ref-format in git-branch.Libravatar Shawn Pearce2-1/+7
Its nice to have git-check-ref-format actually get mentioned in git-branch's documentation as the syntax of a ref name must conform to what is described in git-check-ref-format. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-21fmt-patch: Support --attachLibravatar Johannes Schindelin9-12/+68
This patch touches a couple of files, because it adds options to print a custom text just after the subject of a commit, and just after the diffstat. [jc: made "many dashes" used as the boundary leader into a single variable, to reduce the possibility of later tweaks to miscount the number of dashes to break it.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-21Merge branch 'master' into js/fmt-patchLibravatar Junio C Hamano93-1004/+3881
* master: (119 commits) diff family: add --check option Document that "git add" only adds non-ignored files. Add a conversion tool to migrate remote information into the config fetch, pull: ask config for remote information Fix build procedure for builtin-init-db read-tree -m -u: do not overwrite or remove untracked working tree files. apply --cached: do not check newly added file in the working tree Implement a --dry-run option to git-quiltimport Implement git-quiltimport Revert "builtin-grep: workaround for non GNU grep." builtin-grep: workaround for non GNU grep. builtin-grep: workaround for non GNU grep. git-am: use apply --cached apply --cached: apply a patch without using working tree. apply --numstat: show new name, not old name. Documentation/Makefile: create tarballs for the man pages and html files Allow pickaxe and diff-filter options to be used by git log. Libify the index refresh logic Builtin git-init-db Remove unnecessary local in get_ref_sha1. ...
2006-05-21diff family: add --check optionLibravatar Johannes Schindelin2-1/+115
Actually, it is a diff option now, so you can say git diff --check to ask if what you are about to commit is a good patch. [jc: this also would work for fmt-patch, but the point is that the check is done before making a commit. format-patch is run from an already created commit, and that is too late to catch whitespace damaged change.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-20Document that "git add" only adds non-ignored files.Libravatar Santi1-1/+4
Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-20Merge branch 'jc/dirwalk-n-cache-tree' into nextLibravatar Junio C Hamano2-1/+2
* jc/dirwalk-n-cache-tree: Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-20Merge branch 'lt/dirwalk' into jc/dirwalk-n-cache-treeLibravatar Junio C Hamano13-550/+899
This commit is what this branch is all about. It records the evil merge needed to adjust built-in git-add and git-rm for the cache-tree extension. * lt/dirwalk: Add builtin "git rm" command Move pathspec matching from builtin-add.c into dir.c Prevent bogus paths from being added to the index. builtin-add: fix unmatched pathspec warnings. Remove old "git-add.sh" remnants 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 Conflicts: Makefile builtin.h git.c update-index.c
2006-05-20Merge branch 'jc/cache-tree' into jc/dirwalk-n-cache-treeLibravatar Junio C Hamano13-128/+830
* jc/cache-tree: (24 commits) Fix crash when reading the empty tree fsck-objects: do not segfault on missing tree in cache-tree cache-tree: a bit more debugging support. read-tree: invalidate cache-tree entry when a new index entry is added. Fix test-dump-cache-tree in one-tree disappeared case. fsck-objects: mark objects reachable from cache-tree cache-tree: replace a sscanf() by two strtol() calls cache-tree.c: typefix test-dump-cache-tree: validate the cached data as well. cache_tree_update: give an option to update cache-tree only. 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. test-dump-cache-tree: report number of subtrees. cache-tree: sort the subtree entries. Teach fsck-objects about cache-tree. index: make the index file format extensible. cache-tree: protect against "git prune". Add test-dump-cache-tree Use cache-tree in update-index. ...
2006-05-19Merge branch 'jc/tartree' into nextLibravatar Junio C Hamano5-5/+141
* jc/tartree: built-in tar-tree and remote tar-tree
2006-05-19Merge branch 'master' into nextLibravatar Junio C Hamano8-134/+150
* master: Fix build procedure for builtin-init-db Allow pickaxe and diff-filter options to be used by git log. Libify the index refresh logic Builtin git-init-db
2006-05-19built-in tar-tree and remote tar-treeLibravatar Junio C Hamano5-6/+142
This makes tar-tree a built-in. As an added bonus, you can now say: git tar-tree --remote=remote-repository <ent> [<base>] This does not work with git-daemon yet, but should work with localhost and git over ssh transports. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19Merge branch 'js/fetchconfig'Libravatar Junio C Hamano2-4/+59
* js/fetchconfig: Add a conversion tool to migrate remote information into the config fetch, pull: ask config for remote information
2006-05-19Merge branch 'lt/dirwalk' into nextLibravatar Junio C Hamano8-154/+241
* lt/dirwalk: Add builtin "git rm" command Move pathspec matching from builtin-add.c into dir.c
2006-05-19Add builtin "git rm" commandLibravatar Linus Torvalds5-73/+157
This changes semantics very subtly, because it adds a new atomicity guarantee. In particular, if you "git rm" several files, it will now do all or nothing. The old shell-script really looped over the removed files one by one, and would basically randomly fail in the middle if "-f" was used and one of the files didn't exist in the working directory. This C builtin one will not re-write the index after each remove, but instead remove all files at once. However, that means that if "-f" is used (to also force removal of the file from the working directory), and some files have already been removed from the workspace, it won't stop in the middle in some half-way state like the old one did. So what happens is that if the _first_ file fails to be removed with "-f", we abort the whole "git rm". But once we've started removing, we don't leave anything half done. If some of the other files don't exist, we'll just ignore errors of removal from the working tree. This is only an issue with "-f", of course. I think the new behaviour is strictly an improvement, but perhaps more importantly, it is _different_. As a special case, the semantics are identical for the single-file case (which is the only one our test-suite seems to test). The other question is what to do with leading directories. The old "git rm" script didn't do anything, which is somewhat inconsistent. This one will actually clean up directories that have become empty as a result of removing the last file, but maybe we want to have a flag to decide the behaviour? Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19Fix build procedure for builtin-init-dbLibravatar Junio C Hamano1-1/+1
c3c8835fbb182d971d71939b9a3ec7c8b86d6caf broke the default template location which is in builtin-init-db.o, by not supplying the compilation-time constant to the right build commands. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19Merge branch 'jc/read-tree-safety'Libravatar Junio C Hamano5-31/+88
* jc/read-tree-safety: read-tree -m -u: do not overwrite or remove untracked working tree files.
2006-05-19Merge branch 'jc/apply'Libravatar Junio C Hamano1-4/+6
* jc/apply: apply --cached: do not check newly added file in the working tree
2006-05-19Merge branch 'eb/quilt'Libravatar Junio C Hamano3-1/+180
* eb/quilt: Implement a --dry-run option to git-quiltimport Implement git-quiltimport
2006-05-19Merge branch 'jc/grep'Libravatar Junio C Hamano0-0/+0
* jc/grep: Revert "builtin-grep: workaround for non GNU grep." builtin-grep: workaround for non GNU grep.
2006-05-19Merge branch 'lt/grep'Libravatar Junio C Hamano3-60/+75
* lt/grep: builtin-grep: workaround for non GNU grep. git-am: use apply --cached apply --cached: apply a patch without using working tree. apply --numstat: show new name, not old name.
2006-05-19Merge branch 'ts/doctar'Libravatar Junio C Hamano2-3/+27
* ts/doctar: Documentation/Makefile: create tarballs for the man pages and html files
2006-05-19Allow pickaxe and diff-filter options to be used by git log.Libravatar Sean1-0/+7
Handle the -S option when passed to git log such that only the appropriate commits are displayed. Also per Junio's comments, do the same for "--diff-filter", so that it too can be used as an option to git log. By default no patch or diff information is displayed. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19Move pathspec matching from builtin-add.c into dir.cLibravatar Linus Torvalds3-81/+84
I'll use it for builtin-rm.c too. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19Libify the index refresh logicLibravatar Linus Torvalds3-122/+129
This cleans up and libifies the "git update-index --[really-]refresh" functionality. This will be eventually required for eventually doing the "commit" and "status" commands as built-ins. It really just moves "refresh_index()" from update-index.c to read-cache.c, but it also has to change the calling convention so that the function uses a "unsigned int flags" argument instead of various static flags variables for passing down the information about whether to be quiet or not, and allow unmerged entries etc. That actually cleans up update-index.c too, since it turns out that all those flags were really specific to that one function of the index update, so they shouldn't have had file-scope visibility even before. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19Builtin git-init-dbLibravatar Timo Hirvonen4-12/+15
Basically this just renames init-db.c to builtin-init-db.c and makes some strings const. Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19Merge early part of 'sp/reflog' branchLibravatar Junio C Hamano1-4/+1
2006-05-18Merge branch 'eb/quilt' into nextLibravatar Junio C Hamano3-1/+180
* eb/quilt: Implement a --dry-run option to git-quiltimport Implement git-quiltimport
2006-05-18Implement a --dry-run option to git-quiltimportLibravatar Eric W. Biederman2-7/+25
Since large quilt trees like -mm can easily have patches without clear authorship information, add a --dry-run option to make the problem patches easy to find. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-18Implement git-quiltimportLibravatar Eric W. Biederman3-1/+162
Importing a quilt patch series into git is not very difficult but parsing the patch descriptions and all of the other minutia take a bit of effort to get right, so this automates it. Since git and quilt complement each other it makes sense to make it easy to go back and forth between the two. If a patch is encountered that it cannot derive the author from the user is asked. Signed-off-by: Junio C Hamano <junkio@cox.net>
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>
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-07 10:08:10 +0000