AgeCommit message (Collapse)Author
2006-05-04builtin-grep: terminate correctly at EOFJunio C Hamano
It barfed and segfaulted with an incomplete line. Signed-off-by: Junio C Hamano <>
2006-05-03builtin-grep: tighten path wildcard vs tree traversal.Junio C Hamano
The earlier code descended into Documentation/technical when given "Documentation/how*" as the pattern, which was too loose. Signed-off-by: Junio C Hamano <>
2006-05-02builtin-grep: support -w (--word-regexp).Junio C Hamano
Signed-off-by: Junio C Hamano <>
2006-05-02builtin-grep: support -c (--count).Junio C Hamano
Signed-off-by: Junio C Hamano <>
2006-05-02builtin-grep: allow more than one patterns.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2006-05-02builtin-grep: allow -<n> and -[ABC]<n> notation for context lines.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2006-05-02builtin-grep: printf %.*s length is int, not ptrdiff_t.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2006-05-01builtin-grep: do not use setup_revisions()Junio C Hamano
Grep may want to grok multiple revisions, but it does not make much sense to walk revisions while doing so. This stops calling the code to parse parameters for the revision walker. The parameter parsing for the optional "-e" option becomes a lot simpler with it as well. Signed-off-by: Junio C Hamano <>
2006-05-01builtin-grep: support '-l' option.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2006-05-01builtin-grep: wildcard pathspec fixesJunio C Hamano
This tweaks the pathspec wildcard used in builtin-grep to match that of ls-files. With this: git grep -e DEBUG -- '*/Kconfig*' would work like the shell script version, and you could even do: git grep -e DEBUG --cached -- '*/Kconfig*' ;# from index git grep -e DEBUG v2.6.12 -- '*/Kconfig*' ;# from rev Signed-off-by: Junio C Hamano <>
2006-05-01built-in "git grep"Junio C Hamano
This attempts to set up built-in "git grep" to further reduce our dependence on the shell, while at the same time optionally allowing to run grep against object database. You could do funky things like these: git grep --cached -e pattern ;# grep from index git grep -e pattern master ;# or in a rev git grep -e pattern master next ;# or in multiple revs git grep -e pattern pu^@ ;# even like this with an ;# extension from another topic ;-) git grep -e pattern ;# or even from rev ranges git grep -e pattern master~20:Documentation ;# or an arbitrary tree git grep -e pattern ;# or an arbitrary blob Right now, it does not understand and/or obey many options grep should accept, and the pattern must be given with -e option due to the way the parameter parser is structured, both of which obviously need to be fixed for usability. But this is going in the right direction. The shell script version is one of the worst Portability offender in the git barebone Porcelainish; it uses xargs -0 to pass paths around and shell arrays to sift flags and parameters. Signed-off-by: Junio C Hamano <>
2006-04-30Merge branch 'fix'Junio C Hamano
* fix: git-format-patch: Use rfc2822 compliant date.
2006-04-30git-format-patch: Use rfc2822 compliant date.Huw Davies
Signed-off-by: Huw Davies <> Signed-off-by: Junio C Hamano <>
2006-04-28Merge branch 'fix'Junio C Hamano
* 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.Sean Estabrooks
Signed-off-by: Sean Estabrooks <>
2006-04-28Properly render asciidoc "callouts" in git man pages.Sean Estabrooks
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 <>
2006-04-28Fix up remaining man pages that use asciidoc "callouts".Sean Estabrooks
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 <>
2006-04-28Update the git-branch man page to include the "-r" option,Sean Estabrooks
and fix up asciidoc "callouts" Signed-off-by: Sean Estabrooks <>
2006-04-28annotate: display usage information if no filename was givenMatthias Kestenholz
Signed-off-by: Matthias Kestenholz <>
2006-04-28annotate: fix warning about uninitialized scalarMatthias Kestenholz
Use of uninitialized value in scalar chomp at ./git-annotate.perl line 212, <$kid> chunk 4. Signed-off-by: Matthias Kestenholz <>
2006-04-28git-am --resolved: more usable error message.Junio C Hamano
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 <>
2006-04-27Merge branch 'fix'Junio C Hamano
* fix: verify-pack: check integrity in a saner order.
2006-04-27verify-pack: check integrity in a saner order.Junio C Hamano
Check internal integrity to report corrupt pack or idx, and then check cross-integrity between idx and pack. Signed-off-by: Linus Torvalds <> Signed-off-by: Junio C Hamano <>
2006-04-27Merge branch 'pb/config'Junio C Hamano
* 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'Junio C Hamano
* jc/diffstat: diff --stat: show complete rewrites consistently.
2006-04-27Fix "git help -a" terminal autosizingLinus Torvalds
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 <> Signed-off-by: Junio C Hamano <>
2006-04-27diff-index: fix compilation warnings.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2006-04-27t0000-basic: more commit-tree tests.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2006-04-27Merge branch 'fix'Junio C Hamano
* 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.Junio C Hamano
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 <>
2006-04-26Fix filename verification when in a subdirectoryLinus Torvalds
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 <> Signed-off-by: Junio C Hamano <>
2006-04-26rebase: typofix.Junio C Hamano
Noticed by Sean. Signed-off-by: Junio C Hamano <>
2006-04-26commit-tree: allow generic object name for the tree as well.Junio C Hamano
We use get_sha1() for -p (parent) objects, but still used get_sha1_hex() for the tree. Just to be consistent, allow extended SHA1 expression for the tree object name. Note that this is not to encourage funky things like this: git-commit-tree HEAD^{tree} -p HEAD Signed-off-by: Junio C Hamano <>
2006-04-26Makefile: remove and create xdiff library from scratch.Junio C Hamano
... in the same spirit as 71459c193d04870076efa0a387c317390b53e3e2. Signed-off-by: Junio C Hamano <>
2006-04-26t0000-basic: Add ls-tree recursive test back.Junio C Hamano
When we updated ls-tree recursive output to omit the tree nodes, 246cc52f388cae8ca99e5a12b8458c9bfa467765 adjusted the old test so that we do not expect to see trees in its output. Later, with 0f8f45cb4a7e664b396f73c25891da46b953b8b8, we added back the ability to show both with -t option, but we forgot to update the test as well. Signed-off-by: Junio C Hamano <>
2006-04-26git-cvsserver: typofixesJunio C Hamano
Signed-off-by: Junio C Hamano <>
2006-04-26diff --stat: show complete rewrites consistently.Junio C Hamano
The patch format shows complete rewrite as deletion of all old lines followed by addition of all new lines. Count lines consistenly with that when doing diffstat. Signed-off-by: Junio C Hamano <>
2006-04-26Merge branch 'jc/diff'Junio C Hamano
* jc/diff: Libified diff-index: backward compatibility fix. Libify diff-index. Libify diff-files.
2006-04-26Makefile: remove and create libgit.a from scratch.Junio C Hamano
Foolishly I renamed diff.o around which caused an old diff.o taken out of libgit.a and got linked into resulting binary and exhibited mysterious breakage for many people. This borrows from the kernel Makefile (scripts/ to first remove the target and then recreate. Signed-off-by: Junio C Hamano <>
2006-04-25socksetup: don't return on set_reuse_addr() errorv1.3.1Serge E. Hallyn
The set_reuse_addr() error case was the only error case in socklist() where we returned rather than continued. Not sure why. Either we must free the socklist, or continue. This patch continues on error. Signed-off-by: Serge E. Hallyn <> Signed-off-by: Junio C Hamano <> (cherry picked from 0032d548db56eac9ea09b4ba05843365f6325b85 commit)
2006-04-25Deprecate usage of git-var -l for getting config vars listPetr Baudis
This has been an unfortunate sideway in the git API evolution. We use git-repo-config for all the other .git/config interaction so let's also use git-repo-config -l for the variable listing. Signed-off-by: Petr Baudis <>
2006-04-25git-repo-config --list supportPetr Baudis
This adds git-repo-config --list (or git-repo-config -l) support, similar to what git-var -l does now (to be phased out so that we have a single sane interface to the config file instead of fragmented and confused API). Signed-off-by: Petr Baudis <>
2006-04-25Merge branch 'fix'Junio C Hamano
* fix: Document the configuration file Document git-var -l listing also configuration variables rev-parse: better error message for ambiguous arguments
2006-04-25Document the configuration filePetr Baudis
This patch adds a Documentation/config.txt file included by git-repo-config and currently aggregating hopefully all the available git plumbing / core porcelain configuration variables, as well as briefly describing the format. It also updates an outdated bit of the example in git-repo-config(1). Signed-off-by: Petr Baudis <>
2006-04-25Document git-var -l listing also configuration variablesPetr Baudis
Signed-off-by: Petr Baudis <>
2006-04-25rev-parse: better error message for ambiguous argumentsPaul Mackerras
Currently, if git-rev-parse encounters an argument that is neither a recognizable revision name nor the name of an existing file or directory, and it hasn't encountered a "--" argument, it prints an error message saying "No such file or directory". This can be confusing for users, including users of programs such as gitk that use git-rev-parse, who may then think that they can't ask about the history of files that no longer exist. This makes it print a better error message, one that points out the ambiguity and tells the user what to do to fix it. Signed-off-by: Paul Mackerras <>
2006-04-24Merge branch 'ar/chmod-series'Junio C Hamano
* ar/chmod-series: make update-index --chmod work with multiple files and --stdin
2006-04-24Merge branch 'sh/daemon'Junio C Hamano
* sh/daemon: socksetup: don't return on set_reuse_addr() error
2006-04-24Merge branch 'jc/cc-stat'Junio C Hamano
* jc/cc-stat: Fix "git show --stat"
2006-04-24Merge branch 'jc/unresolve'Junio C Hamano
* jc/unresolve: git-update-index --unresolve Add git-unresolve <paths>...