| 39ba7d5 | Martin Mares | 18 February 2006, 20:44:20 UTC | Fix retries in git-cvsimport Fixed a couple of bugs in recovering from broken connections: The _line() method now returns undef correctly when the connection is broken instead of falling off the function and returning garbage. Retries are now reported to stderr and the eventual partially downloaded file is discarded instead of being appended to. The "Server gone away" test has been removed, because it was reachable only if the garbage return bug bit. Signed-off-by: Martin Mares <mj@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 February 2006, 00:19:00 UTC |
| 3ff903b | Eric Wong | 18 February 2006, 11:49:38 UTC | archimport: remove files from the index before adding/updating This fixes a bug when importing where a directory gets removed/renamed but is immediately replaced by a file of the same name in the same changeset. This fix only applies to the accurate (default) strategy the moment. This patch should also fix the fast strategy if/when it is updated to handle the cases that would've triggered this bug. This bug was originally found in git-svn, but I remembered I did the same thing with archimport as well. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 February 2006, 19:21:16 UTC |
| 772d8a3 | Shawn Pearce | 17 February 2006, 07:26:16 UTC | Make git-reset delete empty directories When git-reset --hard is used and a subdirectory becomes empty (as it contains no tracked files in the target tree) the empty subdirectory should be removed. This matches the behavior of git-checkout-index and git-read-tree -m which would not have created the subdirectory or would have deleted it when updating the working directory. Subdirectories which are not empty will be left behind. This may happen if the subdirectory still contains object files from the user's build process (for example). [jc: simplified the logic a bit, while keeping the test script.] | 18 February 2006, 07:52:57 UTC |
| 735d80b | Jonas Fonseca | 18 February 2006, 01:11:36 UTC | Document --short and --git-dir in git-rev-parse(1) Signed-off-by: Jonas Fonseca <fonseca@diku.dk> | 18 February 2006, 01:33:12 UTC |
| 44de0da | Jonas Fonseca | 18 February 2006, 01:10:53 UTC | git-rev-parse: Fix --short= option parsing Signed-off-by: Jonas Fonseca <fonseca@diku.dk> | 18 February 2006, 01:33:11 UTC |
| b5b1699 | Carl Worth | 18 February 2006, 00:14:52 UTC | Prevent git-upload-pack segfault if object cannot be found Signed-off-by: Carl Worth <cworth@cworth.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 February 2006, 00:20:51 UTC |
| eedf8f9 | Carl Worth | 17 February 2006, 21:33:26 UTC | Abstract test_create_repo out for use in tests. Signed-off-by: Carl Worth <cworth@cworth.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 February 2006, 00:16:53 UTC |
| 41ff7a1 | Carl Worth | 17 February 2006, 21:33:24 UTC | Trap exit to clean up created directory if clone fails. Signed-off-by: Carl Worth <cworth@cworth.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 February 2006, 00:16:49 UTC |
| babfaf8 | Josef Weidendorfer | 15 February 2006, 19:22:11 UTC | More useful/hinting error messages in git-checkout Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 February 2006, 03:14:04 UTC |
| 6c5c62f | Fernando J. Pereda | 15 February 2006, 11:37:30 UTC | Print an error if cloning a http repo and NO_CURL is set If Git is compiled with NO_CURL=YesPlease and one tries to clone a http repository, git-clone tries to call the curl binary. This trivial patch prints an error instead in such situation. Signed-off-by: Fernando J. Pereda <ferdy@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 February 2006, 03:14:01 UTC |
| 504fe71 | Junio C Hamano | 15 February 2006, 00:05:57 UTC | checkout: fix dirty-file display. When we refused to switch branches, we incorrectly showed differences from the branch we would have switched to. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 February 2006, 00:05:57 UTC |
| 9ece716 | Junio C Hamano | 14 February 2006, 09:11:42 UTC | combine-diff: diff-files fix (#2) The raw format "git-diff-files -c" to show unmerged state forgot to initialize the status fields from parents, causing NUL characters to be emitted. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 February 2006, 09:11:42 UTC |
| 713a11f | Junio C Hamano | 14 February 2006, 07:07:04 UTC | combine-diff: diff-files fix. When showing a conflicted merge from index stages and working tree file, we did not fetch the mode from the working tree, and mistook that as a deleted file. Also if the manual resolution (or automated resolution by git rerere) ended up taking either parent's version, we did not show _anything_ for that path. Either was quite bad and confusing. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 February 2006, 07:07:04 UTC |
| 3654638 | Fredrik Kuivinen | 13 February 2006, 23:15:14 UTC | s/SHELL/SHELL_PATH/ in Makefile With the current Makefile we don't use the shell chosen by the platform specific defines when we invoke GIT-VERSION-GEN. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 February 2006, 06:13:22 UTC |
| 4631c00 | Junio C Hamano | 14 February 2006, 05:25:38 UTC | bisect: remove BISECT_NAMES after done. I noticed that we forgot to clean this file and kept it that way, while trying to help with Andrew's bisect problem. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 February 2006, 05:55:27 UTC |
| 41ac06c | Junio C Hamano | 14 February 2006, 05:52:10 UTC | Documentation: git-ls-files asciidocco. Noticed by Jon Nelson. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 February 2006, 05:52:10 UTC |
| 64491e1 | Junio C Hamano | 13 February 2006, 08:26:14 UTC | Documentation: git-commit in 1.2.X series defaults to --include. The documentation was mistakenly describing the --only semantics to be default. The 1.2.0 release and its maintenance series 1.2.X will keep the traditional --include semantics as the default. Clarify the situation. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 February 2006, 08:32:10 UTC |
| bd9ca0b | Junio C Hamano | 12 February 2006, 21:14:53 UTC | GIT 1.2.0 Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2006, 21:14:53 UTC |
| 4bbdfab | Junio C Hamano | 12 February 2006, 21:13:12 UTC | Fix "test: unexpected operator" on bsd This fixes the same issue as a previous fix by Alex Riesen does. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2006, 21:13:33 UTC |
| c5e09c1 | Junio C Hamano | 12 February 2006, 21:05:53 UTC | git-commit: show dirtiness including index. Earlier, when we switched a branch we used diff-files to show paths that are dirty in the working tree. But we allow switching branches with updated index ("read-tree -m -u $old $new" works that way), and only showing paths that have differences in the working tree but not paths that are different in index was confusing. This shows both as modified from the top commit of the branch we just have switched to. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2006, 21:05:53 UTC |
| 024701f | Junio C Hamano | 12 February 2006, 21:01:54 UTC | Make pack-objects chattier. You could give -q to squelch it, but currently no tool does it. This would make 'git clone host:repo here' over ssh not silent again. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2006, 21:01:54 UTC |
| 0dbc4e8 | Alex Riesen | 12 February 2006, 18:05:34 UTC | avoid echo -e, there are systems where it does not work FreeBSD 4.11 being one example: the built-in echo doesn't have -e, and the installed /bin/echo does not do "-e" as well. "printf" works, laking just "\e" and "\xAB'. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2006, 19:36:19 UTC |
| ef1af9d | Alex Riesen | 12 February 2006, 18:03:16 UTC | fix "test: 2: unexpected operator" on bsd Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2006, 19:36:17 UTC |
| d7ee090 | Linus Torvalds | 12 February 2006, 19:24:50 UTC | Fix object re-hashing The hashed object lookup had a subtle bug in re-hashing: it did for (i = 0; i < count; i++) if (objs[i]) { .. rehash .. where "count" was the old hash couny. Oon the face of it is obvious, since it clearly re-hashes all the old objects. However, it's wrong. If the last old hash entry before re-hashing was in use (or became in use by the re-hashing), then when re-hashing could have inserted an object into the hash entries with idx >= count due to overflow. When we then rehash the last old entry, that old entry might become empty, which means that the overflow entries should be re-hashed again. In other words, the loop has to be fixed to either traverse the whole array, rather than just the old count. (There's room for a slight optimization: instead of counting all the way up, we can break when we see the first empty slot that is above the old "count". At that point we know we don't have any collissions that we might have to fix up any more. This patch only does the trivial fix) [jc: with trivial fix on trivial fix] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2006, 19:24:50 UTC |
| 2b79636 | Junio C Hamano | 12 February 2006, 02:51:19 UTC | hashtable-based objects: minimum fixups. Calling hashtable_index from find_object before objs is created would result in division by zero failure. Avoid it. Also the given object name may not be aligned suitably for unsigned int; avoid dereferencing casted pointer. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2006, 13:12:39 UTC |
| 070879c | Johannes Schindelin | 12 February 2006, 01:57:57 UTC | Use a hashtable for objects instead of a sorted list In a simple test, this brings down the CPU time from 47 sec to 22 sec. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2006, 13:12:39 UTC |
| 5b766ea | kent@lysator.liu.se | 12 February 2006, 12:00:52 UTC | Add howto about separating topics. This howto consists of a footnote from an email by JC to the git mailing list (<7vfyms0x4p.fsf@assigned-by-dhcp.cox.net>). Signed-off-by: Kent Engstrom <kent@lysator.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2006, 13:02:42 UTC |
| af8c28e | Junio C Hamano | 12 February 2006, 13:02:30 UTC | Merge branch 'pb/repo' * pb/repo: Add support for explicit type specifiers when calling git-repo-config | 12 February 2006, 13:02:30 UTC |
| c611db1 | Junio C Hamano | 12 February 2006, 13:02:25 UTC | Merge branch 'jc/fixdiff' * jc/fixdiff: diff-tree: do not default to -c | 12 February 2006, 13:02:25 UTC |
| 4890f62 | Junio C Hamano | 11 February 2006, 20:39:11 UTC | Avoid using "git-var -l" until it gets fixed. This is to be nicer to people with unusable GECOS field. "git-var -l" is currently broken in that when used by a user who does not have a usable GECOS field and has not corrected it by exporting GIT_COMMITTER_NAME environment variable it dies when it tries to output GIT_COMMITTER_IDENT (same thing for AUTHOR). "git-pull" used "git-var -l" only because it needed to get a configuration variable before "git-repo-config --get" was introduced. Use the latter tool designed exactly for this purpose. "git-sh-setup" used "git-var GIT_AUTHOR_IDENT" without actually wanting to use its value. The only purpose was to cause the command to check and barf if the repository format version recorded in the $GIT_DIR/config file is too new for us to deal with correctly. Instead, use "repo-config --get" on a random property and see if it die()s, and check if the exit status is 128 (comes from die -- missing variable is reported with exit status 1, so we can tell that case apart). Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2006, 12:59:25 UTC |
| 7162dff | Petr Baudis | 12 February 2006, 03:14:48 UTC | Add support for explicit type specifiers when calling git-repo-config Currently, git-repo-config will just return the raw value of option as specified in the config file; this makes things difficult for scripts calling it, especially if the value is supposed to be boolean. This patch makes it possible to ask git-repo-config to check if the option is of the given type (int or bool) and write out the value in its canonical form. If you do not pass --int or --bool, the behaviour stays unchanged and the raw value is emitted. This also incidentally fixes the segfault when option with no value is encountered. [jc: tweaked the option parsing a bit to make it easier to see that the patch does not change anything but the type stuff in the diff output. Also changed to avoid "foo ? : bar" construct. ] Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2006, 08:26:54 UTC |
| 6932c78 | Junio C Hamano | 12 February 2006, 00:43:30 UTC | diff-tree: do not default to -c Marco says it breaks qgit. This makes the flags a bit more orthogonal. $ git-diff-tree -r --abbrev ca18 No output from this command because you asked to skip merge by not having -m there. $ git-diff-tree -r -m --abbrev ca18 ca182053c7710a286d72102f4576cf32e0dafcfb :100644 100644 538d21d... 59042d1... M Makefile :100644 100644 410b758... 6c47c3a... M entry.c ca182053c7710a286d72102f4576cf32e0dafcfb :100644 100644 30479b4... 59042d1... M Makefile The same "independent sets of diff" as before without -c. $ git-diff-tree -r -m -c --abbrev ca18 ca182053c7710a286d72102f4576cf32e0dafcfb ::100644 100644 100644 538d21d... 30479b4... 59042d1... MM Makefile Combined. $ git-diff-tree -r -c --abbrev ca18 ca182053c7710a286d72102f4576cf32e0dafcfb ::100644 100644 100644 538d21d... 30479b4... 59042d1... MM Makefile Asking for combined without -m does not make sense, so -c implies -m. We need to supply -c as default to whatchanged, which is a one-liner. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2006, 07:18:33 UTC |
| 16139f9 | Junio C Hamano | 12 February 2006, 07:08:23 UTC | t5500: adjust to change in pack-object reporting behaviour. Now pack-object is not as chatty when its stderr is not connected to a terminal, so the test needs to be adjusted for that. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2006, 07:08:23 UTC |
| 1536dd9 | Junio C Hamano | 12 February 2006, 02:55:43 UTC | Only call git-rerere if $GIT_DIR/rr-cache exists. Johannes noticed that git-rerere depends on Digest.pm, and if one does not use the command, one can live without it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2006, 02:55:43 UTC |
| 7bbdeaa | Christian Biesinger | 11 February 2006, 15:44:11 UTC | Use a relative path for SVN importing The absolute path (with the leading slash) breaks SVN importing, because it then looks for /trunk/... instead of /svn/trunk/... (in my case, the repository URL was https://servername/svn/) Signed-off-by: Christian Biesinger <cbiesinger@web.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2006, 01:59:38 UTC |
| 21fcd1b | Junio C Hamano | 12 February 2006, 01:54:18 UTC | fetch-clone progress: finishing touches. This makes fetch-pack also report the progress of packing part. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2006, 01:54:18 UTC |
| 98deeaa | Linus Torvalds | 11 February 2006, 18:41:22 UTC | Fix fetch-clone in the presense of signals We shouldn't fail a fetch just because a signal might have interrupted the read. Normally, we don't install any signal handlers, so EINTR really shouldn't happen. That said, really old versions of Linux will interrupt an interruptible system call even for signals that turn out to be ignored (SIGWINCH is the classic example - resizing your xterm would cause it). The same might well be true elsewhere too. Also, since receive_keep_pack() doesn't control the caller, it can't know that no signal handlers exist. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2006, 00:50:03 UTC |
| c548cf4 | Linus Torvalds | 11 February 2006, 18:43:56 UTC | Make "git clone" pack-fetching download statistics better Average it out over a few events to make the numbers stable, and fix the silly usec->binary-ms conversion. Yeah, yeah, it's arguably eye-candy to keep the user calm, but let's do that right. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2006, 00:49:52 UTC |
| 5ee2ad6 | Linus Torvalds | 11 February 2006, 04:31:09 UTC | Make "git clone" less of a deathly quiet experience It used to be that "git-unpack-objects" would give nice percentages, but now that we don't unpack the initial clone pack any more, it doesn't. And I'd love to do that nice percentage view in the pack objects downloader too, but the thing doesn't even read the pack header, much less know how much it's going to get, so I was lazy and didn't. Instead, it at least prints out how much data it's gotten, and what the packing speed is. Which makes the user realize that it's actually doing something useful instead of sitting there silently (and if the recipient knows how large the final result is, he can at least make a guess about when it migt be done). So with this patch, I get something like this on my DSL line: [torvalds@g5 ~]$ time git clone master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 clone-test Packing 188543 objects 48.398MB (154 kB/s) where even the speed approximation seems to be roughtly correct (even though my algorithm is a truly stupid one, and only really gives "speed in the last half second or so"). Anyway, _something_ like this is definitely needed. It could certainly be better (if it showed the same kind of thing that git-unpack-objects did, that would be much nicer, but would require parsing the object stream as it comes in). But this is big step forward, I think. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 February 2006, 06:28:30 UTC |
| 29e55cd | Junio C Hamano | 11 February 2006, 03:11:23 UTC | Define GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL) to known values. Without these, running tests with an account with empty gecos field would fail. We might want to loosen error from "git-var -l" (but not "git-var GIT_AUTHOR_NAME") later, but that is more or less an independent issue. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 February 2006, 03:11:23 UTC |
| 3f6726e | Junio C Hamano | 11 February 2006, 02:47:41 UTC | Merge branch 'lt/diff-tree' * lt/diff-tree: combine-diff: Record diff status a bit more faithfully find_unique_abbrev() simplification. combine-diff: move formatting logic to show_combined_diff() combined-diff: use diffcore before intersecting paths. diff-tree -c raw output | 11 February 2006, 02:47:41 UTC |
| 9ae6be8 | Junio C Hamano | 11 February 2006, 02:38:24 UTC | git-commit -v: have patch at the end. It was pointed out that otherwise more important summary information prefixed with '#' would become prone to be missed. Also instead of chopping at the first '^---$' line, stop at the first 'diff --git a/' line. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 February 2006, 02:44:31 UTC |
| 9da5c2f | Junio C Hamano | 10 February 2006, 19:56:42 UTC | rev-list: default to abbreviate merge parent names under --pretty. When we prettyprint commit log messages, merge parent names were often very long and there was no way to abbreviate it. This changes them to be abbreviated by default, and non-default abbreviations can be specified with --no-abbrev or --abbrev=<n> options. Note that this affects only the prettyprinted parent names. The output from --show-parents is meant for machine consumption and is not affected by this flag. | 10 February 2006, 19:56:42 UTC |
| 39556fb | Nicolas Pitre | 10 February 2006, 18:42:05 UTC | delta micro optimization My kernel work habit made me look at the generated assembly for the delta code, and one obvious albeit small improvement is this patch. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 February 2006, 19:42:56 UTC |
| e7ad4a9 | Nicolas Pitre | 10 February 2006, 15:20:40 UTC | count-delta.c: comment fixes There was a stale comment that explains why the old code could undercount when delta data copied things around inside detination buffer. We do not use that kind of delta, so the comment does not apply. | 10 February 2006, 17:21:02 UTC |
| 4d44cb1 | Junio C Hamano | 10 February 2006, 15:14:55 UTC | Merge branch 'jc/empty-commit' * jc/empty-commit: t6000: fix a careless test library add-on. Do not allow empty name or email. | 10 February 2006, 15:14:55 UTC |
| d416df8 | Junio C Hamano | 10 February 2006, 10:30:52 UTC | combine-diff: Record diff status a bit more faithfully This shows "new file mode XXXX" and "deleted file mode XXXX" lines like two-way diff-patch output does, by checking the status from each parent. The diff-raw output for combined diff is made a bit uglier by showing diff status letters with each parent. While most of the case you would see "MM" in the output, an Evil Merge that touches a path that was added by inheriting from one parent is possible and it would be shown like these: $ git-diff-tree --abbrev -c HEAD 2d7ca89675eb8888b0b88a91102f096d4471f09f ::000000 000000 100644 0000000... 0000000... 31dd686... AA b ::000000 100644 100644 0000000... 6c884ae... c6d4fa8... AM d ::100644 100644 100644 4f7cbe7... f8c295c... 19d5d80... RR e Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 February 2006, 10:50:53 UTC |
| 297a1aa | Junio C Hamano | 10 February 2006, 09:51:12 UTC | find_unique_abbrev() simplification. Earlier it did not grok the 0{40} SHA1 very well, but what it needed to do was to find the shortest 0{N} that is not used as a valid object name to be consistent with the way names of valid objects are abbreviated. This makes some users simpler. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 February 2006, 09:51:12 UTC |
| cf7bb58 | Junio C Hamano | 10 February 2006, 08:45:59 UTC | git-status -v This revamps the git-status command to take the same set of parameters as git commit. It gives a preview of what is being committed with that command. With -v flag, it shows the diff output between the HEAD commit and the index that would be committed if these flags were given to git-commit command. git-commit also acquires -v flag (it used to mean "verify" but that is the default anyway and there is --no-verify to turn it off, so not much is lost), which uses the updated git-status -v to seed the commit log buffer. This is handy for writing a log message while reviewing the changes one last time. Now, git-commit and git-status are internally share the same implementation. Unlike previous git-commit change, this uses a temporary index to prepare the index file that would become the real index file after a successful commit, and moves it to the real index file once the commit is actually made. This makes it safer than the previous scheme, which stashed away the original index file and restored it after an aborted commit. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 February 2006, 08:54:49 UTC |
| 4dc870d | Junio C Hamano | 10 February 2006, 06:19:07 UTC | Merge branch 'jc/ls-files-o' * jc/ls-files-o: ls-files: honour per-directory ignore file from higher directories. | 10 February 2006, 06:19:07 UTC |
| 91c7674 | Junio C Hamano | 10 February 2006, 01:15:59 UTC | count-delta.c: Match the delta data semantics change in version 3. This matches the count_delta() logic to the change previous commit introduces to patch_delta(). Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 February 2006, 05:06:38 UTC |
| d60fc1c | Nicolas Pitre | 09 February 2006, 22:50:04 UTC | remove delta-against-self bit After experimenting with code to add the ability to encode a delta against part of the deltified file, it turns out that resulting packs are _bigger_ than when this ability is not used. The raw delta output might be smaller, but it doesn't compress as well using gzip with a negative net saving on average. Said bit would in fact be more useful to allow for encoding the copying of chunks larger than 64KB providing more savings with large files. This will correspond to packs version 3. While the current code still produces packs version 2, it is made future proof so pack versions 2 and 3 are accepted. Any pack version 2 are compatible with version 3 since the redefined bit was never used before. When enough time has passed, code to use that bit to produce version 3 packs could be added. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 February 2006, 05:06:38 UTC |
| 67d4221 | Jason Riedy | 10 February 2006, 01:56:13 UTC | stat() for existence in safe_create_leading_directories() Use stat() to explicitly check for existence rather than relying on the non-portable EEXIST error in sha1_file.c's safe_create_leading_directories(). There certainly are optimizations possible, but then the code becomes almost the same as that in coreutil's lib/mkdir-p.c. Other uses of EEXIST seem ok. Tested on Solaris 8, AIX 5.2L, and a few Linux versions. AIX has some unrelated (I think) failures right now; I haven't tried many recent gits there. Anyone have an old Ultrix box to break everything? ;) Also remove extraneous #includes. Everything's already in git-compat-util.h, included through cache.h. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 February 2006, 02:38:52 UTC |
| 0a79807 | Junio C Hamano | 09 February 2006, 23:23:06 UTC | combine-diff: move formatting logic to show_combined_diff() This way, diff-files can make use of it. Also implement the full suite of what diff_flush_raw() supports just for consistency. With this, 'diff-tree -c -r --name-status' would show what is expected. There is no way to get the historical output (useful for debugging and low-level Plumbing work) anymore, so tentatively it makes '-m' to mean "do not combine and show individual diffs with parents". diff-files matches diff-tree to produce raw output for -c. For textual combined diff, use -p -c. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2006, 23:23:06 UTC |
| ce1610e | Junio C Hamano | 09 February 2006, 22:41:39 UTC | call git_config() after setup_git_directory() If you call setup_git_directory() to work from a subdirectory, that should be run first before running git_config(). Otherwise you would not read the configuration file from the correct place. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2006, 22:41:39 UTC |
| 5b23683 | Junio C Hamano | 09 February 2006, 22:35:19 UTC | combined-diff: use diffcore before intersecting paths. This is needed to make "diff-tree -c -M" to work semi-sensibly. Otherwise rename detection, pickaxe and friends would never be invoked. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2006, 22:35:19 UTC |
| 147cf31 | Jon Loeliger | 09 February 2006, 15:12:11 UTC | Add --diff-filter= documentation paragraph Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2006, 20:06:57 UTC |
| ee63802 | Linus Torvalds | 09 February 2006, 18:30:28 UTC | diff-tree -c raw output NOTE! This makes "-c" be the default, which effectively means that merges are never ignored any more, and "-m" is a no-op. So it changes semantics. I would also like to make "--cc" the default if you do patches, but didn't actually do that. The raw output format is not wonderfully pretty, but it's distinguishable from a "normal patch" in that a normal patch with just one parent has just one colon at the beginning, while a multi-parent raw diff has <n> colons for <n> parents. So now, in the kernel, when you do git-diff-tree cce0cac125623f9b68f25dd1350f6d616220a8dd (to see the manual ARM merge that had a conflict in arch/arm/Kconfig), you get cce0cac125623f9b68f25dd1350f6d616220a8dd ::100644 100644 100644 4a63a8e2e45247a11c068c6ed66c6e7aba29ddd9 77eee38762d69d3de95ae45dd9278df9b8225e2c 2f61726d2f4b636f6e66696700dbf71a59dad287 arch/arm/Kconfig ie you see two colons (two parents), then three modes (parent modes followed by result mode), then three sha1s (parent sha1s followed by result sha1). Which is pretty close to the normal raw diff output. Cool/stupid exercise: $ git-whatchanged | grep '^::' | cut -f2- | sort | uniq -c | sort -n | less -S will show which files have needed the most file-level merge conflict resolution. Useful? Probably not. But kind of interesting. For the kernel, it's .... 10 arch/ia64/Kconfig 11 drivers/scsi/Kconfig 12 drivers/net/Makefile 17 include/linux/libata.h 18 include/linux/pci_ids.h 23 drivers/net/Kconfig 24 drivers/scsi/libata-scsi.c 28 drivers/scsi/libata-core.c 43 MAINTAINERS Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2006, 19:46:05 UTC |
| 701ca74 | Junio C Hamano | 09 February 2006, 08:08:31 UTC | ls-files: honour per-directory ignore file from higher directories. When git-ls-files -o --exclude-per-directory=.gitignore is run from a subdirectory, it did not read from .gitignore from its parent directory. Reading from them makes output from these two commands consistent: $ git ls-files -o --exclude-per-directory=.gitignore Documentation $ cd Documentation && git ls-files -o --exclude-per-directory=.gitignore Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2006, 08:08:31 UTC |
| 47e013f | Junio C Hamano | 07 February 2006, 23:35:46 UTC | t6000: fix a careless test library add-on. It tried to "restore" GIT_AUTHOR_EMAIL environment variable but the variable started out as unset, so ended up setting it to an empty string. This is now caught as an error. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2006, 05:55:34 UTC |
| dfdd309 | Junio C Hamano | 07 February 2006, 21:19:10 UTC | Do not allow empty name or email. Instead of silently allowing to create a bogus commit that lacks information by mistake, complain loudly and die. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2006, 05:55:34 UTC |
| d19e06f | Andreas Ericsson | 07 February 2006, 17:21:02 UTC | .gitignore git-rerere and config.mak Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2006, 21:19:51 UTC |
| deb989b | Linus Torvalds | 07 February 2006, 18:26:41 UTC | Fix "git diff a..b" breakage The "--cc" implies "-p", but without the recursive part. Linus Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2006, 21:19:50 UTC |
| 4e783b4 | Petr Baudis | 07 February 2006, 11:47:47 UTC | Basic documentation for git-show Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2006, 21:19:42 UTC |
| 3904848 | Petr Baudis | 07 February 2006, 11:47:44 UTC | Document git-diff-tree --always Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2006, 21:19:40 UTC |
| 53f3138 | Mark Wooding | 07 February 2006, 10:07:39 UTC | http-fetch: Abort requests for objects which arrived in packs In fetch_object, there's a call to release an object request if the object mysteriously arrived, say in a pack. Unfortunately, the fetch attempt for this object might already be in progress, and we'll leak the descriptor. Instead, try to tidy away the request. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2006, 10:13:02 UTC |
| 66f04f3 | Andreas Ericsson | 07 February 2006, 09:37:54 UTC | format-patch: Remove last vestiges of --mbox option Don't mention it in docs or --help output. Remove mbox, date and author variables from git-format-patch.sh. Use DESCRIPTION text from man-page to update LONG_USAGE output. It's a bit silly to have two texts saying the same thing in different words, and I'm too lazy to update both. Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2006, 10:09:55 UTC |
| 90768da | Junio C Hamano | 07 February 2006, 09:19:49 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Use git-diff-tree --cc for showing the diffs for merges gitk: Add braces around if expressions | 07 February 2006, 09:19:49 UTC |
| 5a798fb | Junio C Hamano | 06 February 2006, 00:08:01 UTC | git-commit: finishing touches. Introduce --only flag to allow the new "partial commit" semantics when paths are specified. The default is still the traditional --include semantics. Once peoples' fingers and scripts that want the traditional behaviour are updated to explicitly say --include, we could change it to either default to --only, or refuse to operate without either --only/--include when paths are specified. This also fixes a couple of bugs in the previous round. Namely: - forgot to save/restore index in some cases. - forgot to use the temporary index to show status when '--only paths...' semantics was used. - --author did not take precedence when reusing an existing commit. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2006, 07:20:32 UTC |
| 130fcca | Junio C Hamano | 05 February 2006, 08:07:44 UTC | git-commit: revamp the git-commit semantics. - "git commit" without _any_ parameter keeps the traditional behaviour. It commits the current index. We commit the whole index even when this form is run from a subdirectory. - "git commit --include paths..." (or "git commit -i paths...") is equivalent to: git update-index --remove paths... git commit - "git commit paths..." acquires a new semantics. This is an incompatible change that needs user training, which I am still a bit reluctant to swallow, but enough people seem to have complained that it is confusing to them. It 1. refuses to run if $GIT_DIR/MERGE_HEAD exists, and reminds trained git users that the traditional semantics now needs -i flag. 2. refuses to run if named paths... are different in HEAD and the index (ditto about reminding). Added paths are OK. 3. reads HEAD commit into a temporary index file. 4. updates named paths... from the working tree in this temporary index. 5. does the same updates of the paths... from the working tree to the real index. 6. makes a commit using the temporary index that has the current HEAD as the parent, and updates the HEAD with this new commit. - "git commit --all" can run from a subdirectory, but it updates the index with all the modified files and does a whole tree commit. - In all cases, when the command decides not to create a new commit, the index is left as it was before the command is run. This means that the two "git diff" in the following sequence: $ git diff $ git commit -a $ git diff would show the same diff if you abort the commit process by making the commit log message empty. This commit also introduces much requested --author option. $ git commit --author 'A U Thor <author@example.com>' Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2006, 07:20:32 UTC |
| 8389b52 | Junio C Hamano | 29 January 2006, 07:15:24 UTC | git-rerere: reuse recorded resolve. In a workflow that employs relatively long lived topic branches, the developer sometimes needs to resolve the same conflict over and over again until the topic branches are done (either merged to the "release" branch, or sent out and accepted upstream). This commit introduces a new command, "git rerere", to help this process by recording the conflicted automerge results and corresponding hand-resolve results on the initial manual merge, and later by noticing the same conflicted automerge and applying the previously recorded hand resolution using three-way merge. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2006, 05:53:11 UTC |
| 1cb3038 | Junio C Hamano | 04 February 2006, 03:20:16 UTC | fmt-merge-msg: show summary of what is merged. In addition to the branch names, populate the log message with one-line description from actual commits that are being merged. This was prompted by Len's 12-way octopus. You need to have 'merge.summary' in the configuration file to enable it: $ git repo-config merge.summary yes Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2006, 05:52:08 UTC |
| 1b1fdf8 | Junio C Hamano | 04 February 2006, 06:04:14 UTC | read-tree --aggressive A new flag --aggressive resolves what we traditionally resolved with external git-merge-one-file inside index while read-tree 3-way merge works. git-merge-octopus and git-merge-resolve use this flag before running git-merge-index with git-merge-one-file. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2006, 05:43:27 UTC |
| 8bc5c04 | Junio C Hamano | 07 February 2006, 05:35:25 UTC | [PATCH] mailinfo: reset CTE after each multipart If the first part uses quoted-printable to protect iso8859-1 name in the commit log, and the second part was plain ascii text patchfile without even Content-Transfer-Encoding subheader, we incorrectly tried to decode the patch as quoted printable. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2006, 05:37:53 UTC |
| cc55aae | J. Bruce Fields | 06 February 2006, 00:42:27 UTC | Docs: minor git-push copyediting Minor git-push copyediting Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2006, 05:14:57 UTC |
| 85a97d4 | J. Bruce Fields | 05 February 2006, 23:29:49 UTC | Docs: move git url and remotes text to separate sections The sections on git urls and remotes files in the git-fetch, git-pull, and git-push manpages seem long enough to be worth a manpage section of their own. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2006, 05:14:56 UTC |
| 3598a30 | J. Bruce Fields | 05 February 2006, 22:43:47 UTC | Docs: split up pull-fetch-param.txt The push and pull man pages include a bunch of shared text from pull-fetch-param.txt. This simplifies maintenance somewhat, but there's actually quite a bit of text that applies only to one or the other. So, separate out the push- and pull/fetch-specific text into pull-fetch-param.txt and git-push.txt, then include the largest chunk of common stuff (the description of protocols and url's) from urls.txt. That cuts some irrelevant stuff from the man pages without making us duplicate too much. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2006, 05:14:55 UTC |
| 4462731 | Junio C Hamano | 07 February 2006, 02:54:08 UTC | combine-diff: do not punt on removed or added files. When we remove a file, the parents' contents are all removed so it is not that interesting to show all of them, but the fact it was removed when all parents had it *is* unusual. When we add a file, similarly the fact it was added when no parent wanted it *is* unusual, and in addition the result matters, so show it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2006, 02:54:08 UTC |
| b77b027 | Paul Mackerras | 06 February 2006, 22:13:52 UTC | gitk: Use git-diff-tree --cc for showing the diffs for merges This replaces a lot of code that used the result from several 2-way diffs to generate a combined diff for a merge. Now we just use git-diff-tree --cc and colorize the output a bit, which is a lot simpler, and has the enormous advantage that if the diff doesn't show quite what someone thinks it should show, I can deflect the blame to someone else. :) Signed-off-by: Paul Mackerras <paulus@samba.org> | 06 February 2006, 22:13:52 UTC |
| 418c4c7 | Paul Mackerras | 06 February 2006, 22:10:18 UTC | gitk: Add braces around if expressions Apparently this simplifies things for the parser/compiler and makes it go slightly faster (since without the braces, it potentially has to do two levels of substitutions rather than one). Signed-off-by: Paul Mackerras <paulus@samba.org> | 06 February 2006, 22:10:18 UTC |
| 2454c96 | Junio C Hamano | 06 February 2006, 20:53:07 UTC | combine-diff: show mode changes as well. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 February 2006, 21:06:49 UTC |
| 9843a1f | Junio C Hamano | 06 February 2006, 20:30:00 UTC | combine-diff: do not send NULL to printf When we run combined diff from working tree (diff-files --cc), we sent NULL to printf that is returned by find_unique_abbrev(). Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 February 2006, 20:30:00 UTC |
| 960c702 | Junio C Hamano | 06 February 2006, 20:27:33 UTC | core-tutorial: adjust to recent reality. We still talked about HEAD symlinks but these days we use symrefs by default. Also 'failed/prevented' message is now gone from the merge output. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 February 2006, 20:27:33 UTC |
| f22fd75 | Junio C Hamano | 06 February 2006, 19:17:56 UTC | git-diff: do not fall back on --cc when -[123], --ours etc. are given. These flags ask diff with a specific unmerged stage, so it should fall back on -p instead. Also when -c is given, we should not do --cc. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 February 2006, 19:22:07 UTC |
| a2c641c | Junio C Hamano | 06 February 2006, 07:55:45 UTC | Merge branch 'jc/diff' * jc/diff: git-diff-tree --stdin: show all parents. combine-diff: remove misguided --show-empty hack. | 06 February 2006, 07:55:45 UTC |
| 12db485 | Junio C Hamano | 06 February 2006, 07:55:09 UTC | Merge branches 'lt/show' and 'lt/revlist' * lt/show: git-show * lt/revlist: rev-parse lstat() workaround cleanup. | 06 February 2006, 07:55:09 UTC |
| a8c4453 | Junio C Hamano | 06 February 2006, 07:54:14 UTC | Merge branches 'jc/daemon' and 'mw/http' * jc/daemon: daemon: extend user-relative path notation. daemon: Set SO_REUSEADDR on listening sockets. daemon: do not forbid user relative paths unconditionally under --base-path * mw/http: http-fetch: Tidy control flow in process_alternate_response http: Turn on verbose Curl messages if GIT_CURL_VERBOSE set in environment http-fetch: Fix message reporting rename of object file. http-fetch: Fix object list corruption in fill_active_slots(). | 06 February 2006, 07:54:14 UTC |
| 45392a6 | Junio C Hamano | 06 February 2006, 07:00:41 UTC | git-diff-tree --stdin: show all parents. git-diff-tree --stdin ignored second and subsequent parents when fed git-rev-list --parents output. Update diff_tree_commit() function to take a commit object, and pass a fabricated commit object after grafting the fake parents from diff_tree_stdin(). Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 February 2006, 07:00:41 UTC |
| e3c3a55 | Junio C Hamano | 06 February 2006, 06:25:00 UTC | combine-diff: remove misguided --show-empty hack. Now --always flag is available in diff-tree, there is no reason to have that hack in the diffcore side. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 February 2006, 06:25:00 UTC |
| 9ad0a93 | Linus Torvalds | 06 February 2006, 05:41:47 UTC | rev-parse lstat() workaround cleanup. Earlier we had a workaround to avoid misspelled revision name to be taken as a filename when "--no-revs --no-flags" are in effect. This cleans up the logic. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 February 2006, 05:49:42 UTC |
| 2718435 | Ryan Anderson | 06 February 2006, 01:13:52 UTC | git-send-email: Fully implement --quiet and document it. Also reorganizes the man page to list options alphabetically. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 February 2006, 02:23:53 UTC |
| 603968d | Junio C Hamano | 05 February 2006, 06:27:29 UTC | daemon: extend user-relative path notation. Earlier, we made --base-path to automatically forbid user-relative paths, which was probably a mistake. This introduces --user-path (or --user-path=path) option to control the use of user-relative paths independently. The latter form of the option can be used to restrict accesses to a part of each user's home directory, similar to "public_html" some webservers supports. If we're invoked with --user-path=FOO option, then a URL of the form git://~USER/PATH/... resolves to the path HOME/FOO/PATH/..., where HOME is USER's home directory. [jc: This is much reworked by me so bugs are mine, but the original patch was done by Mark Wooding.] Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 February 2006, 00:51:01 UTC |
| 1955fab | Mark Wooding | 03 February 2006, 20:27:04 UTC | daemon: Set SO_REUSEADDR on listening sockets. Without this, you can silently lose the ability to receive IPv4 connections if you stop and restart the daemon. [jc: tweaked code organization a bit and made this controllable from a command line option.] Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 February 2006, 00:51:01 UTC |
| 363f24c | Junio C Hamano | 04 February 2006, 07:50:55 UTC | daemon: do not forbid user relative paths unconditionally under --base-path Using base-path to relocate the server public space does not have anything to do with allowing or forbidding user relative paths. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 February 2006, 00:51:01 UTC |
| a3f583c | Mark Wooding | 01 February 2006, 11:44:39 UTC | http-fetch: Tidy control flow in process_alternate_response It's a bit convoluted. Tidy it up. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 February 2006, 00:49:17 UTC |
| 7982d74 | Mark Wooding | 01 February 2006, 11:44:37 UTC | http: Turn on verbose Curl messages if GIT_CURL_VERBOSE set in environment Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 February 2006, 00:49:16 UTC |
| 7b934ec | Mark Wooding | 01 February 2006, 11:44:35 UTC | http-fetch: Fix message reporting rename of object file. move_temp_to_file returns 0 or -1. This is not a good thing to pass to strerror(3). Fortunately, someone already reported the error, so don't worry too much. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 February 2006, 00:49:16 UTC |
| 09db444 | Mark Wooding | 01 February 2006, 11:44:28 UTC | http-fetch: Fix object list corruption in fill_active_slots(). In fill_active_slots() -- if we find an object which has already arrived, say as part of a pack, /don't/ remove it from the list. It's already been prefetched and someone will ask for it later. Just label it as done and carry blithely on. (As it was, the code would dereference a freed object to continue through the list anyway.) Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 February 2006, 00:49:16 UTC |
| 80d48ac | Junio C Hamano | 06 February 2006, 00:42:49 UTC | git-show This is essentially 'git whatchanged -n1 --always --cc "$@"'. Just like whatchanged takes default flags from whatchanged.difftree configuration, this uses show.difftree configuration. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 February 2006, 00:42:49 UTC |
| df9892f | Junio C Hamano | 06 February 2006, 00:37:18 UTC | git-diff: use --cc instead of -p. The --cc output is much nicer when dealing with merges, so use it by default. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 February 2006, 00:37:18 UTC |
