summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-05-09Merge branch 'jc/grep' into nextLibravatar Junio C Hamano2-9/+37
* jc/grep: builtin-grep: -F (--fixed-strings) builtin-grep: -w fix builtin-grep: typofix
2006-05-09builtin-grep: -F (--fixed-strings)Libravatar Junio C Hamano2-5/+33
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-09builtin-grep: -w fixLibravatar Junio C Hamano1-3/+3
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-09builtin-grep: typofixLibravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-09Merge branch 'jc/grep' into nextLibravatar Junio C Hamano1-26/+50
* jc/grep: builtin-grep: tighten argument parsing.
2006-05-09Merge branch 'ml/cvs' into nextLibravatar Junio C Hamano3-97/+187
* ml/cvs: Change to allow subdir updates from Eclipse Many fixes for most operations in Eclipse. Added logged warnings for CVS error returns cvsserver: use git-rev-list instead of git-log git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.
2006-05-09Merge branch 'tojunio' of ↵Libravatar Junio C Hamano3-97/+187
http://locke.catalyst.net.nz/git/git-martinlanghoff into ml/cvs * 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff: Change to allow subdir updates from Eclipse Many fixes for most operations in Eclipse. Added logged warnings for CVS error returns cvsserver: use git-rev-list instead of git-log git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.
2006-05-08builtin-grep: tighten argument parsing.Libravatar Junio C Hamano1-26/+50
I mistyped git grep next -e '"^@"' '*.c' and got many hits that contain "next" without complaint. Obviously what I meant to say was: git grep -e '"^@"' next -- '*.c' This tightens the argument parsing rule a bit: - All "grep" parameters should come first; - If there is no -e nor -f to specify pattern, the first non option string is the parameter; - After that, zero or more revs can follow. - An optional '--' can be present, and is skipped. - All the rest are pathspecs. If '--' was not there, they must be paths that exist in the working tree. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-08Merge branch 'jc/clean' into nextLibravatar Junio C Hamano18-46/+64
* jc/clean: Teach git-clean optional <paths>... parameters. Separate object name errors from usage errors Documentation: {caret} fixes (git-rev-list.txt) Fix "git diff --stat" with long filenames Fix repo-config set-multivar error return path.
2006-05-08Merge branch 'jc/bindiff' into nextLibravatar Junio C Hamano1-29/+35
* jc/bindiff: improve base85 generated assembly code
2006-05-08Merge branch 'jc/xsha1' into nextLibravatar Junio C Hamano1-0/+1
* jc/xsha1: get_sha1() - fix infinite loop on nonexistent stage.
2006-05-08Merge branch 'jc/grep' into nextLibravatar Junio C Hamano2-42/+104
* jc/grep: builtin-grep: documentation Teach -f <file> option to builtin-grep.
2006-05-08Teach git-clean optional <paths>... parameters.Libravatar Junio C Hamano2-5/+17
When optional paths arguments are given, git-clean passes them to underlying git-ls-files; with this, you can say: git clean 'temp-*' to clean only the garbage files whose names begin with 'temp-'. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Pavel Roskin <proski@gnu.org>
2006-05-08Merge branch 'fix'Libravatar Junio C Hamano16-41/+47
* fix: Separate object name errors from usage errors Documentation: {caret} fixes (git-rev-list.txt) Fix "git diff --stat" with long filenames Fix repo-config set-multivar error return path.
2006-05-08Separate object name errors from usage errorsLibravatar Dmitry V. Levin13-25/+36
Separate object name errors from usage errors. Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-08get_sha1() - fix infinite loop on nonexistent stage.Libravatar Junio C Hamano1-0/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-08Documentation: {caret} fixes (git-rev-list.txt)Libravatar Junio C Hamano1-3/+4
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-08builtin-grep: documentationLibravatar Junio C Hamano1-23/+62
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-08Teach -f <file> option to builtin-grep.Libravatar Junio C Hamano1-19/+42
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-08improve base85 generated assembly codeLibravatar Nicolas Pitre1-29/+35
This code is arguably pretty hot, if you use binary patches of course. This patch helps gcc generate both smaller and faster code especially in the error free path. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-08Fix "git diff --stat" with long filenamesLibravatar Linus Torvalds1-1/+1
When we cut off the front of a filename to make it fit on the line, we add a "..." in front. However, the way the "git diff" code was written, we will never reset the prefix back to the empty string, so every single filename afterwards will have the "..." prefix, whether appropriate or not. You can see this with "git diff v2.6.16.." on the current kernel tree, since there are filenames with long names that changed there: [ snip snip ] Documentation/filesystems/vfs.txt | 229 .../firmware_class/firmware_sample_driver.c | 3 .../firmware_sample_firmware_class.c | 1 ...Documentation/fujitsu/frv/kernel-ABI.txt | 192 ...Documentation/hwmon/w83627hf | 4 [ snip snip ] notice how the two Documentation/firmware** filenames caused the "..." to be added, but then the later filenames don't want it, and it also screws up the alignment of the line numbering afterwards. Trivially fixed by moving the declaration (and initial setting) of the "prefix" variable into the for-loop where it is used. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-07Fix repo-config set-multivar error return path.Libravatar Junio C Hamano1-12/+6
This hopefully fixes the problem an earlier commit 5d8ee9ceb attemted to fix. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-07Merge branch 'jc/gitlink' into nextLibravatar Junio C Hamano7-12/+140
* jc/gitlink: write-tree: --prefix=<path> read-tree: --prefix=<path>/ option.
2006-05-07Merge branch 'mw/alternates' into nextLibravatar Junio C Hamano9-91/+306
* mw/alternates: clone: don't clone the info/alternates file test case for transitive info/alternates Transitively read alternatives repack: honor -d even when no new pack was created clone: keep --reference even with -l -s repo-config: document what value_regexp does a bit more clearly. Release config lock if the regex is invalid core-tutorial.txt: escape asterisk Sparse fix for builtin-diff Fix users of prefix_path() to free() only when necessary
2006-05-07Merge branch 'jc/cache-tree' into nextLibravatar Junio C Hamano1-2/+2
* jc/cache-tree: Fix crash when reading the empty tree
2006-05-07clone: don't clone the info/alternates fileLibravatar Martin Waitz1-5/+1
Now that the cloned alternates file is parsed, too we don't need to copy it into our new repository, we just reference it. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-07test case for transitive info/alternatesLibravatar Martin Waitz1-0/+105
Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-07Transitively read alternativesLibravatar Martin Waitz1-72/+106
When adding an alternate object store then add entries from its info/alternates files, too. Relative entries are only allowed in the current repository. Loops and duplicate alternates through multiple repositories are ignored. Just to be sure that nothing breaks it is not allow to build deep nesting levels using info/alternates. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-08Change to allow subdir updates from EclipseLibravatar Martyn Smith1-11/+27
(Now you can rightclick any directory and select team-update/team-commit) and it should work
2006-05-07Merge branch 'fix'Libravatar Junio C Hamano6-13/+94
* fix: repack: honor -d even when no new pack was created clone: keep --reference even with -l -s repo-config: document what value_regexp does a bit more clearly. Release config lock if the regex is invalid core-tutorial.txt: escape asterisk
2006-05-07Sparse fix for builtin-diffLibravatar Peter Hagervall1-2/+1
You gotta love sparse: builtin-diff.c:88:4: error: Just how const do you want this type to be? Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-07repack: honor -d even when no new pack was createdLibravatar Martin Waitz1-7/+7
If all objects are reachable via an alternate object store then we still have to remove all obsolete local packs. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-07clone: keep --reference even with -l -sLibravatar Martin Waitz2-1/+79
Both -l -s and --reference update objects/info/alternates and used to write over each other. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-08Many fixes for most operations in Eclipse.Libravatar Martyn Smith1-82/+139
* Implemented global -n option * Implemented "Questionable" * Fixed Directory method, I _believe_ it's now correct in both cmdline and Eclipse. * Directory method Now looks for localdir of "." and compares the repo dir, uses THIS as a basis for all directory level calculations. * Added extra parameter to filenamesplit() to force stripping of "prepended" directory name. This ensures commits/updates etc work from any directory in the source tree. * Modified argsfromdir() so it is "always" called. This means that when the client specifies a directory, the method can detect this and behave accordingly (this is currently only implemented for the '.' directory) * Fixed "commit" method to correctly work from in a subdir
2006-05-07repo-config: document what value_regexp does a bit more clearly.Libravatar Junio C Hamano1-4/+5
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-07Release config lock if the regex is invalidLibravatar Pavel Roskin1-0/+2
Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-08Added logged warnings for CVS error returnsLibravatar Martyn Smith1-0/+2
2006-05-08Merge with git://kernel.org/pub/scm/git/git.gitLibravatar Martin Langhoff58-819/+2848
2006-05-07core-tutorial.txt: escape asteriskLibravatar Matthias Lederhofer1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-07Fix crash when reading the empty treeLibravatar Johannes Schindelin1-2/+2
cvsimport needs to call git-read-tree without arguments to create an empty tree. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-06Merge branch 'js/fmt-patch' into nextLibravatar Junio C Hamano4-2/+43
* js/fmt-patch: fmt-patch: understand old <his> notation t1300-repo-config: two new config parsing tests. Another config file parsing fix.
2006-05-06Merge branch 'jc/reupdate' into nextLibravatar Junio C Hamano2-6/+6
* jc/reupdate: Fix users of prefix_path() to free() only when necessary
2006-05-06Fix users of prefix_path() to free() only when necessaryLibravatar Johannes Schindelin2-6/+6
Unfortunately, prefix_path() sometimes returns a newly xmalloc()ed buffer, and in other cases it returns a substring! For example, when calling git update-index ./hello.txt prefix_path() returns "hello.txt", but does not allocate a new buffer. The original code only checked if the result of prefix_path() was different from what was passed in, and thusly trigger a segmentation fault. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-06Fix users of prefix_path() to free() only when necessaryLibravatar Johannes Schindelin2-5/+5
Unfortunately, prefix_path() sometimes returns a newly xmalloc()ed buffer, and in other cases it returns a substring! For example, when calling git update-index ./hello.txt prefix_path() returns "hello.txt", but does not allocate a new buffer. The original code only checked if the result of prefix_path() was different from what was passed in, and thusly trigger a segmentation fault. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-06fmt-patch: understand old <his> notationLibravatar Johannes Schindelin2-1/+9
When calling "git fmt-patch HEAD~5", you now get the same as if you would have said "git fmt-patch HEAD~5..". This makes it easier for my fingers which are so used to the old syntax. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-06Merge branch 'master' into js/fmt-patchLibravatar Junio C Hamano90-3156/+6031
* master: (109 commits) t1300-repo-config: two new config parsing tests. Another config file parsing fix. update-index: plug memory leak from prefix_path() checkout-index: plug memory leak from prefix_path() update-index --unresolve: work from a subdirectory. pack-object: squelch eye-candy on non-tty core.prefersymlinkrefs: use symlinks for .git/HEAD repo-config: trim white-space before comment Fix for config file section parsing. Clarify git-cherry documentation. Update git-unpack-objects documentation. Fix up docs where "--" isn't displayed correctly. Several trivial documentation touch ups. git-svn 1.0.0 git-svn: documentation updates delta: stricter constness Makefile: do not link rev-list any specially. builtin-push: --all and --tags _are_ explicit refspecs builtin-log/whatchanged/show: make them official. show-branch: omit uninteresting merges. ...
2006-05-06t1300-repo-config: two new config parsing tests.Libravatar sean1-0/+31
- correctly insert a new variable into a section that only contains a single (different) variable. - correctly insert a new section that matches the initial substring of an existing section. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-06Another config file parsing fix.Libravatar sean1-1/+3
If the variable we need to store should go into a section that currently only has a single variable (not matching the one we're trying to insert), we will already be into the next section before we notice we've bypassed the correct location to insert the variable. To handle this case we store the current location as soon as we find a variable matching the section of our new variable. This breakage was brought up by Linus. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-06Merge branch 'jc/reupdate' into nextLibravatar Junio C Hamano4-16/+173
* jc/reupdate: update-index --again: take optional pathspecs update-index --again update-index: plug memory leak from prefix_path() checkout-index: plug memory leak from prefix_path() update-index --unresolve: work from a subdirectory.
2006-05-06Merge branch 'jc/bindiff' into nextLibravatar Junio C Hamano2-0/+85
* jc/bindiff: binary diff and apply: testsuite.
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-01 01:25:50 +0000