| 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 |
| 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 |
| 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 |
| 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 |
| 7d6fb37 | Eric Wong | 24 December 2005, 12:12:43 UTC | short circuit out of a few places where we would allocate zero bytes dietlibc versions of malloc, calloc and realloc all return NULL if they're told to allocate 0 bytes, causes the x* wrappers to die(). There are several more places where these calls could end up asking for 0 bytes, too... Maybe simply not die()-ing in the x* wrappers if 0/NULL is returned when the requested size is zero is a safer and easier way to go. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 December 2005, 16:59:21 UTC |
| 6ab5889 | Junio C Hamano | 24 December 2005, 08:02:08 UTC | GIT 1.0.4 Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 December 2005, 08:02:08 UTC |
| ac44f3e | Junio C Hamano | 24 December 2005, 07:56:52 UTC | mailinfo: iconv does not like "latin-1" -- should spell it "latin1" This was a stupid typo that did not follow http://www.iana.org/assignments/character-sets Long noticed but neglected by JC, but finally reported by Marco. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 December 2005, 07:56:52 UTC |
| 9a84074 | Junio C Hamano | 23 December 2005, 23:51:33 UTC | ls-files --full-name: usage string and documentation. Somehow this option was not mentioned anywhere in the documentation nor the usage string. Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 December 2005, 23:51:33 UTC |
| 695bf72 | Junio C Hamano | 23 December 2005, 23:48:09 UTC | merge --no-commit: tweak message We did not distinguish the case the user asked not to make a commit with --no-commit flag and the automerge failed. Tell these cases apart and phrase dying message differently. Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 December 2005, 23:48:09 UTC |
| bb5ebed | Junio C Hamano | 23 December 2005, 20:47:18 UTC | show-branch: usability updates. This does three things: . It simplifies the logic to handle the case in which no refs are given on the command line, and fixes the bug when only "--heads" is specified. Earlier we showed them twice. . It avoids to add the same ref twice. . It sorts the glob result (e.g. "git show-branch 'tags/v1.0*'") according to a more version friendly sort order. Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 December 2005, 22:16:19 UTC |
| c5ced64 | Junio C Hamano | 23 December 2005, 06:57:20 UTC | check_packed_git_idx(): check integrity of the idx file itself. Although pack-check.c had routine to verify the checksum for the pack index file itself, the core did not check it before using it. This is stolen from the patch to tighten packname requirements. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 797bd6f490c91c07986382b9f268e0df712cb246 commit) | 23 December 2005, 22:14:28 UTC |
| c63da8d | Junio C Hamano | 23 December 2005, 02:14:31 UTC | GIT 1.0.3 Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 December 2005, 02:14:31 UTC |
| 1e80e04 | Johannes Schindelin | 22 December 2005, 17:55:59 UTC | sha1_to_hex: properly terminate the SHA1 sha1_to_hex() returns a pointer to a static buffer. Some of its users modify that buffer by appending a newline character. Other users rely on the fact that you can call printf("%s", sha1_to_hex(sha1)); Just to be on the safe side, terminate the SHA1 in sha1_to_hex(). Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 December 2005, 20:52:37 UTC |
| a14c225 | Nick Hengeveld | 22 December 2005, 17:09:05 UTC | Fix for http-fetch from file:// URLs Recognize missing files when using http-fetch with file:// URLs Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 December 2005, 20:52:35 UTC |
| e99fcf9 | Johannes Schindelin | 22 December 2005, 19:38:23 UTC | git-format-patch should show the correct version We want to record the version of the tools the patch was generated with. While these tools could be rebuilt, git-format-patch stayed the same and report the wrong version. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 December 2005, 20:52:29 UTC |
| 69310a3 | Junio C Hamano | 22 December 2005, 20:39:39 UTC | send-pack: reword non-fast-forward error message. Wnen refusing to push a head, we said cryptic "remote 'branch' object X does not exist on local" or "remote ref 'branch' is not a strict subset of local ref 'branch'". That was gittish. Since the most likely reason this happens is because the pushed head was not up-to-date, clarify the error message to say that straight, and suggest pulling first. First noticed by Johannes and seconded by Andreas. Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 December 2005, 20:39:39 UTC |
| 7246ed4 | Alex Riesen | 15 December 2005, 07:47:30 UTC | \n usage in stderr output fprintf and die sometimes have missing/excessive "\n" in their arguments, correct the strings where I think it would be appropriate. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 December 2005, 07:09:40 UTC |
| f4a1106 | Pavel Roskin | 21 December 2005, 23:47:09 UTC | sanity check in add_packed_git() add_packed_git() tries to get the pack SHA1 by parsing its name. It may access uninitialized memory for packs with short names. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 December 2005, 01:05:09 UTC |
| 8d712aa | Junio C Hamano | 21 December 2005, 21:51:51 UTC | GIT 1.0.0b Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 21:51:51 UTC |
| 8ac4838 | Junio C Hamano | 21 December 2005, 21:48:47 UTC | server-info: skip empty lines. Now we allow an empty line in objects/info/packs file, recognize that and stop complaining. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 21:48:47 UTC |
| 50e7b06 | Pavel Roskin | 21 December 2005, 20:35:48 UTC | [PATCH] quote.c: Make loop control more readable. quote_c_style_counted() in quote.c uses a hard-to-read construct. Convert this to a more traditional form of the for loop. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 21:28:24 UTC |
| e4e79a2 | Junio C Hamano | 21 December 2005, 21:17:54 UTC | GIT 1.0.0a - Avoid misleading success message on error (Johannes) - objects/info/packs: work around bug in http-fetch.c::fetch_indices() - http-fetch.c: fix objects/info/pack parsing. - An off-by-one bug found by valgrind (Pavel) Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 21:17:54 UTC |
| 6689f08 | Pavel Roskin | 21 December 2005, 20:35:48 UTC | An off-by-one bug found by valgrind Insufficient memory is allocated in index-pack.c to hold the *.idx name. One more byte should be allocated to hold the terminating 0. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 21:00:31 UTC |
| 9470657 | Johannes Schindelin | 21 December 2005, 16:53:29 UTC | Avoid misleading success message on error When a push fails (for example when the remote head does not fast forward to the desired ref) it is not correct to print "Everything up-to-date". Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 20:22:43 UTC |
| 455c161 | Junio C Hamano | 21 December 2005, 20:10:10 UTC | http-fetch.c: fix objects/info/pack parsing. It failed to register the last pack in the objects/info/packs file. Also it had an independent overrun error. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 20:13:53 UTC |
| 21b1ace | Junio C Hamano | 21 December 2005, 20:09:17 UTC | objects/info/packs: work around bug in http-fetch.c::fetch_indices() The code to fetch pack index files in deployed clients have a bug that causes it to ignore the pack file on the last line of objects/info/packs file, so append an empty line to work it around. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 20:13:52 UTC |
| c2f3bf0 | Junio C Hamano | 21 December 2005, 08:01:00 UTC | GIT 1.0.0 Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 08:01:00 UTC |
| 41f93a2 | Linus Torvalds | 21 December 2005, 02:13:02 UTC | Make "git-send-pack" less verbose by default It used to make sense to have git-send-pack talk about the things it sent when (a) it was a new program and (b) nobody had a lot of tags and branches. These days, it's just distracting to see tons of 'refs/tags/xyz': up-to-date ... when updating a remote repo. So shut it up by default, and add a "--verbose" flag for those who really want to see it. Also, since this makes he case of everything being up-to-date just totally silent, make it say "Everything up-to-date" if no refs needed updating. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 05:18:32 UTC |
| a3431fe | Junio C Hamano | 21 December 2005, 04:54:28 UTC | A shared repository should be writable by members. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 04:54:28 UTC |
| 4b3511b | Junio C Hamano | 20 December 2005, 22:18:47 UTC | ce_smudge_racily_clean_entry: explain why it works. This is a tricky code and warrants extra commenting. I wasted 30 minutes trying to break it until I realized why it works. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 22:18:47 UTC |
| 407c8eb | Junio C Hamano | 20 December 2005, 20:12:18 UTC | Racy GIT (part #2) The previous round caught the most trivial case well, but broke down once index file is updated again. Smudge problematic entries (they should be very few if any under normal interactive workflow) before writing a new index file out. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 20:12:18 UTC |
| 29e4d36 | Junio C Hamano | 20 December 2005, 08:02:15 UTC | Racy GIT This fixes the longstanding "Racy GIT" problem, which was pretty much there from the beginning of time, but was first demonstrated by Pasky in this message on October 24, 2005: http://marc.theaimsgroup.com/?l=git&m=113014629716878 If you run the following sequence of commands: echo frotz >infocom git update-index --add infocom echo xyzzy >infocom so that the second update to file "infocom" does not change st_mtime, what is recorded as the stat information for the cache entry "infocom" exactly matches what is on the filesystem (owner, group, inum, mtime, ctime, mode, length). After this sequence, we incorrectly think "infocom" file still has string "frotz" in it, and get really confused. E.g. git-diff-files would say there is no change, git-update-index --refresh would not even look at the filesystem to correct the situation. Some ways of working around this issue were already suggested by Linus in the same thread on the same day, including waiting until the next second before returning from update-index if a cache entry written out has the current timestamp, but that means we can make at most one commit per second, and given that the e-mail patch workflow used by Linus needs to process at least 5 commits per second, it is not an acceptable solution. Linus notes that git-apply is primarily used to update the index while processing e-mailed patches, which is true, and git-apply's up-to-date check is fooled by the same problem but luckily in the other direction, so it is not really a big issue, but still it is disturbing. The function ce_match_stat() is called to bypass the comparison against filesystem data when the stat data recorded in the cache entry matches what stat() returns from the filesystem. This patch tackles the problem by changing it to actually go to the filesystem data for cache entries that have the same mtime as the index file itself. This works as long as the index file and working tree files are on the filesystems that share the same monotonic clock. Files on network mounted filesystems sometimes get skewed timestamps compared to "date" output, but as long as working tree files' timestamps are skewed the same way as the index file's, this approach still works. The only problematic files are the ones that have the same timestamp as the index file's, because two file updates that sandwitch the index file update must happen within the same second to trigger the problem. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 08:22:28 UTC |
| a5c21d6 | Junio C Hamano | 20 December 2005, 05:55:12 UTC | format-patch: make sure header and body are separated. Since log message in a commit object is defined to be binary blob, it could be something without an empty line between the title line and the body text. Be careful to format such into a form suitable for e-mail submission. There must be an empty line between the headers and the body. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 05:55:12 UTC |
| 913419f | Junio C Hamano | 18 December 2005, 10:03:15 UTC | diff --abbrev: document --abbrev=<n> form. It was implemented there but was not advertised. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 02:32:44 UTC |
| 47dd0d5 | Junio C Hamano | 14 December 2005, 01:21:41 UTC | diff: --abbrev option When I show transcripts to explain how something works, I often find myself hand-editing the diff-raw output to shorten various object names in the output. This adds --abbrev option to the diff family, which shortens diff-raw output and diff-tree commit id headers. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 02:32:44 UTC |
| 1c15afb | Junio C Hamano | 20 December 2005, 00:18:28 UTC | xread/xwrite: do not worry about EINTR at calling sites. We had errno==EINTR check after read(2)/write(2) sprinkled all over the places, always doing continue. Consolidate them into xread()/xwrite() wrapper routines. Credits for suggestion goes to HPA -- bugs are mine. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 02:28:16 UTC |
| 1fdfd05 | Junio C Hamano | 20 December 2005, 02:27:04 UTC | tests: make scripts executable just for consistency. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 02:27:04 UTC |
| e32faa8 | Junio C Hamano | 20 December 2005, 02:03:31 UTC | Remove "octopus". We still advertise "git resolve" as a standalone command, but never "git octopus", so nobody should be using it and it is safe to retire it. The functionality is still available as a strategy backend. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 02:05:49 UTC |
| ba922cc | Junio C Hamano | 20 December 2005, 02:02:20 UTC | Remove unused cmd-rename.sh This file is a remnant from the big command rename which happened quite some time ago. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 02:02:20 UTC |
| d89056c | Junio C Hamano | 20 December 2005, 01:59:58 UTC | Remove generated files */*.py[co] We missed ones in the compat/ subdirectory. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 02:00:54 UTC |
| 3aadad1 | Junio C Hamano | 20 December 2005, 00:35:48 UTC | Documentation: stdout of update-hook is connected to /dev/null Mention that update-hook does not emit its stdout to the sender. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 00:38:16 UTC |
| ef1cc2c | Junio C Hamano | 20 December 2005, 00:16:49 UTC | rev-list --objects: fix object list without commit. Earlier, "rev-list --objects <sha1>" for an object chain that does not have any commit failed with a usage message. This fixes "send-pack remote $tag" where tag points at a non-commit (e.g. a blob). Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 00:19:06 UTC |
| 42f4570 | Eric Wong | 19 December 2005, 01:23:50 UTC | Documentation/git-archimport: document -o, -a, f, -D options Also, ensure usage help switches are in the same order. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 December 2005, 09:51:16 UTC |
| 3af849a | Junio C Hamano | 19 December 2005, 08:31:08 UTC | howto/using-topic-branches: Recommend public URL git://git.kernel.org/ Recommending this means subsystem maintainers do not have to log-in just to resync with upstream. Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 December 2005, 08:31:08 UTC |
| 112d0ba | Linus Torvalds | 18 December 2005, 20:41:10 UTC | Make "git help" sort git commands in columns This changes "pretty_print_string_list()" to show the git commands alphabetically in column order, which is the normal one. Ie instead of doing git commands available in '/home/torvalds/bin' ---------------------------------------------- add am ... applypatch archimport ... cat-file check-ref-format ... ... it does git commands available in '/home/torvalds/bin' ---------------------------------------------- add diff-tree ... am fetch ... apply fetch-pack ... ... where each column is sorted. This is how "ls" sorts things too, and since visually the columns are much more distinct than the rows, so it _looks_ more sorted. The "ls" command has a "-x" option that lists entries by lines (the way git.c used to): if somebody wants to do that, the new print-out logic could be easily accomodated to that too. Matter of taste and preference, I guess. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 December 2005, 21:53:40 UTC |
| ea77e67 | Linus Torvalds | 18 December 2005, 20:15:58 UTC | Make "git help" react to window size correctly Currently the git "show commands" function will react to the environment variable COLUMNS, or just default to a width of 80 characters. That's just soo eighties. Nobody sane sets COLUMNS any more, unless they need to support some stone-age software from before the age of steam engines, SIGWINCH and TIOCGWINSZ. So get with the new century, and use TIOCGWINSZ to get the terminal size. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 December 2005, 21:53:33 UTC |
| d808111 | Junio C Hamano | 18 December 2005, 20:11:27 UTC | Documentation: typos and small fixes in "everyday". Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 December 2005, 20:11:27 UTC |
| 2247efb | Junio C Hamano | 18 December 2005, 09:55:29 UTC | clone-pack: remove unused and undocumented --keep flag While we are at it, give fully spelled --keep to fetch-pack. Also give --quiet in addition to -q to fetch-pack as well. Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 December 2005, 09:55:29 UTC |
| ad89721 | Junio C Hamano | 15 December 2005, 06:17:38 UTC | fetch-pack: -k option to keep downloaded pack. Split out the functions that deal with the socketpair after finishing git protocol handshake to receive the packed data into a separate file, and use it in fetch-pack to keep/explode the received pack data. We earlier had something like that on clone-pack side once, but the list discussion resulted in the decision that it makes sense to always keep the pack for clone-pack, so unpacking option is not enabled on the clone-pack side, but we later still could do so easily if we wanted to with this change. Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 December 2005, 07:11:29 UTC |
| c054d64 | Junio C Hamano | 17 December 2005, 08:00:50 UTC | Revert "get_sha1_basic(): corner case ambiguity fix" This reverts 6677c4665af2d73f670bec382bc82d0f2e9513fb commit. The misguided disambiguation has been reverted, so there is no point testing that misfeature. | 18 December 2005, 07:10:56 UTC |
| f7087e2 | Junio C Hamano | 17 December 2005, 07:48:22 UTC | Revert "We do not like "HEAD" as a new branch name" This reverts ee34518d629331dadd58b1a75294369d679eda8b commit. | 18 December 2005, 07:10:56 UTC |
| 8872f27 | Junio C Hamano | 17 December 2005, 07:48:14 UTC | Revert "refs.c: off-by-one fix." This reverts 06bf6ac4248e834a229027908d405f5e42ac96d7 commit. | 18 December 2005, 07:10:56 UTC |
| 011fbc7 | Junio C Hamano | 17 December 2005, 07:19:14 UTC | Remove misguided branch disambiguation. This removes the misguided attempt to refuse processing a branch name xyzzy and insist it to be given as either heads/xyzzy or tags/xyzzy when a tag xyzzy exists. There was no reason to do so --- the search order was predictable and well defined, so if the user says xyzzy we should have taken the tag xyzzy in such a case without complaining. This incidentally fixes another subtle bug related to this. If such a duplicate branch/tag name happened to be a unique valid prefix of an existing commit object name (say, "beef"), we did not take the tag "beef" but after complaining used the commit object whose name started with beef. Another problem this fixes while introducing some confusion is that there is no longer a reason to forbid a branch name HEAD anymore. In other words, now "git pull . ref1:HEAD" would work as expected, once we revert "We do not like HEAD branch" patch. It creates "HEAD" branch under ${GIT_DIR-.git}/refs/heads (or fast-forwards if already exists) using the tip of ref1 branch from the current repository, and merges it into the current branch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 December 2005, 07:10:56 UTC |
| 80248b2 | Junio C Hamano | 17 December 2005, 19:39:39 UTC | Documentation: HTTP needs update-server-info. Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 December 2005, 19:39:39 UTC |
| 01385e2 | Junio C Hamano | 17 December 2005, 07:12:33 UTC | Comment fixes. Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 December 2005, 07:32:47 UTC |
| 6922471 | Jan Harkes | 17 December 2005, 06:01:06 UTC | Fix git-am --skip git-am --skip does not unpack the next patch and ends up reapplying the old patch, believing that it is the new patch in the sequence. If the old patch applied successfully it will commit it with the supposedly skipped log message and ends up dropping the following patch. If the patch did not apply the user is left with the conflict he tried to skip and has to unpack the next patch in the sequence by hand to get git-am back on track. By clearing the resume variable whenever skips bumps the sequence counter we correctly unpack the next patch. I also added another resume= in the case a patch file is missing from the sequence to avoid the same problem when a file in the sequence was removed. Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 December 2005, 06:28:19 UTC |
| 6828399 | Junio C Hamano | 16 December 2005, 02:03:59 UTC | Forbid pattern maching characters in refnames. by marking '?', '*', and '[' as bad_ref_char(). Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 December 2005, 02:23:52 UTC |
| 3ae854c | Junio C Hamano | 17 December 2005, 02:23:33 UTC | Examples of resetting. Morten Welinder says examples of resetting is really about recovering from botched commit/pulls. I agree that pointers from commands that cause a reset to be needed in the first place would be very helpful. Also reset examples did not mention "pull/merge" cases. Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 December 2005, 02:23:33 UTC |
| 06bf6ac | Junio C Hamano | 16 December 2005, 02:52:51 UTC | refs.c: off-by-one fix. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 December 2005, 02:52:51 UTC |
| ee34518 | Johannes Schindelin | 16 December 2005, 01:40:25 UTC | We do not like "HEAD" as a new branch name This makes git-check-ref-format fail for "HEAD". Since the check is only executed when creating refs, the existing symbolic ref is safe. Otherwise these commands, most likely are pilot errors, would do pretty funky stuff: git checkout -b HEAD git pull . other:HEAD Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 December 2005, 01:56:32 UTC |
| 06d900c | Junio C Hamano | 16 December 2005, 01:53:44 UTC | Sort globbed refname in show-branch. "git show-branch bugs/*" shows all branches whose name match the specified pattern, but in the order readdir() happened to returned. Sort them to make the output more predictable. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 December 2005, 01:53:44 UTC |
| e5e3a9d | Nicolas Pitre | 15 December 2005, 16:10:32 UTC | small cleanup for diff-delta.c This patch removes unused remnants of the original xdiff source. No functional change. Possible tiny speed improvement. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 December 2005, 00:19:11 UTC |
| 1403959 | Fredrik Kuivinen | 15 December 2005, 22:48:38 UTC | git-whatchanged: Add usage string Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 December 2005, 00:02:25 UTC |
| 2a58a9a | Fredrik Kuivinen | 15 December 2005, 22:48:26 UTC | git-log: Add usage string Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 December 2005, 00:02:21 UTC |
| 92811b5 | Fredrik Kuivinen | 15 December 2005, 22:47:57 UTC | git-diff: Usage string clean-up Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 December 2005, 00:02:04 UTC |
| c6f60f9 | Junio C Hamano | 15 December 2005, 21:02:25 UTC | applymbox: typofix Sorry, I broke this command completely with the stupid typo. Noticed by Marco Costalba. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 December 2005, 21:03:20 UTC |
| 6677c46 | Junio C Hamano | 15 December 2005, 20:54:00 UTC | get_sha1_basic(): corner case ambiguity fix When .git/refs/heads/frotz and .git/refs/tags/frotz existed, and the object name stored in .git/refs/heads/frotz were corrupt, we ended up picking tags/frotz without complaining. Worse yet, if the corrupt .git/refs/heads/frotz was more than 40 bytes and began with hexadecimal characters, it silently overwritten the initial part of the returned result. This commit adds a couple of tests to demonstrate these cases, with a fix. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 December 2005, 20:54:00 UTC |
