aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* GIT 1.0.12v1.0.12Junio C Hamano2006-01-19
|\
| * git-fetch-pack: really do not ask for funny refsJohannes Schindelin2006-01-19
| | | | | | | | | | | | | | | | | | If git-fetch-pack was called with out any refspec, it would ask the server for funny refs. That cannot work, since the funny refs are not marked as OUR_REF by upload-pack, which just exits with an error. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Revert "check_packed_git_idx(): check integrity of the idx file itself."Junio C Hamano2006-01-19
| | | | | | | | | | | | | | | | | | | | | | This reverts c5ced64578a82b9d172aceb2f67c6fb9e639f6d9 commit. It turns out that doing this check every time we map the idx file is quite expensive. A corrupt idx file is caught by git-fsck-objects, so this check is not strictly necessary. In one unscientific test, 0.99.9m spent 10 seconds usertime for the same task 1.1.3 takes 37 seconds usertime. Reverting this gives us the performance of 0.99.9 back.
* | GIT 1.0.11v1.0.11Junio C Hamano2006-01-15
|\ \ | |/
| * diffcore-break/diffcore-rename: integer overflow.Junio C Hamano2006-01-15
| | | | | | | | | | | | | | | | | | | | | | | | While reviewing the end user tutorial rewrite by J. Bruce Fields, I noticed that "git-diff-tree -B -C" did not correctly break the total rewrite of Documentation/tutorial.txt. It turns out that we had integer overflow during the break score computations. Cop out by using floating point. This is not a kernel. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 1.0.10v1.0.10Junio C Hamano2006-01-13
|\ \ | |/
| * Documentation: git-reset - interrupted workflow.Junio C Hamano2006-01-13
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: git-commit -aJunio C Hamano2006-01-13
| | | | | | | | | | | | A bit more elaboration on what "update all paths" means. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: clarify fetch parameter descriptions.J. Bruce Fields2006-01-12
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * show-branch: handle [] globs as well.Junio C Hamano2006-01-11
| | | | | | | | | | | | | | | | | | | | | | Earlier only '?' and '*' signalled the command that what the user has given is a glob pattern. This prevented us to say: $ git show-branch 'v0.99.[0-3]' Now we notice '[' as well, so the above would work. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * name-rev: do not omit leading components of ref name.Junio C Hamano2006-01-11
| | | | | | | | | | | | | | | | | | | | In a repository with mainto/1.0 (to keep maintaining the 1.0.X series) and fixo/1.0 (to keep fixes that apply to both 1.0.X series and upwards) branches, "git-name-rev mainto/1.0" answered just "1.0" making things ambiguous. Show refnames unambiguously like show-branch does. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * update-index: work with c-quoted nameJunio C Hamano2006-01-11
| | | | | | | | | | | | | | update-index --stdin did not work with c-style quoted names even though update-index --index-info did. This fixes the inconsistency. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 1.0.9v1.0.9Junio C Hamano2006-01-10
|\ \ | |/
| * glossary: explain "master" and "origin"Johannes Schindelin2006-01-10
| | | | | | | | | | | | | | | | | | | | If you are a long time git user/developer, you forget that to a new git user, these words have not the same meaning as to you. [jc: with updates from J. Bruce Fields.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 1.0.8v1.0.8Junio C Hamano2006-01-07
|\ \ | |/
| * mailsplit: allow empty input from stdinJunio C Hamano2006-01-07
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * revert/cherry-pick: handle single quote in author name.Junio C Hamano2006-01-07
| | | | | | | | | | | | | | The same fix as aa66c7ec77d474b737da607d6cb2d07f56628def is needed here. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Fix git-format-patch usage string wrt output modes.Yann Dirson2006-01-07
| | | | | | | | | | | | | | | | --stdout was not mentionned, and the description for the case where -o was not given was thus incomplete. Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Fix typo in debug stanza of t2001Yann Dirson2006-01-07
| | | | | | | | | | Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * tar-tree: finish honoring extractor's umask in git-tar-tree.Junio C Hamano2006-01-07
| | | | | | | | | | | | | | | | Earlier commit 38ec15a973a1f075f0d94d130b0ef279562921cd forgot to apply the same principle of not forcing go-w to the base directory when specified. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * [PATCH] Compilation: zero-length array declaration.Junio C Hamano2006-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ISO C99 (and GCC 3.x or later) lets you write a flexible array at the end of a structure, like this: struct frotz { int xyzzy; char nitfol[]; /* more */ }; GCC 2.95 and 2.96 let you to do this with "char nitfol[0]"; unfortunately this is not allowed by ISO C90. This declares such construct like this: struct frotz { int xyzzy; char nitfol[FLEX_ARRAY]; /* more */ }; and git-compat-util.h defines FLEX_ARRAY to 0 for gcc 2.95 and empty for others. If you are using a C90 C compiler, you should be able to override this with CFLAGS=-DFLEX_ARRAY=1 from the command line of "make". Signed-off-by: Junio C Hamano <junkio@cox.net>
| * prune: do not show error from pack-redundant when no packs are found.Junio C Hamano2006-01-07
| | | | | | | | | | | | | | | | When there is no pack yet, git-prune leaked an error message from "git-pack-redundant --all" which complained that there is no pack. Squelch the annoying message. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Retire debian/ directory.Junio C Hamano2006-01-06
| | | | | | | | | | | | | | | | | | | | The official maintainer is keeping up-to-date quite well, and now the older Debian is supported with backports.org, there is no reason for me to keep debian/ directory around here. I have not been building and publishing debs since 1.0.4 anyway. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * unpack-objects: default to quiet if stderr is not a tty.Junio C Hamano2006-01-06
| | | | | | | | | | | | | | This would help cron/at jobs that run send-pack to mirror repositories. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Substitute "/" with $opt_s in tag names as well as branch namesJoe English2006-01-06
| | | | | | | | | | | | | | In 'git cvsimport' changes "/" to "-" (or $opt_s) in branch names, but not in tag names, which is inconsistent. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Teach cvsexportcommit to add new filesYann Dirson2006-01-06
| | | | | | | | | | | | | | | | "cvs add" support was already there, but the "unknown" status returned when querying a file not yet known to cvs caused the script to abort prematurely. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 1.0.7v1.0.7Junio C Hamano2006-01-05
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Fix git-symbolic-ref typo in git.txt.Jon Loeliger2006-01-05
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * git: grok 'help' to mean '--help'.Andreas Ericsson2006-01-05
| | | | | | | | | | | | | | Most other scm's understand it, most users expect it and it's an easy fix. Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation/git-svnimport: document -T and -t switches correctlyEric Wong2006-01-05
| | | | | | | | | | | | | | | | The -T and -t switches are swapped in the documentation and actual code. I've made the documentation match the code. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * svnimport: support repositories requiring SSL authenticationEric Wong2006-01-05
| | | | | | | | | | | | | | | | | | | | | | I looked at svn-mirror to see how it did this, seems about right. "It works for me" when using it against https://svn.musicpd.org tested command-line: git-svnimport -C mpc -i -m -v \ -T mpc/trunk -b mpc/branches -t mpc/tags https://svn.musicpd.org Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * t3300: skip when filesystem does not like TAB in filenames.Junio C Hamano2006-01-05
| | | | | | | | | | | | | | Instead of checking Cygwin explicitly, see if the filesystem lets us create funny filenames. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * format-patch/commit: Quote single quote in the author name properly.Junio C Hamano2006-01-05
| | | | | | | | | | | | Noticed by Kyle McMartin. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * git-fetch --tags: reject malformed tags.Junio C Hamano2006-01-05
| | | | | | | | | | | | | | | | | | | | When the other end was prepared with older git and has tags that do not follow the naming convention (see check-ref-format), do not barf but simply reject to copy them. Initial fix by Simon Richter, but done differently. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Wrap synopsis lines and use [verse] to keep formattingJonas Fonseca2006-01-05
| | | | | | | | | | | | | | In addition, also fixes a few synopses to be more consistent and a gitlink. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * use GIT_DIR instead of /var/tmpAlex Riesen2006-01-05
| | | | | | | | | | | | | | | | Not every system (will not one microsoft windows system) have /var/tmp, whereas using GIT_DIR for random temporary files is more or less established. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * trivial: check, if t/trash directory was successfully createdAlex Riesen2006-01-05
| | | | | | | | | | | | | | | | and was successfully entered. Otherwise git-init-db will create it directly in the working directory (t/) which can be dangerous. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * trivial: .gitignore precompiled python modulesAlex Riesen2006-01-05
| | | | | | | | | | Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * trivial: use git-repo-config to detect how to run tests in the test repositoryAlex Riesen2006-01-05
| | | | | | | | | | Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * trivial: use git-repo-config to detect if the test can be run on the repositoryAlex Riesen2006-01-05
| | | | | | | | | | Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * trivial: remove the dots at the end of file names from merge-one-fileAlex Riesen2006-01-05
| | | | | | | | | | | | | | to make the output more friendly to mouse copy-paste. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * trivial: clarify, what are the config's user.name and user.email aboutAlex Riesen2006-01-05
| | | | | | | | | | Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * trivial: typo in git-commit.shAlex Riesen2006-01-05
| | | | | | | | | | Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * use result of open(2) to check for presenceAlex Riesen2006-01-05
| | | | | | | | | | | | | | | | | | Not that the stat against open race would matter much in this context, but that simplifies the code a bit. Also some diagnostics added (why the open failed) Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * fix potential deadlock in create_one_fileAlex Riesen2006-01-05
| | | | | | | | | | | | | | | | It can happen if the temporary file already exists (i.e. after a panic and reboot). Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * trivial: O_EXCL makes O_TRUNC redundantAlex Riesen2006-01-05
| | | | | | | | | | Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * trivial: retval of waitpid is not errnoAlex Riesen2006-01-05
| | | | | | | | | | | | | | ...but is used as such and passed to strerror. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Fix nasty approxidate bugLinus Torvalds2006-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stupid me. If approxidate ends up with a month that is ahead of the current month, it decrements the year to last year. Which is correct, and means that "last december" does the right thing. HOWEVER. It should only do so if the year is the same as the current year. Without this fix, "5 days ago" ends up being in 2004, because it first decrements five days, getting us to December 2005 (correct), but then it also ends up decrementing the year once more to turn that December into "last year" (incorrect, since it already _was_ last year). Duh. Pass me a donut. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * AIX compile fix for repo-config.cAmos Waterland2006-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AIX 5 has a /usr/include/regex.h containing this code: #ifdef _NO_PROTO extern char *regex(); extern char *regcmp(); #else /* _NO_PROTO */ extern char *regex(const char *, const char *, ...); extern char *regcmp(const char *, ...); #endif /* _NO_PROTO */ This means that repo-config.c is trying to redefine the `regex' symbol. Here is a simple patch that just uses `regexp' as the symbol name instead. Signed-off-by: Amos Waterland <apw@us.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * git-init-db(1): Describe --shared and the idempotent nature of init-dbJonas Fonseca2006-01-05
| | | | | | | | | | | | | | Based on the recent discussion on the mailing list. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>