| 2111168 | Junio C Hamano | 27 January 2006, 22:49:30 UTC | GIT 1.1.5 Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 January 2006, 22:49:30 UTC |
| ca18205 | Junio C Hamano | 27 January 2006, 22:46:10 UTC | GIT 1.0.13 Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 January 2006, 22:46:10 UTC |
| 1ecc18e | Junio C Hamano | 27 January 2006, 22:44:07 UTC | checkout: do not make a temporary copy of symlink target. If the index records an insanely long symbolic link, copying into the temporary would overflow the buffer (noticed by Mark Wooding). Because read_sha1_file() terminates the returned buffer with NUL since late May 2005, there is no reason to copy it anymore. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 January 2006, 22:44:07 UTC |
| c4e804b | Junio C Hamano | 20 January 2006, 03:56:27 UTC | GIT 1.1.4 | 20 January 2006, 03:56:27 UTC |
| 3a75f67 | Junio C Hamano | 20 January 2006, 02:32:54 UTC | GIT 1.0.12 | 20 January 2006, 02:32:54 UTC |
| e921fb8 | Johannes Schindelin | 18 January 2006, 23:24:04 UTC | git-fetch-pack: really do not ask for funny refs 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> | 20 January 2006, 02:29:43 UTC |
| e93ec6f | Junio C Hamano | 19 January 2006, 04:26:14 UTC | Revert "check_packed_git_idx(): check integrity of the idx file itself." 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. | 20 January 2006, 02:29:11 UTC |
| 8a263ae | Junio C Hamano | 16 January 2006, 06:22:23 UTC | GIT 1.1.3 | 16 January 2006, 06:22:23 UTC |
| 181dc77 | Junio C Hamano | 16 January 2006, 06:15:37 UTC | describe: omit clearing marks on the last one. When describing more than one, we need to clear the commit marks before handling the next one, but most of the time we are running it for only one commit, and in such a case this clearing phase is totally unnecessary. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 January 2006, 06:15:37 UTC |
| 7cb038a | Junio C Hamano | 16 January 2006, 05:12:12 UTC | Merge branch 'fixo/1.0' | 16 January 2006, 05:12:12 UTC |
| ae4a352 | Junio C Hamano | 16 January 2006, 05:11:30 UTC | GIT 1.0.11 | 16 January 2006, 05:11:30 UTC |
| ee3d299 | Junio C Hamano | 16 January 2006, 05:08:42 UTC | diffcore-break/diffcore-rename: integer overflow. 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> | 16 January 2006, 05:08:42 UTC |
| 59617eb | Junio C Hamano | 14 January 2006, 00:47:05 UTC | GIT 1.1.2 | 14 January 2006, 00:47:05 UTC |
| e99c2fb | Junio C Hamano | 14 January 2006, 00:39:17 UTC | GIT 1.0.10 | 14 January 2006, 00:39:17 UTC |
| a0dfb48 | Junio C Hamano | 13 January 2006, 21:17:55 UTC | Documentation: git-reset - interrupted workflow. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 January 2006, 21:17:55 UTC |
| cb95bf4 | Junio C Hamano | 13 January 2006, 20:59:21 UTC | Documentation: git-commit -a A bit more elaboration on what "update all paths" means. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 January 2006, 20:59:21 UTC |
| c2bc6e4 | J. Bruce Fields | 13 January 2006, 03:08:37 UTC | Documentation: clarify fetch parameter descriptions. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 January 2006, 06:03:11 UTC |
| 87758f9 | Junio C Hamano | 11 January 2006, 08:20:25 UTC | show-branch: handle [] globs as well. 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> | 11 January 2006, 23:36:07 UTC |
| 2c817df | Junio C Hamano | 11 January 2006, 22:20:09 UTC | name-rev: do not omit leading components of ref name. 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> | 11 January 2006, 22:47:20 UTC |
| 8c23b6f | Junio C Hamano | 11 January 2006, 21:41:25 UTC | describe: do not silently ignore indescribable commits We silently ignored indescribable commits without complaining. Complain and die instead. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 January 2006, 21:41:25 UTC |
| a94d994 | Junio C Hamano | 11 January 2006, 21:36:45 UTC | update-index: work with c-quoted name 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> | 11 January 2006, 21:36:45 UTC |
| 5a25b4a | Tom Prince | 11 January 2006, 06:40:33 UTC | Add git-describe to .gitignore. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 January 2006, 08:36:03 UTC |
| 0de62e5 | Junio C Hamano | 11 January 2006, 00:20:22 UTC | GIT 1.0.9 | 11 January 2006, 00:20:22 UTC |
| 78ff5cf | Junio C Hamano | 11 January 2006, 00:19:11 UTC | GIT 1.1.1 | 11 January 2006, 00:19:11 UTC |
| d5a6aaf | Johannes Schindelin | 10 January 2006, 21:26:46 UTC | glossary: explain "master" and "origin" 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> | 11 January 2006, 00:02:54 UTC |
| eb858c6 | Junio C Hamano | 09 January 2006, 22:25:10 UTC | GIT-VERSION-GEN: detect dirty tree and mark the version accordingly. If we are building from a working tree with local modifications, mark the version accordingly. Deliberately uses '-' to prevent RPM from being built from such a tree. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 January 2006, 06:59:58 UTC |
| 181129d | H. Peter Anvin | 10 January 2006, 02:07:01 UTC | For release tarballs, include the proper version When producing a release tarball, include a "version" file, which GIT-VERSION-GEN can then use to do the right thing when building from a tarball. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 January 2006, 04:22:26 UTC |
| 5a2282d | Junio C Hamano | 08 January 2006, 22:22:19 UTC | GIT 1.1.0 | 08 January 2006, 22:22:19 UTC |
| e77f489 | Yann Dirson | 08 January 2006, 00:39:48 UTC | Add a test for rebase when a change was picked upstream This test exercises the standard feature that makes rebase useful. Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2006, 20:33:13 UTC |
| b91db27 | Yann Dirson | 08 January 2006, 00:38:15 UTC | Add a minimal test for git-cherry This test checks that git-cherry finds the expected number of patches in two simple cases, and then tests the new limit arguments. [jc: collapsed two patches into one and added sleep to make sure the two commits would get different timestamps] Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2006, 08:54:31 UTC |
| 77f1055 | Yann Dirson | 08 January 2006, 00:40:33 UTC | Add an optional limit to git-cherry This allows to use another commit than the merge base as a limit for scanning patches. [jc: part about t3500 test omitted.] Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2006, 08:54:30 UTC |
| b21c31c | Petr Baudis | 23 December 2005, 01:27:40 UTC | git-daemon --base-path Tommi Virtanen expressed a wish on #git to be able to use short and elegant git URLs by making git-daemon 'root' in a given directory. This patch implements this, causing git-daemon to interpret all paths relative to the given base path if any is given. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2006, 05:43:02 UTC |
| f8f9c73 | Junio C Hamano | 08 January 2006, 02:52:42 UTC | describe: allow more than one revs to be named. The main loop was prepared to take more than one revs, but the actual naming logic wad not (it used pop_most_recent_commit while forgetting that the commit marks stay after it's done). Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2006, 05:43:01 UTC |
| 78c2cff | Junio C Hamano | 07 January 2006, 22:17:58 UTC | ls-files --others --directory: test Add a test to run with --directory option. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2006, 05:34:03 UTC |
| 9eafb7b | Junio C Hamano | 07 January 2006, 22:32:07 UTC | git-status: use ls-files --others --directory for untracked list. This shortens "Untracked files" list by using --directory option when running ls-files --others. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2006, 05:34:03 UTC |
| 0907fed | Junio C Hamano | 07 January 2006, 22:31:56 UTC | ls-files --others --directory: give trailing slash This adds a trailing slash to directory names in the output when "--others --directory" option shows only untracked directories and not their contents, to make them stand out. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2006, 05:34:02 UTC |
| 657907e | Junio C Hamano | 07 January 2006, 22:32:09 UTC | ls-files --others --directory: fix a bug with index entry ordering When both howto-index.sh and howto/make-dist.txt exist under Documentation/ directory, dir_exists() mistakenly checked it without the trailing slash to see if there was something under Documentation/howto directory, and did not realize there was, because '-' sorts earlier than '/' and cache_name_pos() finds howto-index.sh, which is not under howto/ directory. This caused --others --directory to show it which was incorrect. Check the directory name with the trailing slash, because having an entry that has such as a prefix is what we are looking for. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2006, 05:34:02 UTC |
| 9518eb2 | Linus Torvalds | 04 January 2006, 21:31:25 UTC | ls-files -o: optionally skip showing the contents in "untracked" directories Darrin Thompson notes that git-ls-files -o reports all the unknown files it finds in a work area. Subversion and probably other systems "simply ignore all the files and directories inside an unknown directory and just note the directory as unknown." With --directory option, ls-files --others shows untracked directories without descending into them. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2006, 05:34:02 UTC |
| 03febf9 | Junio C Hamano | 07 January 2006, 08:48:04 UTC | git-fetch: auto-following tags. I added things to ls-remote so that Cogito can auto-follow tags easily and correctly a while ago, but git-fetch did not use the facility. Recently added git-describe command relies on repository keeping up-to-date set of tags, which made it much more attractive to automatically follow tags, so we do that as well. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2006, 05:33:51 UTC |
| 8fc11b5 | Junio C Hamano | 08 January 2006, 05:32:48 UTC | GIT 1.0.8 | 08 January 2006, 05:32:48 UTC |
| 6f2eacf | Junio C Hamano | 08 January 2006, 05:26:30 UTC | mailsplit: allow empty input from stdin Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2006, 05:26:30 UTC |
| 013049c | Junio C Hamano | 08 January 2006, 04:45:11 UTC | revert/cherry-pick: handle single quote in author name. The same fix as aa66c7ec77d474b737da607d6cb2d07f56628def is needed here. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2006, 04:45:11 UTC |
| 5f815e5 | Yann Dirson | 08 January 2006, 00:39:16 UTC | Fix git-format-patch usage string wrt output modes. --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> | 08 January 2006, 02:17:38 UTC |
| 36071af | Yann Dirson | 08 January 2006, 00:38:43 UTC | Fix typo in debug stanza of t2001 Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2006, 02:13:44 UTC |
| 3ac0ebb | Junio C Hamano | 07 January 2006, 23:11:11 UTC | tar-tree: finish honoring extractor's umask in git-tar-tree. 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> | 07 January 2006, 23:11:11 UTC |
| 8f1d2e6 | Junio C Hamano | 07 January 2006, 09:33:54 UTC | [PATCH] Compilation: zero-length array declaration. 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> | 07 January 2006, 18:51:06 UTC |
| 3be7098 | Junio C Hamano | 07 January 2006, 08:29:48 UTC | prune: do not show error from pack-redundant when no packs are found. 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> | 07 January 2006, 08:29:48 UTC |
| 7d0e65b | Junio C Hamano | 07 January 2006, 03:18:12 UTC | Retire debian/ directory. 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> | 07 January 2006, 03:18:12 UTC |
| 476e801 | Junio C Hamano | 07 January 2006, 02:53:16 UTC | unpack-objects: default to quiet if stderr is not a tty. This would help cron/at jobs that run send-pack to mirror repositories. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2006, 02:53:16 UTC |
| 34c99da | Joe English | 06 January 2006, 20:52:27 UTC | Substitute "/" with $opt_s in tag names as well as branch names 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> | 06 January 2006, 22:27:47 UTC |
| 576cfc8 | Yann Dirson | 06 January 2006, 20:54:41 UTC | Teach cvsexportcommit to add new files "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> | 06 January 2006, 22:27:47 UTC |
| 026351a | John Ellson | 30 December 2005, 16:23:17 UTC | Make GIT-VERSION-GEN tolerate missing git describe command I think it is probably a bug that "git non_existent_command" returns its error message to stdout without an error, where "git-non_existent_command" behaves differently and does return an error. Older versions of git did not implement "git describe" and GIT-VERSION-GEN produces an empty version string if run on a system with such a git installed. The consequence is that "make rpm" fails. This patch fixes GIT-VERSION-GEN so that it works in the absence of a working "git describe" Signed-off-by: John Ellson <ellson@research.att.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2006, 05:02:01 UTC |
| 5df466c | Junio C Hamano | 06 January 2006, 04:54:42 UTC | Merge fixes up to GIT 1.0.7 Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2006, 04:54:42 UTC |
| 92e802c | Junio C Hamano | 06 January 2006, 04:52:50 UTC | GIT 1.0.7 Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2006, 04:52:50 UTC |
| c1fe2fe | Jon Loeliger | 03 January 2006, 14:38:15 UTC | Fix git-symbolic-ref typo in git.txt. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2006, 04:29:52 UTC |
| da6bf70 | Andreas Ericsson | 03 January 2006, 09:53:54 UTC | git: grok 'help' to mean '--help'. 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> | 06 January 2006, 04:28:52 UTC |
| 2ed8e62 | Eric Wong | 01 January 2006, 21:32:53 UTC | Documentation/git-svnimport: document -T and -t switches correctly 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> | 06 January 2006, 04:28:19 UTC |
| 2961e0e | Eric Wong | 01 January 2006, 21:25:47 UTC | svnimport: support repositories requiring SSL authentication 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> | 06 January 2006, 04:28:14 UTC |
| 6ce1832 | Junio C Hamano | 06 January 2006, 04:14:40 UTC | t3300: skip when filesystem does not like TAB in filenames. Instead of checking Cygwin explicitly, see if the filesystem lets us create funny filenames. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2006, 04:14:40 UTC |
| aa66c7e | Junio C Hamano | 06 January 2006, 03:50:37 UTC | format-patch/commit: Quote single quote in the author name properly. Noticed by Kyle McMartin. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2006, 04:02:33 UTC |
| 81214e4 | Junio C Hamano | 06 January 2006, 03:42:12 UTC | git-fetch --tags: reject malformed tags. 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> | 06 January 2006, 03:42:12 UTC |
| 353ce81 | Jonas Fonseca | 31 December 2005, 17:37:15 UTC | Wrap synopsis lines and use [verse] to keep formatting 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> | 06 January 2006, 02:44:28 UTC |
| 6ff0b1c | Alex Riesen | 05 January 2006, 11:52:07 UTC | use GIT_DIR instead of /var/tmp 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> | 06 January 2006, 01:24:51 UTC |
| 2ccd202 | Alex Riesen | 05 January 2006, 11:57:36 UTC | trivial: check, if t/trash directory was successfully created 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> | 06 January 2006, 01:24:47 UTC |
| 10ae7d8 | Alex Riesen | 05 January 2006, 16:38:58 UTC | trivial: .gitignore precompiled python modules Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2006, 01:24:42 UTC |
| b484ef2 | Alex Riesen | 05 January 2006, 11:55:58 UTC | trivial: use git-repo-config to detect how to run tests in the test repository Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2006, 01:23:46 UTC |
| e58b97a | Alex Riesen | 05 January 2006, 11:55:03 UTC | trivial: use git-repo-config to detect if the test can be run on the repository Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2006, 01:23:44 UTC |
| 31f883d | Alex Riesen | 05 January 2006, 11:46:16 UTC | trivial: remove the dots at the end of file names from merge-one-file 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> | 06 January 2006, 01:23:41 UTC |
| 50b4e0c | Alex Riesen | 05 January 2006, 11:44:18 UTC | trivial: clarify, what are the config's user.name and user.email about Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2006, 01:23:21 UTC |
| b6ae540 | Alex Riesen | 05 January 2006, 11:44:59 UTC | trivial: typo in git-commit.sh Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2006, 01:23:16 UTC |
| 88fb958 | Alex Riesen | 05 January 2006, 11:43:34 UTC | use result of open(2) to check for presence 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> | 06 January 2006, 01:22:51 UTC |
| d9e08be | Alex Riesen | 05 January 2006, 09:00:12 UTC | fix potential deadlock in create_one_file 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> | 06 January 2006, 01:22:49 UTC |
| 781411e | Alex Riesen | 05 January 2006, 08:58:06 UTC | trivial: O_EXCL makes O_TRUNC redundant Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2006, 01:22:47 UTC |
| 7f272ca | Alex Riesen | 05 January 2006, 08:56:37 UTC | trivial: retval of waitpid is not errno ...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> | 06 January 2006, 01:22:45 UTC |
| b73cebf | Linus Torvalds | 05 January 2006, 03:33:55 UTC | Fix nasty approxidate bug 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> | 06 January 2006, 01:22:43 UTC |
| 0a15217 | Amos Waterland | 05 January 2006, 00:31:02 UTC | AIX compile fix for repo-config.c 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> | 06 January 2006, 01:22:37 UTC |
| 8b32572 | Jonas Fonseca | 31 December 2005, 17:30:25 UTC | git-init-db(1): Describe --shared and the idempotent nature of init-db 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> | 06 January 2006, 01:22:31 UTC |
| 4e7a2ec | Junio C Hamano | 29 December 2005, 09:31:26 UTC | ?alloc: do not return NULL when asked for zero bytes Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 December 2005, 09:33:40 UTC |
| 82f9d58 | Junio C Hamano | 29 December 2005, 09:30:08 UTC | code comments: spell Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 December 2005, 09:32:56 UTC |
| 8943867 | Junio C Hamano | 29 December 2005, 09:20:06 UTC | Documentation: spell. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 December 2005, 09:32:56 UTC |
| f1ec72b | Gerrit Pape | 28 December 2005, 11:25:38 UTC | Fix skipping merge-order test with NO_OPENSSL=1. Move git-rev-list --merge-order usage check for 'OpenSSL not linked' after test 1; we cannot trigger this unless we try to actually use --merge-order by giving some ref, and we do not have any ref until we run the first test to create commits. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 December 2005, 19:09:53 UTC |
| 58e3fb4 | Junio C Hamano | 28 December 2005, 02:13:30 UTC | Merge fixes up to GIT 1.0.6 | 28 December 2005, 02:13:30 UTC |
| 17dff84 | Junio C Hamano | 28 December 2005, 02:08:58 UTC | GIT 1.0.6 Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 December 2005, 02:08:58 UTC |
| cfee10a | Junio C Hamano | 26 December 2005, 07:18:37 UTC | send-pack/receive-pack: allow errors to be reported back to pusher. This updates the protocol between git-send-pack/git-receive-pack in a backward compatible way to allow failures at the receiving end to be propagated back to the sender. Most notably, versions of git-push before this could not notice if the update hook on the receiving end refused to update the ref for its own policy reasons. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 December 2005, 02:04:14 UTC |
| 9b88fce | Junio C Hamano | 27 December 2005, 22:40:17 UTC | Makefile: use git-describe to mark the git version. Note: with this commit, the GIT maintainer workflow must change. GIT-VERSION-GEN is now the file to munge when the default version needs to be changed, not Makefile. The tag needs to be pushed into the repository to build the official tarball and binary package beforehand. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 December 2005, 01:57:28 UTC |
| c06818e | Junio C Hamano | 28 December 2005, 00:10:56 UTC | git-describe: documentation. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 December 2005, 01:57:28 UTC |
| 64deb85 | Junio C Hamano | 28 December 2005, 00:09:37 UTC | git-describe: still prefer annotated tag under --all and --tags Even though --all and --tags can be used to include non annotated tags in the reference point candidates, prefer to use annotated tags if there are more than one refs that name the same commit. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 December 2005, 01:57:27 UTC |
| 2d9e7c9 | Junio C Hamano | 27 December 2005, 22:40:17 UTC | git-describe: --tags and --abbrev With --tags, not just annontated tags, but also any ref under refs/tags/ are used to name the revision. The number of digits is configurable with the --abbrev=<n> option. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 December 2005, 01:57:27 UTC |
| 4cdf78b | Junio C Hamano | 27 December 2005, 22:49:22 UTC | git-describe: use find_unique_abbrev() Just in case 8 hexadecimal digits are not enough. We could use shorter default if we wanted to. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 December 2005, 01:57:27 UTC |
| 635d413 | Junio C Hamano | 27 December 2005, 22:36:49 UTC | git-describe: really prefer tags only. Often there are references other than annotated tags under refs/tags hierarchy that are used to "keep things just in case". default to use annotated tags only, still leaving the option to use any ref with --all flag. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 December 2005, 01:57:27 UTC |
| 908e531 | Linus Torvalds | 24 December 2005, 21:50:45 UTC | Add a "git-describe" command It shows you the most recent tag that is reachable from a particular commit is. Maybe this is something that "git-name-rev" should be taught to do, instead of having a separate command for it. Regardless, I find it useful. What it does is to take any random commit, and "name" it by looking up the most recent commit that is tagged and reachable from that commit. If the match is exact, it will just print out that ref-name directly. Otherwise it will print out the ref-name, followed by the 8-character "short SHA". IOW, with something like Junios current tree, I get: [torvalds@g5 git]$ git-describe parent refs/tags/v1.0.4-g2414721b ie the current head of my "parent" branch (ie Junio) is based on v1.0.4, but since it has a few commits on top of that, it has added the git hash of the thing to the end: "-g" + 8-char shorthand for the commit 2414721b194453f058079d897d13c4e377f92dc6. Doing a "git-describe" on a tag-name will just show the full tag path: [torvalds@g5 git]$ git-describe v1.0.4 refs/tags/v1.0.4 unless there are _other_ tags pointing to that commit, in which case it will just choose one at random. This is useful for two things: - automatic version naming in Makefiles, for example. We could use it in git itself: when doing "git --version", we could use this to give a much more useful description of exactly what version was installed. - for any random commit (say, you use "gitk <pathname>" or "git-whatchanged" to look at what has changed in some file), you can figure out what the last version of the repo was. Ie, say I find a bug in commit 39ca371c45b04cd50d0974030ae051906fc516b6, I just do: [torvalds@g5 linux]$ git-describe 39ca371c45b04cd50d0974030ae051906fc516b6 refs/tags/v2.6.14-rc4-g39ca371c and I now know that it was _not_ in v2.6.14-rc4, but was presumably in v2.6.14-rc5. The latter is useful when you want to see what "version timeframe" a commit happened in. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 December 2005, 01:57:27 UTC |
| 36cd2cc | Junio C Hamano | 27 December 2005, 19:52:51 UTC | Do not mark tags fetched via --tags flag as mergeable Otherwise "git pull --tags" would mistakenly try to merge all of them, which is never what the user wants. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 December 2005, 19:52:51 UTC |
| e9add36 | Junio C Hamano | 27 December 2005, 19:06:43 UTC | Fix bogus tests on rev-list output. These tests seem to mean checking the output with expected result, but was not doing its handrolled test helper function. Also fix the guard to workaround wc output that have whitespace padding, which was broken but not exposed because the test was not testing it ;-). Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 December 2005, 19:08:57 UTC |
| 8eafa3d | Junio C Hamano | 27 December 2005, 18:51:23 UTC | Guard a test against wc that pads its output with whitespace Spotted by Johannes. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 December 2005, 19:08:57 UTC |
| 08337a9 | Sam Ravnborg | 27 December 2005, 08:19:05 UTC | copy_fd: close ifd on error In copy_fd when write fails we ought to close input file descriptor. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 December 2005, 18:49:25 UTC |
| 36de72a | Junio C Hamano | 27 December 2005, 02:45:30 UTC | Merge fixes up to GIT 1.0.5 | 27 December 2005, 02:45:30 UTC |
| e5f5219 | Junio C Hamano | 27 December 2005, 02:44:15 UTC | GIT 1.0.5 Minor fixes. Starting from this one I won't be touching debian/ directory since the official maintainer seems to be reasonably quick to package up things. The packaging procedure used there seems to be quite different from what I have, so I'd like to avoid potential confusion and reduce work by the official maintainer and myself. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 December 2005, 02:44:15 UTC |
| 975b31d | Johannes Schindelin | 26 December 2005, 21:31:42 UTC | Handle symlinks graciously This patch converts a stat() to an lstat() call, thereby fixing the case when the date of a symlink was not the same as the one recorded in the index. The included test case demonstrates this. This is for the case that the symlink points to a non-existing file. If the file exists, worse things than just an error message happen. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 December 2005, 02:33:27 UTC |
| c97451c | Junio C Hamano | 27 December 2005, 02:23:41 UTC | t5300: avoid false failures. Johannes found that the test has 1/256 chance of falsely producing an uncorrupted idx file, causing the check to detect corruption fail. Now we have 1/2^160 chance of false failure ;-). Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 December 2005, 02:23:41 UTC |
| 7e4a2a8 | Junio C Hamano | 26 December 2005, 20:34:56 UTC | avoid asking ?alloc() for zero bytes. Avoid asking for zero bytes when that change simplifies overall logic. Later we would change the wrapper to ask for 1 byte on platforms that return NULL for zero byte request. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 December 2005, 01:23:59 UTC |
