| bbff2dc | Junio C Hamano | 27 December 2007, 02:16:52 UTC | GIT 1.5.4-rc2 Although everybody was quiet during the Christmas holiday, it's been a week since -rc1, so here is -rc2. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2007, 02:16:52 UTC |
| 49e6be5 | Junio C Hamano | 27 December 2007, 01:52:40 UTC | Merge branch 'rs/pretty-safety' * rs/pretty-safety: Make "--pretty=format" parser a bit more careful. | 27 December 2007, 01:52:40 UTC |
| 7ed0988 | René Scharfe | 20 December 2007, 12:20:15 UTC | Make "--pretty=format" parser a bit more careful. When a commit message that does not have a terminating LF is read in and the memory that was allocated to read it happens to have a LF immediately after that, the code was not careful and went past the terminating NUL. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2007, 01:52:32 UTC |
| e25cfae | Junio C Hamano | 27 December 2007, 01:38:00 UTC | contrib: resurrect scripted git-revert. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2007, 01:38:00 UTC |
| 97d0c52 | Junio C Hamano | 27 December 2007, 01:35:38 UTC | Merge branch 'ar/commit-cleanup' * ar/commit-cleanup: Allow selection of different cleanup modes for commit messages builtin-commit: avoid double-negation in the code. builtin-commit: fix amending of the initial commit t7005: do not exit inside test. | 27 December 2007, 01:35:38 UTC |
| d562509 | Junio C Hamano | 27 December 2007, 01:13:36 UTC | Fix rewrite_diff() name quoting. This moves the logic to quote two paths (prefix + path) in C-style introduced in the previous commit from the dump_quoted_path() in combine-diff.c to quote.c, and uses it to fix rewrite_diff() that never C-quoted the pathnames correctly. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2007, 01:13:36 UTC |
| 462a15b | Junio C Hamano | 27 December 2007, 00:51:19 UTC | combine-diff: Fix path quoting Earlier when showing combined diff, the filenames on the ---/+++ header lines were quoted incorrectly. a/ (or b/) prefix was output literally and then the path was output, with c-quoting. This fixes the quoting logic, and while at it, adjusts the code to use the customizable prefix (a_prefix and b_prefix) introduced recently. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2007, 00:51:19 UTC |
| 25db465 | Junio C Hamano | 27 December 2007, 00:04:05 UTC | Fix documentation of --first-parent in git-log and copy it to git-rev-list Credit goes to Avi Kivity for noticing the lack of description in rev-list manual page. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2007, 00:05:54 UTC |
| 0faf2da | Arjen Laarhoven | 25 December 2007, 11:06:47 UTC | Fix "git log --diff-filter" bug In commit b7bb760d5ed4881422673d32f869d140221d3564 (Fix revision log diff setup, avoid unnecessary diff generation) an optimization was made to avoid unnecessary diff generation. This was partly fixed in 99516e35d096f41e7133cacde8fbed8ee9a3ecd0 (Fix embarrassing "git log --follow" bug). The '--diff-filter' option also needs the diff machinery in action. Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 December 2007, 19:57:36 UTC |
| c8deb5a | Shawn O. Pearce | 25 December 2007, 07:18:05 UTC | Improve error messages when int/long cannot be parsed from config If a config file has become mildly corrupted due to a missing LF we may discover some other option joined up against the end of a numeric value. For example: [section] number = 1auto where the "auto" flag was meant to occur on the next line, below "number", but the missing LF has caused it to no longer be its own option. Instead the word "auto" is parsed as a 'unit factor' for the value of "number". Before this change we got the confusing error message: fatal: unknown unit: 'auto' which told us nothing about where the problem appeared. Now we get: fatal: bad config value for 'aninvalid.unit' which at least points the user in the right direction of where to search for the incorrectly formatted configuration file. Noticed by erikh on #git, which received the original error from a simple `git checkout -b` due to a midly corrupted config. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 December 2007, 19:37:45 UTC |
| 3a969ef | Jeff King | 24 December 2007, 03:08:19 UTC | cvsimport: die on cvsps errors We were not previously checking the exit status of cvsps at all. If it exited before producing any useful output, we ended up with an empty import, which caused a spew of confusing error messages from other parts of git: $ git-cvsimport foo Initialized empty Git repository in ... some error from cvsps fatal: refs/heads/origin: not a valid SHA1 fatal: master: not a valid SHA1 warning: You appear to be on a branch yet to be born. warning: Forcing checkout of HEAD. fatal: just how do you expect me to merge 0 trees? checkout failed: 256 Now we get: $ git-cvsimport foo Initialized empty Git repository in ... some error from cvsps git-cvsimport: fatal: cvsps reported error Signed-off-by: Jeff King <peff@peff.net> Acked-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 December 2007, 06:33:07 UTC |
| ba4c32b | Gustaf Hendeby | 23 December 2007, 18:37:01 UTC | shortlog manpage documentation: work around asciidoc markup issues We wanted to have a list in which one (and the sole, as it happen to be) item in it is ".mailmap", but do not seem to be able to convince AsciiDoc to format it correctly for manpages. Reformat it into a paragraph that describes the said file to work around the issue. Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 December 2007, 18:40:25 UTC |
| 0e545f7 | Junio C Hamano | 23 December 2007, 07:14:59 UTC | Documentation: describe 'union' low-level merge driver Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 December 2007, 07:14:59 UTC |
| 5f06573 | Alex Riesen | 22 December 2007, 18:46:24 UTC | Allow selection of different cleanup modes for commit messages Although we traditionally stripped away excess blank lines, trailing whitespaces and lines that begin with "#" from the commit log message, sometimes the message just has to be the way user wants it. For instance, a commit message template can contain lines that begin with "#", the message must be kept as close to its original source as possible if you are converting from a foreign SCM, or maybe the message has a shell script including its comments for future reference. The cleanup modes are default, verbatim, whitespace and strip. The default mode depends on if the message is being edited and will either strip whitespace and comments (if editor active) or just strip the whitespace (for where the message is given explicitely). Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 December 2007, 03:55:07 UTC |
| 4803466 | Junio C Hamano | 23 December 2007, 03:25:37 UTC | builtin-commit: avoid double-negation in the code. The flag no_edit meant "we have got final message from the user and will not editing it any further", but there were quite a few places that needed to check !no_edit. Rename the variable to use_editor and reverse the logic everywhere. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 December 2007, 03:45:06 UTC |
| d616a23 | Junio C Hamano | 23 December 2007, 03:22:29 UTC | builtin-commit: fix amending of the initial commit When amending initial commit without editor, the command incorrectly barfed because the check to see if there is anything to commit referenced the non-existent HEAD^1. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 December 2007, 03:45:06 UTC |
| 7263881 | Junio C Hamano | 23 December 2007, 03:14:33 UTC | t7005: do not exit inside test. The way to signal failure is to leave non-zero in $?, not abort the entire test. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 December 2007, 03:45:06 UTC |
| cc21682 | Jim Meyering | 21 December 2007, 10:56:32 UTC | Don't dereference NULL upon lookup failure. Instead, signal the error just like the case we do upon encountering an object with an unknown type. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2007, 19:15:38 UTC |
| 97bc00a | Wincent Colaiuta | 22 December 2007, 17:31:25 UTC | Emit helpful status for accidental "git stash" save If the user types "git stash" mistakenly thinking that this will list their stashes he/she may be surprised to see that it actually saved a new stash and reset their working tree and index. In the worst case they might not know how to recover the state. So help them by telling them exactly what was saved and also how to restore it immediately. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2007, 19:15:22 UTC |
| 2f7ee08 | Pierre Habouzit | 13 December 2007, 10:20:01 UTC | parse-options: Add a gitcli(5) man page. This page should hold every information about the git ways to parse command lines, and best practices to be used for scripting. Signed-off-by: Pierre Habouzit <madcoder@debian.org> | 22 December 2007, 18:26:08 UTC |
| c43a248 | Pierre Habouzit | 21 December 2007, 10:41:41 UTC | Force the sticked form for options with optional arguments. This forbids "git tag -n <number> -l" we allowed earlier, so adjust t7004 while at it. Signed-off-by: Pierre Habouzit <madcoder@debian.org> | 22 December 2007, 18:26:08 UTC |
| 5e2de4f | Junio C Hamano | 22 December 2007, 17:45:10 UTC | Fix $EDITOR regression introduced by rewrite in C. When git-tag and git-commit launches the editor, they used to honor EDITOR="editor -options args..." but recent rewrite in C insisted on $EDITOR to be the path to the editor executable. This restores the older behaviour. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2007, 18:26:08 UTC |
| 77190eb | Stefan Sperling | 21 December 2007, 15:57:26 UTC | Small comment fix for git-cvsimport. Signed-off-by: Stefan Sperling <stsp@stsp.name> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2007, 08:23:17 UTC |
| 0e0278b | Gustaf Hendeby | 22 December 2007, 00:40:52 UTC | Make git send-email accept $EDITOR with arguments Currently git send-email does not accept $EDITOR with arguments, eg, emacs -nw, when starting an editor to produce a cover letter. This patch changes this by letting the shell handle the option parsing. Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2007, 08:21:30 UTC |
| 78d776a | Pierre Habouzit | 21 December 2007, 10:50:58 UTC | git-tag: fix -l switch handling regression. The command itself takes an optional <pattern> argument that limits the shown tags to the ones that match when in listing mode that is triggered with '-l' option. The <pattern> is not an optional option-argument to '-l'. With this fix, "git tag -l -n 4 v0.99" works as expected. It also removes a few bogus tests in t7004. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2007, 08:05:02 UTC |
| 56c3eb1 | Junio C Hamano | 21 December 2007, 21:50:58 UTC | Documentation: ls-files -v is about "assume unchanged". And refer the reader to update-index documentation. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2007, 21:50:58 UTC |
| d2f8295 | Linus Torvalds | 21 December 2007, 04:22:46 UTC | Re(-re)*fix trim_common_tail() The tar-ball and the git archive itself is fine, but yes, the diff from 2.6.23 to 2.6.24-rc6 is bad. It's the "trim_common_tail()" optimization that has caused way too much pain. Very interesting breakage. The patch was actually "correct" in a (rather limited) technical sense, but the context at the end was missing because while the trim_common_tail() code made sure to keep enough common context to allow a valid diff to be generated, the diff machinery itself could decide that it could generate the diff differently than the "obvious" solution. Thee sad fact is that the git optimization (which is very important for "git blame", which needs no context), is only really valid for that one case where we really don't need any context. [jc: since this is shared with "git diff -U0" codepath, context recovery to the end of line needs to be done even for zero context case.] Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2007, 04:54:23 UTC |
| d76a585 | Jakub Narebski | 20 December 2007, 09:48:09 UTC | gitweb: fix whitespace in config_to_multi (indent with tab) Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2007, 03:07:24 UTC |
| 8a82b13 | Miklos Vajna | 20 December 2007, 14:05:45 UTC | everyday: replace 'prune' and 'repack' with 'gc' In everyday tasks, "repack -a -d -f" won't be used, so there is not much point mentioning "repack". By showing the --prune option to "gc", we can do without mentioning "git prune", too. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2007, 01:11:20 UTC |
| feb7f38 | Charles Bailey | 20 December 2007, 13:00:40 UTC | Remove old generated files from .gitignore. Some entries in .gitignore are obselete. These should be cleaned up just for the sake of general tidiness and so that any developers who have a working tree that was moved forward without a clean know that they have old stuff in their work tree. Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2007, 01:05:31 UTC |
| 6a7f14c | Jeff King | 20 December 2007, 12:11:25 UTC | clean up 1.5.4 release notes Mostly typo and small grammatical fixes with one or two rewordings for clarity. But note the important fix for status.relativepaths. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2007, 01:04:58 UTC |
| cdd8591 | Johannes Schindelin | 20 December 2007, 11:50:34 UTC | Mention git-shell's "cvs" substitution in the RelNotes git shell became much more powerful for existing CVS setups. We should not hide from those people who only read release notes. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2007, 01:00:27 UTC |
| 5d29275 | Junio C Hamano | 20 December 2007, 20:58:06 UTC | shell-scripts usage(): consistently exit with non-zero Earlier conversion of shell scripts to parse-options made usage() to run "git cmd -h" which in turn emit LONG_USAGE and exit with 0 status. This is inconsistent with the scripts that do not use parse-options, whose usage() died with the message, exiting with 1. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2007, 20:58:06 UTC |
| 0327062 | Shawn O. Pearce | 20 December 2007, 07:12:12 UTC | Reallow git-rebase --interactive --continue if commit is unnecessary During git-rebase --interactive's --continue implementation we used to silently restart the rebase if the user had made the commit for us. This is common if the user stops to edit a commit and does so by amending it. My recent change to watch git-commit's exit status broke this behavior. Thanks to Bernt Hansen for catching it in 1.5.4-rc1. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2007, 09:12:41 UTC |
| fbcf118 | Junio C Hamano | 20 December 2007, 03:23:03 UTC | fix git commit --amend -m "new message" The prepare_log_message() function serves two purposes: - Prepares the commit log message template, to be given to the end user; - Return true if there is something committable; 7168624c3530d8c7ee32f930f8fb2ba302b9801f (Do not generate full commit log message if it is not going to be used) cheated to omit the former when we know the log message template is not going to be used. However, its replacement logic to see if there is something committable was botched. When amending, it should compare the index with the parent of the HEAD, not the current HEAD. Otherwise you cannot run --amend to fix only the message without changing the tree. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2007, 09:11:53 UTC |
| 885ed37 | Junio C Hamano | 20 December 2007, 00:21:30 UTC | t4024: fix test script to use simpler sed pattern The earlier test stripped away expected number of 'z' but the output would have been very hard to read once somebody broke the common tail optimization. Instead, count the number of 'z' and show it, to help diagnosing the problem better in the future. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2007, 09:11:37 UTC |
| eab9a40 | Johannes Schindelin | 18 December 2007, 19:32:14 UTC | Teach diff machinery to display other prefixes than "a/" and "b/" With the new options "--src-prefix=<prefix>", "--dst-prefix=<prefix>" and "--no-prefix", you can now control the path prefixes of the diff machinery. These used to by hardwired to "a/" for the source prefix and "b/" for the destination prefix. Initial patch by Pascal Obry. Sane option names suggested by Linus. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2007, 09:10:39 UTC |
| 74f6b03 | Junio C Hamano | 20 December 2007, 01:21:04 UTC | GIT 1.5.4-rc1 It's been a week since -rc0, and we have quite a lot of fixes, so here it is. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2007, 01:24:04 UTC |
| dbedf97 | Shawn O. Pearce | 19 December 2007, 06:45:00 UTC | Catch and handle git-commit failures in git-rebase --interactive If git-commit fails for any reason then git-rebase needs to stop and not plow through the rest of the series. Its unlikely that a future git-commit will succeed if the current attempt failed. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2007, 01:17:27 UTC |
| c5b09fe | Shawn O. Pearce | 19 December 2007, 06:41:26 UTC | Avoid update hook during git-rebase --interactive If we are rebasing changes that contain potential whitespace errors that our .git/hooks/pre-commit hook looks for and fails on then git-commit will fail to commit that change. This causes git-rebase--interactive to squash commits together, even though it was not requested to do so by the todo file. Passing --no-verify to git-commit makes git-rebase -i behave more like git-rebase normally would in such conditions, providing more consistent behavior between the different rebase implementations. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2007, 01:15:38 UTC |
| 20b178d | Finn Arne Gangstad | 18 December 2007, 19:50:28 UTC | Improved submodule merge support When merging conflicting submodule changes from a supermodule, generate a conflict message saying what went wrong. Also leave the tree in a state where git status shows the conflict, and git submodule status gives the user enough information to do the merge manally. Previously this would just fail. Signed-off-by: Finn Arne Gangstad <finnag@pvv.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2007, 00:58:42 UTC |
| 5909651 | Sean | 19 December 2007, 21:34:27 UTC | Fix interactive rebase to preserve author email address Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2007, 22:59:19 UTC |
| 3f7701a | Nicolas Pitre | 19 December 2007, 17:53:16 UTC | make 'git describe --all --contains' work Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2007, 22:59:19 UTC |
| c569969 | Charles Bailey | 19 December 2007, 12:25:27 UTC | Fix git-instaweb breakage on MacOS X due to the limited sed functionality git-instaweb relied on a pipe in a sed script, but this is not supported by MacOS X sed when using BREs. git-instaweb relies on a working perl in any case, and perl re are more consistent between platforms, so replace sed invocation with an equivalent perl invocation. Also, fix the documented -b "" to work without giving a spurious 'command not found' error. Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2007, 22:59:19 UTC |
| ecaa0cf | Jeff King | 19 December 2007, 15:43:50 UTC | test "git clone -o" This tests a recently fixed regression in which "git clone -o" didn't work at all. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2007, 22:59:18 UTC |
| 9d81e03 | Marco Roeland | 19 December 2007, 09:15:15 UTC | clone: fix options '-o' and '--origin' to be recognised again Due to a subtle typo in a shell case pattern neither alternative worked. Signed-off-by: Marco Roeland <marco.roeland@xs4all.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2007, 22:59:18 UTC |
| 56122ed | Johannes Schindelin | 18 December 2007, 18:01:33 UTC | git show <tag>: show the tagger For commit objects, the Author is shown, so do the equivalent for tag objects, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2007, 22:59:11 UTC |
| 540424b | Eric Wong | 19 December 2007, 08:31:43 UTC | git-svn: avoid warning when run without arguments While we're in the area, finish writing a halfway-written comment describing what that block does... Signed-off-by: Eric Wong <normalperson@yhbt.net> | 19 December 2007, 08:33:15 UTC |
| 7fc35e0 | Eric Wong | 19 December 2007, 08:06:45 UTC | git-svn: workaround a for broken symlinks in SVN It's possible for bad clients to commit symlinks without the 5-character "link " prefix in symlinks. So guard around this bug in SVN and make a best effort to create symlinks if the "link " prefix is missing. More information on this SVN bug is described here: http://subversion.tigris.org/issues/show_bug.cgi?id=2692 To be pedantic, there is still a corner case that neither we nor SVN can handle: If somebody made a link using a broken SVN client where "link " is the first part of its path, e.g. "link sausage", then we'd end up having a symlink which points to "sausage" because we incorrectly stripped the "link ". Hopefully this hasn't happened in practice, but if it has, it's not our fault SVN is broken :) Thanks to Benoit Sigoure and Sverre Johansen for reporting and feedback. Signed-off-by: Eric Wong <normalperson@yhbt.net> | 19 December 2007, 08:17:07 UTC |
| ad94802 | Eric Wong | 16 December 2007, 03:08:22 UTC | git-svn: avoid leaving leftover committer/author info in rebase We set the 6 environment variables for controlling committer/author email/name/time for every commit. We do this in the parent process to be passed to git-commit-tree, because open3() doesn't afford us the control of doing it only in the child process. This means we leave them hanging around in the main process until the next revision comes around and all 6 environment variables are overwridden again. Unfortunately, for the last commit, leaving them hanging around means the git-rebase invocation will pick it up, rewriting the rebased commit with incorrect author information. This should fix it. Signed-off-by: Eric Wong <normalperson@yhbt.net> | 19 December 2007, 08:04:21 UTC |
| ce85b05 | Nicolas Pitre | 18 December 2007, 15:15:39 UTC | fix style of a few comments in diff-delta.c Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2007, 23:22:28 UTC |
| e8a3f90 | Jim Meyering | 18 December 2007, 10:03:23 UTC | git-filter-branch.sh: more portable tr usage: use \012, not \n. I hesitate to suggest this, since GNU tr has accepted \n for 15 years, but there are supposedly a few crufty vendor-supplied versions of tr still in use. Also, all of the other uses of tr-with-newline in git use \012. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2007, 20:00:26 UTC |
| 91c3ace | Johannes Sixt | 18 December 2007, 07:30:47 UTC | filter-branch: Remove broken and unnecessary summary of rewritten refs. There was an attempt to list the refs that were rewritten by filtering the output of 'git show-ref' for 'refs/original'. But it got the grep argument wrong, which did not account for the SHA1 that is listed before the ref. Moreover, right before this summary is the loop that actually does the rewriting, and the rewritten refs are listed there anyway. So this extra summary is plainly too verbose. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2007, 20:00:26 UTC |
| 02ff625 | Ralf Wildenhues | 18 December 2007, 06:07:36 UTC | Fix some documentation typos. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2007, 20:00:18 UTC |
| 4808ab8 | Junio C Hamano | 18 December 2007, 09:46:04 UTC | builtin-blame.c: remove unneeded memclr() Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2007, 09:46:04 UTC |
| f2fdd10 | Linus Torvalds | 18 December 2007, 06:12:03 UTC | unpack-trees: FLEX_ARRAY fix In unpack-trees.c (line 593), we do .. if (same(old, merge)) { *merge = *old; } else { .. and that "merge" is a cache_entry pointer. If we have a non-zero FLEX_ARRAY size, it will cause us to copy the first few bytes of the name too. That is technically wrong even for FLEX_ARRAY being 1, but you'll never notice, since the filenames should always be the same with the current code. But if we do the same thing for a rename, we'd be screwed. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2007, 09:10:24 UTC |
| f9c5a80 | Pierre Habouzit | 18 December 2007, 01:39:57 UTC | Fix segfault in diff-delta.c when FLEX_ARRAY is 1 aka don't do pointer arithmetics on structs that have a FLEX_ARRAY member, or you'll end up believing your array is 1 cell off its real address. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2007, 05:59:26 UTC |
| bd8ff61 | Junio C Hamano | 18 December 2007, 04:49:42 UTC | Merge branch 'maint' * maint: git-send-email: avoid duplicate message-ids clone: correctly report http_fetch errors | 18 December 2007, 04:49:42 UTC |
| 34454e8 | Johannes Schindelin | 17 December 2007, 21:01:25 UTC | rebase -p -i: handle "no changes" gracefully Since commit 376ccb8cbb453343998e734d8a1ce79f57a4e092 (rebase -i: style fixes and minor cleanups), unchanged SHA-1s are no longer mapped via $REWRITTEN. But the updating phase was not prepared for the old head not being rewritten. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2007, 04:49:18 UTC |
| 77680ca | Johannes Schindelin | 17 December 2007, 12:21:22 UTC | Document diff.external and mergetool.<tool>.path There was no documentation for the config variables diff.external and mergetool.<tool>.path. Noticed by Sebastian Schuberth. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2007, 04:49:18 UTC |
| cbe0210 | Johannes Schindelin | 17 December 2007, 13:42:20 UTC | Support config variable diff.external We had the diff.external variable in the documentation of the config file since its conception, but failed to respect it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2007, 04:49:18 UTC |
| f029427 | Johannes Sixt | 17 December 2007, 09:08:23 UTC | Clean up documentation that references deprecated 'git peek-remote'. Now that 'git peek-remote' is deprecated and only an alias for 'git ls-remote', it should not be referenced from other manual pages. This also removes the description of the --exec option, which is no longer present. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2007, 04:49:18 UTC |
| 5f48741 | Sam Vilain | 17 December 2007, 12:00:43 UTC | Clarify error response from 'git fetch' for bad responses This error message prints the reponse from the server at this point. Label it as such in the output. Signed-off-by: Sam Vilain <sam@vilain.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2007, 04:49:18 UTC |
| 3175b0c | H.Merijn Brand | 17 December 2007, 22:28:46 UTC | the use of 'tr' in the test suite isn't really portable Some versions of 'tr' only accept octal codes if entered with three digits, and therefor misinterpret the '\0' in the test suite. Some versions of 'tr' reject the (needless) use of character classes. Signed-off-by: H.Merijn Brand <h.m.brand@xs4all.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2007, 04:49:18 UTC |
| 68e6a4f | Johannes Sixt | 17 December 2007, 19:12:52 UTC | Plug a resource leak in threaded pack-objects code. A mutex and a condition variable is allocated for each thread and torn down when the thread terminates. However, for certain workloads it can happen that some threads are actually not started at all. In this case we would leak the mutex and condition variable. Now we allocate them only for those threads that are actually started. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2007, 00:08:40 UTC |
| 4f3d370 | Jeff King | 17 December 2007, 20:51:34 UTC | git-send-email: avoid duplicate message-ids We used to unconditionally add a message-id to the outgoing email without bothering to check if it already had one. Instead, let's use the existing one. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2007, 23:58:05 UTC |
| 6851162 | Jeff King | 17 December 2007, 12:43:59 UTC | clone: correctly report http_fetch errors The exit status from curl was accidentally lost by the 'case' statement. We need to explicitly save it so that $? doesn't get overwritten. This improves the error message when fetching from an http repository which has never had update-server-info run. Previously, it would fail to note the fetch error and produce multiple errors about the lack of origin branches. It now correctly suggests running git-update-server-info. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2007, 23:54:28 UTC |
| 6fbe42c | Junio C Hamano | 17 December 2007, 06:03:21 UTC | Documentation/git-submodule: refer to gitmodules(5) Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2007, 06:03:21 UTC |
| 50f22ad | Johannes Sixt | 16 December 2007, 19:45:34 UTC | threaded pack-objects: Use condition variables for thread communication. In the threaded pack-objects code the main thread and the worker threads must mutually signal that they have assigned a new pack of work or have completed their work, respectively. Previously, the code used mutexes that were locked in one thread and unlocked from a different thread, which is bogus (and happens to work on Linux). Here we rectify the implementation by using condition variables: There is one condition variable on which the main thread waits until a thread requests new work; and each worker thread has its own condition variable on which it waits until it is assigned new work or signaled to terminate. As a cleanup, the worker threads are spawned only after the initial work packages have been assigned. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Acked-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2007, 03:26:12 UTC |
| 3eb2a15 | Junio C Hamano | 16 December 2007, 23:05:39 UTC | builtin-commit: make summary output consistent with status This enables -B -M to the summary output after a commit is made so that it is in line with what is shown in git-status and commit log template. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 23:05:39 UTC |
| 1596456 | Junio C Hamano | 16 December 2007, 23:03:58 UTC | builtin-commit: fix summary output. Because print_summary() forgot to call diff_setup_done() after futzing with diff output options, it failed to activate recursive diff, which resulted in an incorrect summary. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 23:03:58 UTC |
| b90ced0 | J. Bruce Fields | 16 December 2007, 17:58:02 UTC | builtin-apply: stronger indent-with-on-tab fixing Fix any sequence of 8 spaces in initial indent, not just the case where the 8 spaces are the first thing on the line. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 22:03:40 UTC |
| 95f9b92 | J. Bruce Fields | 16 December 2007, 17:58:01 UTC | builtin-apply: minor cleanup of whitespace detection Use 0 instead of -1 for the case where not tabs or spaces are found; it will make some later math slightly simpler. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 22:03:36 UTC |
| 079fe1d | Junio C Hamano | 16 December 2007, 21:49:17 UTC | Re-re-re-fix common tail optimization We need to be extra careful recovering the removed common section, so that we do not break context nor the changed incomplete line (i.e. the last line that does not end with LF). Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 22:00:30 UTC |
| 127f72e | J. Bruce Fields | 16 December 2007, 16:31:42 UTC | whitespace: fix config.txt description of indent-with-non-tab Fix garbled description. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 21:08:03 UTC |
| ffe5688 | J. Bruce Fields | 16 December 2007, 16:31:41 UTC | whitespace: more accurate initial-indent highlighting Instead of highlighting the entire initial indent, highlight only the problematic spaces. In the case of an indent like ' \t \t' there may be multiple problematic ranges, so it's easiest to emit the highlighting as we go instead of trying rember disjoint ranges and do it all at the end. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 21:07:58 UTC |
| 9afa2d4 | J. Bruce Fields | 16 December 2007, 16:31:40 UTC | whitespace: fix initial-indent checking After this patch, "written" counts the number of bytes up to and including the most recently seen tab. This allows us to detect (and count) spaces by comparing to "i". This allows catching initial indents like '\t ' (a tab followed by 8 spaces), while previously indent-with-non-tab caught only indents that consisted entirely of spaces. This also allows fixing an indent-with-non-tab regression, so we can again detect indents like '\t \t'. Also update tests to catch these cases. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 21:07:49 UTC |
| 954ecd4 | J. Bruce Fields | 16 December 2007, 16:31:39 UTC | whitespace: minor cleanup The variable leading_space is initially used to represent the index of the last space seen before a non-space. Then later it represents the index of the first non-indent character. It will prove simpler to replace it by a variable representing a number of bytes. Eventually it will represent the number of bytes written so far (in the stream != NULL case). Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 21:07:41 UTC |
| 1020999 | J. Bruce Fields | 16 December 2007, 16:31:38 UTC | whitespace: reorganize initial-indent check Reorganize to emphasize the most complicated part of the code (the tab case). Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 21:07:20 UTC |
| 4d9697c | J. Bruce Fields | 16 December 2007, 16:31:37 UTC | whitespace: fix off-by-one error in non-space-in-indent checking If there were no tabs, and the last space was at position 7, then positions 0..7 had spaces, so there were 8 spaces. Update test to check exactly this case. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 21:07:14 UTC |
| d7e522c | Jeff King | 16 December 2007, 07:21:04 UTC | rename git-browse--help to git-help--browse The convention for helper scripts has been git-$TOOL--$HELPER. Since this is a "browse" helper for the "help" tool, git-help--browse is a more sensible name. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 20:52:40 UTC |
| 6ba7823 | 李鸿 | 16 December 2007, 04:53:26 UTC | Fix a memory leak Signed-off-by: Li Hong <leehong@pku.edu.cn> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 20:50:08 UTC |
| bc8b95a | Petr Baudis | 08 December 2007, 11:30:59 UTC | gitweb: Make config_to_multi return [] instead of [undef] This is important for the list of clone urls, where if there are no per-repository clone URL configured, the default base URLs are never used for URL construction without this patch. Add tests for different ways of setting project URLs, just in case. Note that those tests in current form wouldn't detect breakage fixed by this patch, as it only checks for errors and not for expected output. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 19:56:27 UTC |
| dfa7c7d | Jakub Narebski | 15 December 2007, 14:41:49 UTC | gitweb: Teach "a=blob" action to be more lenient about blob/file mime type Since 930cf7dd7cc6b87d173f182230763e1f1913d319 'blob' action knows the file type; if the file type is not "text/*" or one of common network image formats/mimetypes (gif, png, jpeg) then the action "blob" defaulted to "blob_plain". This caused the problem if mimetypes file was not well suited for web, for example returning "application/x-sh" for "*.sh" shell scripts, instead of "text/plain" (or other "text/*"). Now "blob" action defaults to "blob_plain" ('raw' view) only if file is of type which is neither "text/*" nor "image/{gif,png,jpeg}" AND it is binary file. Otherwise it assumes that it can be displayed either in <img> tag ("image/*" mimetype), or can be displayed line by line (otherwise). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 19:56:26 UTC |
| bf901f8 | Jakub Narebski | 15 December 2007, 14:40:28 UTC | gitweb: disambiguate heads and tags withs the same name Avoid wrong disambiguation that would link logs/trees of tags and heads which share the same name to the same page, leading to a disambiguation that would prefer the tag, thus making it impossible to access the corresponding head log and tree without hacking the url by hand. It does it by using full refname (with 'refs/heads/' or 'refs/tags/' prefix) instead of shortened one in the URLs in 'heads' and 'tags' tables. This makes URLs (and refs) provided by gitweb unambiguous. Signed-off-by: Guillaume Seguin <guillaume@segu.in> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 19:56:26 UTC |
| 718a087 | Jeff King | 15 December 2007, 11:11:54 UTC | teach bash completion to treat commands with "--" as a helper There is a convention that commands containing a double-dash are implementation details and not to be used by mortals. We should automatically remove them from the completion suggestions as such. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 19:55:48 UTC |
| 5249997 | Jeff King | 16 December 2007, 07:06:14 UTC | trim_common_tail: brown paper bag fix. The recovered context lines were not LF terminated due to off-by-one error, which also caused the outer loop to count the number of recovered lines to terminate after running only once. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 19:53:03 UTC |
| 7680087 | Junio C Hamano | 15 December 2007, 06:30:38 UTC | Update draft release notes for 1.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 06:30:38 UTC |
| 530e741 | Junio C Hamano | 25 November 2007, 07:48:04 UTC | Start preparing the API documents. Most of them are still stubs, but the procedure to build the HTML documentation, maintaining the index and installing the end product are there. I placed names of people who are likely to know the most about the topic in the stub files, so that volunteers will know whom to ask questions as needed. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 06:29:38 UTC |
| fa47016 | Junio C Hamano | 15 December 2007, 06:08:25 UTC | Retire git-runstatus for real. The command was removed from the builtin command list and there was no way to invoke it, but the code was still there. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 06:08:25 UTC |
| 5b4617c | Junio C Hamano | 15 December 2007, 06:02:57 UTC | Rename git-browse-help helper to git-browse--help Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 06:04:43 UTC |
| 70087cd | Christian Couder | 15 December 2007, 04:57:28 UTC | git-help: add "help.format" config variable. This config variable makes it possible to choose the default format used to display help. This format will be used only if no option like -a|--all|-i|--info|-m|--man|-w|--web is passed to "git-help". The following values are possible for this variable: - "man" --> "man" program is used - "info" --> "info" program is used - "web" --> "git-browse-help" is used By default we still show help using "man". This patch also adds -m|--man command line option to use "man" to allow overriding the "help.format" configuration variable. Note that this patch also revert some recent changes in "git-browse-help" because they prevented to look for config variables in the global configuration file. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 05:58:35 UTC |
| dfaf75b | Junio C Hamano | 15 December 2007, 05:42:53 UTC | Merge branch 'wc/diff' * wc/diff: Test interaction between diff --check and --exit-code Use shorter error messages for whitespace problems Add tests for "git diff --check" with core.whitespace options Make "diff --check" output match "git apply" Unify whitespace checking diff --check: minor fixups "diff --check" should affect exit status | 15 December 2007, 05:42:53 UTC |
| d7e9280 | Mike Hommey | 10 December 2007, 23:08:25 UTC | Move fetch_ref from http-push.c and http-walker.c to http.c Make the necessary changes to be ok with their difference, and rename the function http_fetch_ref. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 05:31:59 UTC |
| 3a462bc | Mike Hommey | 10 December 2007, 21:36:11 UTC | Fix various memory leaks in http-push.c and http-walker.c Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 05:31:59 UTC |
| 028c297 | Mike Hommey | 09 December 2007, 19:30:59 UTC | Use strbuf in http code Also, replace whitespaces with tabs in some places Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 05:31:59 UTC |
| e8dc37e | Mike Hommey | 10 December 2007, 21:36:09 UTC | Avoid redundant declaration of missing_target() Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 05:31:59 UTC |
| 02dc534 | Mike Hommey | 10 December 2007, 21:36:08 UTC | Remove a CURLOPT_HTTPHEADER (un)setting Setting CURLOPT_HTTPHEADER doesn't add HTTP headers, but replaces whatever set of headers was configured before, so setting to NULL doesn't have any magic meaning, and is pretty much useless when setting to another list right after. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 05:31:59 UTC |
| c20f290 | Mike Hommey | 10 December 2007, 21:36:07 UTC | Remove the default_headers variable from http-push.c It appears that despite being initialized, it was never used. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 05:31:59 UTC |
| a096bb1 | Mike Hommey | 14 December 2007, 21:18:01 UTC | Fix random sha1 in error message in http-fetch and http-push When a downloaded ref doesn't contain a sha1, the error message displays a random sha1 because of uninitialized memory. This happens when cloning a repository that is already a clone of another one, in which case refs/remotes/origin/HEAD is a symref. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 05:31:59 UTC |
