| 1dc71a9 | J. Bruce Fields | 11 March 2007, 03:38:13 UTC | user-manual: fix rendering of history diagrams Asciidoc appears to interpret a backslash at the end of a line as escaping the end-of-line character, which screws up the display of history diagrams like o--o--o \ o--... The obvious fix (replacing "\" by "\\") doesn't work. The only workaround I've found is to include all such diagrams in a LiteralBlock. Asciidoc claims that should be equivalent to a literal paragraph, so I don't understand why the difference--perhaps it's an asciidoc bug. Cc: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 11 March 2007, 04:05:01 UTC |
| ed4eb0d | J. Bruce Fields | 11 March 2007, 03:00:12 UTC | user-manual: fix missing colon in git-show example There should be a colon in this git-show example. Cc: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 11 March 2007, 04:05:01 UTC |
| fabbd8f | J. Bruce Fields | 11 March 2007, 02:52:39 UTC | user-manual: fix inconsistent use of pull and merge I used "git pull ." instead of "git merge" here without any explanation. Stick instead to "git merge" for now (the equivalent pull syntax is still covered in a later chapter). Cc: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 11 March 2007, 04:05:01 UTC |
| 923642f | J. Bruce Fields | 11 March 2007, 02:45:29 UTC | user-manual: fix inconsistent example The configuration file fragment here is inconsistent with the text above. Thanks to Ramsay Jones for the correction. Cc: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 11 March 2007, 04:05:01 UTC |
| c816eb1 | J. Bruce Fields | 05 March 2007, 00:13:09 UTC | glossary: fix overoptimistic automatic linking of defined terms The script sort_glossary.pl turns each use of "term" into a link to the definition of "term". To avoid mangling links like gitlink:git-term[1] it doesn't replace any occurence of "term" preceded by "link:git-". This fails for gitlink:git-symbolic-ref[1] when substituting for "ref". So instead just refuse to replace anything preceded by a "-". That could result in missing some opportunities, but that's a less annoying error. Actually I find the automatic substitution a little distracting; some day maybe we should just run it once and commit the result, so it can be hand-tuned. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 11 March 2007, 04:05:01 UTC |
| ef203f0 | Shawn O. Pearce | 07 March 2007, 17:04:24 UTC | Catch write_ref_sha1 failure in receive-pack This failure to catch the failure of write_ref_sha1 was noticed by Bill Lear. The ref will not update if the log file could not be appended to (due to file permissions problems). Such a failure should be flagged as a failure to update the ref, so that the client knows the push did not succeed. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 March 2007, 18:01:44 UTC |
| 58db64f | Johannes Schindelin | 07 March 2007, 00:48:59 UTC | make t8001 work on Mac OS X again The test was recently broken to expect sed to leave the incomplete line at the end without newline. POSIX says that output of the pattern space is to be followed by a newline, while GNU adds the newline back only when it was stripped when input. GNU behaviour is arguably more intuitive and nicer, but we should not depend on it. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 March 2007, 01:09:53 UTC |
| eec1025 | Junio C Hamano | 06 March 2007, 08:39:52 UTC | Merge branch 'master' of git://repo.or.cz/git-gui into maint * 'master' of git://repo.or.cz/git-gui: git-gui: Make 'make' quieter by default git-gui: Remove unnecessary /dev/null redirection. git-gui: Don't create empty (same tree as parent) commits. git-gui: Add Reset to the Branch menu. git-gui: Relocate the menu/transport menu code. | 06 March 2007, 08:39:52 UTC |
| 0b5ea16 | Shawn O. Pearce | 06 March 2007, 07:13:23 UTC | git-gui: Make 'make' quieter by default To fit nicely into the output of the git.git project's own quieter Makefile, we want to make the git-gui Makefile nice and quiet too. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 06 March 2007, 07:13:23 UTC |
| c93d88a | Junio C Hamano | 05 March 2007, 20:35:41 UTC | git-commit: cd to top before showing the final stat Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 March 2007, 07:11:19 UTC |
| b810537 | Brian Gernhardt | 06 March 2007, 03:27:44 UTC | Fix diff-options references in git-diff and git-format-patch Most of the git-diff-* documentation used [<common diff options>] instead of [--diff-options], so make that change in git-diff and git-format-patch. In addition, git-format-patch didn't include the meanings of the diff options. Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 March 2007, 05:21:39 UTC |
| 043d760 | Theodore Ts'o | 05 March 2007, 19:46:05 UTC | Add definition of <commit-ish> to the main git man page. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 March 2007, 05:21:09 UTC |
| c2d4eb7 | Junio C Hamano | 06 March 2007, 01:07:17 UTC | Merge branch 'maint-for-junio' of git://repo.or.cz/git/fastimport into maint * 'maint-for-junio' of git://repo.or.cz/git/fastimport: fast-import: Fail if a non-existant commit is used for merge fast-import: Avoid infinite loop after reset | 06 March 2007, 01:07:17 UTC |
| 56333ba | Johannes Schindelin | 05 March 2007, 15:37:54 UTC | Begin SubmittingPatches with a check list It seems that some people prefer a short list to a long text. But even for the latter group, a quick reminder list is useful. So, add a check list to Documentation/SubmittingPatches of what to do to get your patch accepted. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 March 2007, 22:49:22 UTC |
| 2f6dc35 | Shawn O. Pearce | 05 March 2007, 17:43:14 UTC | fast-import: Fail if a non-existant commit is used for merge Johannes Sixt noticed during one of his own imports that fast-import did not fail if a non-existant commit is referenced by SHA-1 value as an argument to the 'merge' command. This allowed the user to unknowingly create commits that would fail in fsck, as the commit contents would not be completely reachable. A side effect of this bug was that a frontend process could mark any SHA-1 object (blob, tree, tag) as a parent of a merge commit. This should also fail in fsck, as the commit is not a valid commit. We now use the same rule as the 'from' command. If a commit is referenced in the 'merge' command by hex formatted SHA-1 then the SHA-1 must be a commit or a tag that can be peeled back to a commit, the commit must already exist, and must be readable by the core Git infrastructure code. This requirement means that the commit must have existed prior to fast-import starting, or the commit must have been flushed out by a prior 'checkpoint' command. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 March 2007, 17:43:14 UTC |
| 734c91f | Shawn O. Pearce | 05 March 2007, 17:31:09 UTC | fast-import: Avoid infinite loop after reset Johannes Sixt noticed that a 'reset' command applied to a branch that is already active in the branch LRU cache can cause fast-import to relink the same branch into the LRU cache twice. This will cause the LRU cache to contain a cycle, making unload_one_branch run in an infinite loop as it tries to select the oldest branch for eviction. I have trivially fixed the problem by adding an active bit to each branch object; this bit indicates if the branch is already in the LRU and allows us to avoid trying to add it a second time. Converting the pack_id field into a bitfield makes this change take up no additional memory. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 March 2007, 17:31:09 UTC |
| 7193db3 | Junio C Hamano | 05 March 2007, 01:20:38 UTC | GIT 1.5.0.3 Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 March 2007, 01:20:38 UTC |
| 2aa54fa | Yasushi SHOJI | 04 March 2007, 18:07:43 UTC | glossary: Add definitions for dangling and unreachable objects Define "dangling" and "unreachable" objects. Modified from original text proposed by Yasushi Shoji. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 March 2007, 00:47:33 UTC |
| ef561ac | J. Bruce Fields | 03 March 2007, 20:34:27 UTC | user-manual: more detailed merge discussion Add more details on conflict, including brief discussion of file stages. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 March 2007, 00:47:32 UTC |
| 365aa19 | J. Bruce Fields | 03 March 2007, 19:30:32 UTC | user-manual: how to replace commits older than most recent "Modifying" an old commit by checking it out, --amend'ing it, then rebasing on top of it, is a slightly cumbersome technique, but I've found it useful frequently enough to make it seem worth documenting. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 March 2007, 00:47:32 UTC |
| 3512193 | J. Bruce Fields | 03 March 2007, 19:04:42 UTC | user-manual: insert earlier of mention content-addressable architecture The content-addressable design is too important not to be worth at least a brief mention a little earlier on. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 March 2007, 00:47:32 UTC |
| 1c95c56 | J. Bruce Fields | 03 March 2007, 18:33:48 UTC | user-manual: ensure generated manual references stylesheet The generated user manual is rather hard to read thanks to the lack of the css that's supposed to be included from docbook-xsl.css. I'm totally ignorant of the toolchain; grubbing through xmlto and related scripts, the easiest way I could find to ensure that the generated html links to the stylesheet is by calling xsltproc directly. Maybe there's some better way. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 March 2007, 00:47:32 UTC |
| 1c73bb0 | J. Bruce Fields | 19 February 2007, 23:46:09 UTC | user-manual: reset to ORIG_HEAD not HEAD to undo merge As Linus pointed out recently on the mailing list, git reset --hard HEAD^ doesn't undo a merge in the case where the merge did a fast-forward. So the rcommendation here is a little dangerous. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 March 2007, 00:47:32 UTC |
| 0bc25a7 | J. Bruce Fields | 06 February 2007, 07:51:26 UTC | Documentation: mention module option to git-cvsimport The git-cvsimport argument that specifies a cvs module to import should probably be included in the default example. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 March 2007, 00:47:32 UTC |
| 7943b3a | Ramsay Jones | 03 March 2007, 18:28:39 UTC | Unset NO_C99_FORMAT on Cygwin. This should only be set based on the capability of your compiler/library to support c99 format specifiers. In this case the version of gcc/newlib and indirectly the version of Cygwin. It should probably only be set in your config.mak file. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 March 2007, 03:35:17 UTC |
| fd547a9 | Ramsay Jones | 03 March 2007, 18:29:03 UTC | Fix a "pointer type missmatch" warning. In particular, the second parameter in the call to iconv() will cause this warning if your library declares iconv() with the second (input buffer pointer) parameter of type const char **. This is the old prototype, which is none-the-less used by the current version of newlib on Cygwin. (It appears in old versions of glibc too). Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 March 2007, 02:55:17 UTC |
| 2832114 | Ramsay Jones | 03 March 2007, 18:28:57 UTC | Fix some "comparison is always true/false" warnings. On Cygwin the wchar_t type is an unsigned short (16-bit) int. This results in the above warnings from the return statement in the wcwidth() function (in particular, the expressions involving constants with values larger than 0xffff). Simply replace the use of wchar_t with an unsigned int, typedef-ed as ucs_char_t. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 March 2007, 02:55:10 UTC |
| 41b2001 | Ramsay Jones | 03 March 2007, 18:28:52 UTC | Fix an "implicit function definition" warning. The function at issue being initgroups() from the <grp.h> header file. On Cygwin, setting _XOPEN_SOURCE suppresses the definition of initgroups(), which causes the warning while compiling daemon.c. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 March 2007, 02:55:04 UTC |
| ee96d11 | Ramsay Jones | 03 March 2007, 18:28:46 UTC | Fix a "label defined but unreferenced" warning. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 March 2007, 02:43:25 UTC |
| 78cb59c | Johannes Schindelin | 03 March 2007, 23:17:23 UTC | Document the config variable format.suffix Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 March 2007, 01:45:48 UTC |
| 7d79c86 | Junio C Hamano | 03 March 2007, 21:04:54 UTC | git-merge: fail correctly when we cannot fast forward. When we cannot fast forward the working tree and the current branch, git-merge did not exit with non-zero status. Noticed by Larry Streepy, the section to be fixed identfied by Johannes Schindelin. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 March 2007, 21:04:54 UTC |
| 64edf4b | Johannes Schindelin | 03 March 2007, 16:14:25 UTC | builtin-archive: use RUN_SETUP It used to roll its own setup. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 March 2007, 20:26:50 UTC |
| 81035bb | Matthias Kestenholz | 03 March 2007, 17:28:14 UTC | Fix git-gc usage note Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 March 2007, 20:11:22 UTC |
| b8ac23b | Gerrit Pape | 02 March 2007, 12:20:10 UTC | Fix quoting in update hook template By default allowunannotated is unset in the repo config, hence $allowunannotated is empty, and must be quoted to not break the syntax. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 March 2007, 23:11:52 UTC |
| eecc836 | Eygene Ryabinkin | 01 March 2007, 16:09:12 UTC | Another memory overrun in http-push.c Use of strlcpy() are wrong, as the source buffer at these locations may not be NUL-terminated. | 02 March 2007, 08:10:12 UTC |
| 0df56ea | Johannes Schindelin | 27 February 2007, 23:55:48 UTC | fetch.o depends on the headers, too. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 March 2007, 21:26:57 UTC |
| 3e4e8c0 | Christian Schlotter | 01 March 2007, 17:08:17 UTC | Documentation: Correct minor typo in git-add documentation. Signed-off-by: Christian Schlotter <schlotter@users.sourceforge.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 March 2007, 21:26:18 UTC |
| 5ef1f8d | Sergey Vlasov | 01 March 2007, 19:41:16 UTC | Documentation/git-send-email.txt: Fix labeled list formatting Mark continuation paragraphs of list entries as such to avoid getting literal paragraphs instead. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 March 2007, 21:25:24 UTC |
| d53ebb4 | Sergey Vlasov | 01 March 2007, 19:41:15 UTC | Documentation/git-quiltimport.txt: Fix labeled list formatting Mark the continuation paragraph of a list entry as such to avoid getting a literal paragraph instead. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 March 2007, 21:25:14 UTC |
| 2ba91e9 | Sergey Vlasov | 01 March 2007, 19:41:14 UTC | Documentation/build-docdep.perl: Fix dependencies for included asciidoc files Adding dependencies on included files to the generated man pages is wrong - includes are processed by asciidoc, therefore the intermediate Docbook XML files really depend on included files. Because of these wrong dependencies the man pages were not rebuilt properly if the intermediate XML files were left in the tree. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 March 2007, 21:24:54 UTC |
| c3e8a0a | Shawn O. Pearce | 01 March 2007, 19:37:34 UTC | git-gui: Remove unnecessary /dev/null redirection. Git 1.5.0 and later no longer output useless messages to standard error when making the initial (or what looks to be) commit of a repository. Since /dev/null does not exist on Windows in the MinGW environment we can't redirect there anyway. Since Git does not output anymore, I'm removing the redirection. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 March 2007, 19:37:34 UTC |
| a1367d1 | Junio C Hamano | 28 February 2007, 22:17:45 UTC | Start preparing Release Notes for 1.5.0.3 | 28 February 2007, 22:17:45 UTC |
| db554bf | Junio C Hamano | 28 February 2007, 22:05:42 UTC | Documentation: git-remote add [-t <branch>] [-m <branch>] [-f] name url Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 February 2007, 22:05:42 UTC |
| 4fa96e1 | Uwe Kleine-König | 28 February 2007, 20:57:42 UTC | Include config.mak in doc/Makefile config.mak.autogen is already there. Without this change it is not possible to override mandir in config.mak. Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 February 2007, 21:48:10 UTC |
| 14b4f2d | Alexandre Julliard | 28 February 2007, 19:59:48 UTC | git.el: Set the default commit coding system from the repository config. If not otherwise specified, take the default coding system for commits from the 'i18n.commitencoding' repository configuration value. Also set the buffer-file-coding-system variable in the log buffer to make the selected coding system visible on the modeline. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 February 2007, 20:39:14 UTC |
| a94f457 | Paolo Bonzini | 28 February 2007, 20:02:02 UTC | git-archimport: support empty summaries, put summary on a single line. Don't fail if the summary line in an arch commit is empty. In this case, try to use the first line in the commit message followed by an ellipsis. In addition, if the summary is multi-line, it is joined on a single line. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 February 2007, 20:38:08 UTC |
| 2c46759 | Eygene Ryabinkin | 28 February 2007, 20:12:02 UTC | http-push.c::lock_remote(): validate all remote refs. Starting from offset 11 might have been good back when it was only used for updating "refs/heads/*", but it is used to update "info/refs" and "refs/tags/*" as well. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 February 2007, 20:12:02 UTC |
| cf70c16 | Gerrit Pape | 28 February 2007, 12:35:39 UTC | git-cvsexportcommit: don't cleanup .msg if not yet committed to cvs. Unless the -c option is given, and the commit to cvs was successful, .msg shouldn't be deleted to be able to run the command suggested by git-cvsexportcommit. See http://bugs.debian.org/412732 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 February 2007, 18:22:50 UTC |
| 163d7b9 | Michael Coleman | 28 February 2007, 05:44:42 UTC | builtin-fmt-merge-msg: fix bugs in --file option If --file's argument is missing, don't crash. If it cannot be opened, die with an error message. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 February 2007, 06:02:41 UTC |
| a91d49c | Shawn O. Pearce | 28 February 2007, 04:47:19 UTC | index-pack: Loop over pread until data loading is complete. A filesystem might not be able to completely supply our pread request in one system call, such as if we are reading data from a network file system and the requested length is just simply huge. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 February 2007, 05:58:46 UTC |
| ae64860 | Aneesh Kumar | 26 February 2007, 08:31:57 UTC | blameview: Fix the browse behavior in blameview Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 February 2007, 05:41:48 UTC |
| 79c96c5 | Michael Coleman | 28 February 2007, 04:13:09 UTC | Fix minor typos/grammar in user-manual.txt Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 February 2007, 05:24:56 UTC |
| 0a43acb | Michael Poole | 28 February 2007, 03:27:44 UTC | Correct ordering in git-cvsimport's option documentation A pair of commits on January 8th added option documentation (for -a, -S and -L) in the middle of the documentation for the -A option. This makes -A's documentation contiguous again. Signed-off-by: Michael Poole <mdpoole@troilus.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 February 2007, 04:44:52 UTC |
| aa27e46 | Linus Torvalds | 28 February 2007, 00:22:52 UTC | git-show: Reject native ref So when we do git show v1.4.4..v1.5.0 that's an illogical thing to do, since "git show" is defined to be a non-revision-walking action, which means the range operator be pointless and wrong. The fact that we happily accept it (and then _only_ show v1.5.0, which is the positive end of the range) is quite arguably not very logical. We should complain, and say that you can only do "no_walk" with positive refs. Negative object refs really don't make any sense unless you walk the obejct list (or you're "git diff" and know about ranges explicitly). Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 February 2007, 01:09:55 UTC |
| 7ee70a7 | Theodore Tso | 27 February 2007, 15:43:28 UTC | Fix git-show man page formatting in the EXAMPLES section Fix asciidoc markup so that the man page is properly formatted in the EXAMPLES section. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 February 2007, 23:38:05 UTC |
| 63e50d4 | Junio C Hamano | 27 February 2007, 09:31:42 UTC | git-apply: do not fix whitespaces on context lines. Internal function apply_line() is called to copy both context lines and added lines to the output buffer, while possibly fixing the whitespace breakages depending on --whitespace=strip settings. However, it did its fix-up on both context lines and added lines. This resulted in two symptoms: (1) The number of lines reported to have been fixed up included these context lines. (2) However, the lines actually shown were limited to the added lines that had whitespace breakages. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 February 2007, 09:33:14 UTC |
| ee24ee5 | Jim Meyering | 26 February 2007, 23:11:35 UTC | diff --cc: integer overflow given a 2GB-or-larger file Few of us use git to compare or even version-control 2GB files, but when we do, we'll want it to work. Reading a recent patch, I noticed two lines like this: int len = st.st_size; Instead of "int", that should be "size_t". Otherwise, in the non-symlink case, with 64-bit size_t, if the file's size is 2GB, the following xmalloc will fail: result = xmalloc(len + 1); trying to allocate 2^64 - 2^31 + 1 bytes (assuming sign-extension in the int-to-size_t promotion). And even if it didn't fail, the subsequent "result[len] = 0;" would be equivalent to an unpleasant "result[-2147483648] = 0;" The other nearby "int"-declared size variable, sz, should also be of type size_t, for the same reason. If sz ever wraps around and becomes negative, xread will corrupt memory _before_ the "result" buffer. Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 February 2007, 09:03:37 UTC |
| 34fc5ce | Linus Torvalds | 26 February 2007, 19:10:59 UTC | mailinfo: do not get confused with logical lines that are too long. It basically considers all the continuation lines to be lines of their own, and if the total line is bigger than what we can fit in it, we just truncate the result rather than stop in the middle and then get confused when we try to parse the "next" line (which is just the remainder of the first line). [jc: added test, and tightened boundary a bit per list discussion.] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 February 2007, 09:02:32 UTC |
| 51bd9d7 | Shawn O. Pearce | 26 February 2007, 16:47:14 UTC | git-gui: Don't create empty (same tree as parent) commits. Mark Levedahl noticed that git-gui will let you create an empty normal (non-merge) commit if the file state in the index is out of whack. The case Mark was looking at was with the new autoCRLF feature in git enabled and is actually somewhat difficult to create. I found a different way to create an empty commit: turn on the Trust File Modifications flag, touch a file, rescan, then move the file into the "Changes To Be Committed" list without looking at the file's diff. This makes git-gui think there are files staged for commit, yet the update-index call did nothing other than refresh the stat information for the affected file. In this case git-gui allowed the user to make a commit that did not actually change anything in the repository. Creating empty commits is usually a pointless operation; rarely does it record useful information. More often than not an empty commit is actually an indication that the user did not properly update their index prior to commit. We should help the user out by detecting this possible mistake and guiding them through it, rather than blindly recording it. After we get the new tree name back from write-tree we compare it to the parent commit's tree; if they are the same string and this is a normal (non-merge, non-amend) commit then something fishy is going on. The user is making an empty commit, but they most likely don't want to do that. We now pop an informational dialog and start a rescan, aborting the commit. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 26 February 2007, 16:47:14 UTC |
| fd234df | Shawn O. Pearce | 26 February 2007, 16:22:10 UTC | git-gui: Add Reset to the Branch menu. cehteh on #git noticed that there was no way to perform a reset --hard from within git-gui. When I pointed out this was Merge->Abort Merge cehteh said this is not very understandable, and that most users would never guess to try that option unless they were actually in a merge. So Branch->Reset is now also a way to cause a reset --hard from within the UI. Right now the confirmation dialog is the same as the one used in Merge->Abort Merge. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 26 February 2007, 16:22:10 UTC |
| 9b28a8b | Shawn O. Pearce | 26 February 2007, 16:17:11 UTC | git-gui: Relocate the menu/transport menu code. This code doesn't belong down in the main window UI creation, its really part of the menu system and probably should be located with it. I'm moving it because I could not find the code when I was looking for it earlier today, as it was not where I expected it to be found. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 26 February 2007, 16:17:11 UTC |
| 0d9b9ab | Junio C Hamano | 26 February 2007, 07:58:50 UTC | GIT 1.5.0.2 Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 February 2007, 08:26:06 UTC |
| 4e5104c | Pavel Roskin | 21 February 2007, 05:03:36 UTC | git-remote: support remotes with a dot in the name [jc: the original from Pavel was limiting the variable names to only fetch and url, but I loosened it to take valid variable names.] [jc: cherry-picked from 'master', since people seem to be reinventing this many times.] Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 February 2007, 08:24:41 UTC |
| c5ddca1 | Junio C Hamano | 26 February 2007, 07:26:11 UTC | Documentation: describe "-f/-t/-m" options to "git-remote add" Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 February 2007, 07:50:29 UTC |
| 4fc970c | Junio C Hamano | 26 February 2007, 06:24:47 UTC | diff --cc: fix display of symlink conflicts during a merge. "git-diff-files --cc" to show conflicts during merge did not pass the correct mode information for the working tree down, and showed bogus combined diff. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 February 2007, 06:25:30 UTC |
| 0b1f647 | Junio C Hamano | 26 February 2007, 03:09:59 UTC | Merge branch 'jc/merge-symlink' into maint * jc/merge-symlink: merge-recursive: fix longstanding bug in merging symlinks merge-index: fix longstanding bug in merging symlinks | 26 February 2007, 03:09:59 UTC |
| 17cd29b | Junio C Hamano | 26 February 2007, 02:42:07 UTC | merge-recursive: fix longstanding bug in merging symlinks Commit 3af244ca added unlink(2) before running symlink(2) to update the working tree with the merge result, but it was unlinking a wrong path. This resulted in loss of the path pointed by a symlink. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 February 2007, 03:08:48 UTC |
| 308efc1 | Junio C Hamano | 26 February 2007, 02:17:15 UTC | merge-index: fix longstanding bug in merging symlinks Ancient commit e2b6a9d0 added code to pass "file modes" from merge-index to merge-one-file, and then later commit 54dd99a1 wanted to make sure we do not end up creating a nonsense symlink that points at a path whose name contains conflict markers. However, nobody noticed that the code in merge-index added by e2b6a9d0 were stripping the S_IFMT bits and the code in 54dd99a1 was meaningless. This fixes it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 February 2007, 03:08:48 UTC |
| d2dc622 | Junio C Hamano | 25 February 2007, 18:53:42 UTC | Add Release Notes to prepare for 1.5.0.2 Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 February 2007, 18:53:42 UTC |
| ffa84ff | Roland Dreier | 25 February 2007, 17:34:27 UTC | Allow arbitrary number of arguments to git-pack-objects If a repository ever gets in a situation where there are too many packs (more than 60 or so), perhaps because of frequent use of git-fetch -k or incremental git-repack, then it becomes impossible to fully repack the repository with git-repack -a. That command just dies with the cryptic message fatal: too many internal rev-list options This message comes from git-pack-objects, which is passed one command line option like --unpacked=pack-<SHA1>.pack for each pack file to be repacked. However, the current code has a static limit of 64 command line arguments and just aborts if more arguments are passed to it. Fix this by dynamically allocating the array of command line arguments, and doubling the size each time it overflows. Signed-off-by: Roland Dreier <roland@digitalvampire.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 February 2007, 18:50:12 UTC |
| 1289172 | Junio C Hamano | 25 February 2007, 09:29:43 UTC | rerere: do not deal with symlinks. Who would use multi-line symlinks that would benefit from rerere? Just ignore them. Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 February 2007, 09:29:43 UTC |
| ab242f8 | Junio C Hamano | 25 February 2007, 09:24:34 UTC | rerere: do not skip two conflicted paths next to each other. The code forgot to take the for (;;) loop control into account, incrementing the index once too many. Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 February 2007, 09:28:44 UTC |
| cef19c7 | Junio C Hamano | 25 February 2007, 07:33:12 UTC | Merge git://repo.or.cz/git-gui into maint * git://repo.or.cz/git-gui: Don't modify CREDITS-FILE if it hasn't changed. | 25 February 2007, 07:33:12 UTC |
| 92446ab | Junio C Hamano | 25 February 2007, 07:18:11 UTC | Don't modify CREDITS-FILE if it hasn't changed. We should always avoid rewriting a built file during `make install` if nothing has changed since `make all`. This is to help support the typical installation process of compiling a package as yourself, then installing it as root. Forcing CREDITS-FILE to be always be rebuilt in the Makefile means that CREDITS-GEN needs to check for a change and only update CREDITS-FILE if the file content actually differs. After all, content is king in Git. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 25 February 2007, 07:18:26 UTC |
| 5089277 | Junio C Hamano | 23 February 2007, 11:44:30 UTC | diff-patch: Avoid emitting double-slashes in textual patch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 February 2007, 09:26:52 UTC |
| b1440cc | Junio C Hamano | 24 February 2007, 09:05:27 UTC | Reword git-am 3-way fallback failure message. When the blobs recorded on the index lines in the patch as pre-image blobs are not found in the repository, "git-am" punted saying that the index line does not record anything useful. This was not clear enough -- the index line does have something useful but the problem was that it was not useful in _that_ repository. Reword the message as Francis Moreau suggests. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 February 2007, 09:06:19 UTC |
| c06d2da | Robin Rosenberg | 23 February 2007, 22:27:58 UTC | Limit filename for format-patch Badly formatted commits may have very long comments. This causes git-format-patch to fail. To avoid that, truncate the filename to a value we believe will always work. Err out if the patch file cannot be created. Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 February 2007, 08:55:56 UTC |
| bdd69c2 | Santi Béjar | 23 February 2007, 16:03:43 UTC | core.legacyheaders: Use the description used in RelNotes-1.5.0 It explains what it does and why, and says how to use the new format. Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 February 2007, 08:25:05 UTC |
| 8ab40a2 | Dmitry V. Levin | 23 February 2007, 17:12:33 UTC | git-show-ref --verify: Fail if called without a reference builtin-show-ref.c (cmd_show_ref): Fail if called with --verify option but without a reference. Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 February 2007, 08:17:38 UTC |
| 75b62b4 | Johannes Schindelin | 23 February 2007, 04:20:32 UTC | git-diff: fix combined diff The code forgets that typecast binds tighter than addition, in other words: (cast *)array + i === ((cast *)array) + i Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 February 2007, 05:24:34 UTC |
| 755b99d | Fredrik Kuivinen | 22 February 2007, 20:28:12 UTC | Fix 'git commit -a' in a newly initialized repository With current git: $ git init $ git commit -a cp: cannot stat `.git/index': No such file or directory Output a nice error message instead. Signed-off-by: Fredrik Kuivinen <frekui@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 February 2007, 05:02:39 UTC |
| 4917d2a | Shawn O. Pearce | 22 February 2007, 04:49:51 UTC | Include git-gui credits file in dist. The Makefile for the git-gui subproject will fail to execute if run outside of a git.git directory, such as when building from a .tar.gz or .tar.bz2. This is because it is looking for the credits file, which was created but omitted from the tarball by the toplevel Makefile. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 February 2007, 05:47:42 UTC |
| e4a15f4 | Shawn O. Pearce | 21 February 2007, 22:59:08 UTC | Document the new core.bare configuration option. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 February 2007, 00:39:09 UTC |
| 5bac4a6 | Junio C Hamano | 21 February 2007, 19:09:57 UTC | Merge branch 'master' of git://repo.or.cz/git-gui into maint * 'master' of git://repo.or.cz/git-gui: git-gui: Don't crash in citool mode on initial commit. git-gui: Remove TODO list. git-gui: Include browser in our usage message. git-gui: Change summary of git-gui. git-gui: Display all authors of git-gui. git-gui: Use mixed path for docs on Cygwin. git-gui: Correct crash when saving options in blame mode. git-gui: Expose the browser as a subcommand. git-gui: Create new branches from a tag. git-gui: Prefer version file over git-describe. git-gui: Print version on the console. git-gui: More consistently display the application name. git-gui: Permit merging tags into the current branch. git-gui: Basic version check to ensure git 1.5.0 or later is used. git-gui: Refactor 'exec git subcmd' idiom. | 21 February 2007, 19:09:57 UTC |
| c750da2 | Michael Loeffler | 14 February 2007, 16:03:12 UTC | Use gunzip -c over gzcat in import-tars example. Not everyone has gzcat or bzcat installed on their system, but gunzip -c and bunzip2 -c perform the same task and are available if the user has installed gzip support or bzip2 support. Signed-off-by: Michael Loeffler <zvpunry@zvpunry.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 February 2007, 16:09:57 UTC |
| 9811937 | Shawn O. Pearce | 21 February 2007, 06:33:59 UTC | git-gui: Don't crash in citool mode on initial commit. Attempting to use `git citool` to create an initial commit caused git-gui to crash with a Tcl error as it tried to add the newly born branch to the non-existant branch menu. Moving this code to after the normal commit cleanup logic resolves the issue, as we only have a branch menu if we are not in singlecommit mode. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 February 2007, 06:33:59 UTC |
| 7391b2e | Shawn O. Pearce | 21 February 2007, 06:29:05 UTC | git-gui: Remove TODO list. I'm apparently not very good at keeping my own TODO file current. I its also somewhat strange to keep the TODO list as part of the software branch, as its meta-information that is not directly related to the code. I'm pulling the TODO list from git-gui and moving it into a seperate branch. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 February 2007, 06:29:05 UTC |
| c0f7a6c | Shawn O. Pearce | 21 February 2007, 06:24:57 UTC | git-gui: Include browser in our usage message. Now that the 'browser' subcommand can be used to startup the tree browser, it should be listed as a possible subcommand option in our usage message. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 February 2007, 06:24:57 UTC |
| 019f42a | Shawn O. Pearce | 19 February 2007, 02:08:04 UTC | git-gui: Change summary of git-gui. Since git-gui does more than create commits, it is unfair to call it "a commit creation tool". Instead lets just call it a graphical user interface. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 February 2007, 05:11:02 UTC |
| 871f4c9 | Shawn O. Pearce | 19 February 2007, 02:06:48 UTC | git-gui: Display all authors of git-gui. Now that git-gui has been released to the public as part of Git 1.5.0 I am starting to see some work from other people beyond myself and Paul. Consequently the copyright for git-gui is not strictly the two of us anymore, and these others deserve to have some credit given to them. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 February 2007, 05:11:01 UTC |
| ee40599 | Shawn O. Pearce | 19 February 2007, 00:06:09 UTC | git-gui: Use mixed path for docs on Cygwin. The Firefox browser requires that a URL use / to delimit directories. This is instead of \, as \ gets escaped by the browser into its hex escape code and then relative URLs are incorrectly resolved, Firefox no longer sees the directories for what they are. Since we are handing the browser a true URL, we better use the standard / for directories. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 February 2007, 05:11:01 UTC |
| 3efb1f3 | Jason Riedy | 21 February 2007, 01:34:56 UTC | Check for PRIuMAX rather than NO_C99_FORMAT in fast-import.c. Thanks to Simon 'corecode' Schubert <corecode@fs.ei.tum.de> for the clean-up. Defining the C99 standard PRIuMAX when necessary replaces UM_FMT and the awkward UM10_FMT. There are no direct C99 translations for other uses of NO_C99_FORMAT in git, alas. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 February 2007, 03:10:57 UTC |
| e326bce | Jason Riedy | 20 February 2007, 00:27:09 UTC | Obey NO_C99_FORMAT in fast-import.c. Define UM_FMT and UM10_FMT and use in place of %ju and %10ju, respectively. Both format as unsigned long long, so this assumes the compiler supports long long. Signed-off-by: Jason Riedy <jason@acm.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 February 2007, 02:20:49 UTC |
| bc6b4f5 | Jason Riedy | 20 February 2007, 00:22:56 UTC | Add a compat/strtoumax.c for Solaris 8. Solaris 8 was pre-c99, and they weren't willing to commit to the strtoumax definition according to /usr/include/inttypes.h. This adds NO_STRTOUMAX and NO_STRTOULL for ancient systems. If NO_STRTOUMAX is defined, the routine in compat/strtoumax.c will be used instead. That routine passes its arguments to strtoull unless NO_STRTOULL is defined. If NO_STRTOULL, then the routine uses strtoul (unsigned long). Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu> Acked-by: Shawn O Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 February 2007, 02:20:30 UTC |
| f496454 | Christian Schlotter | 19 February 2007, 12:35:35 UTC | git-clone: Sync documentation to usage note. Documentation advertises the new `--depth <n>' parameter with an equal sign, while the usage notes (shown after `git-clone --help') do not. If I understood git-clone's source code correctly, the version without the equal sign is correct, which is why this patch syncs documentation to the usage note. Signed-off-by: Christian Schlotter <schlotter@users.sourceforge.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 February 2007, 02:14:29 UTC |
| 4bc94d2 | Junio C Hamano | 19 February 2007, 00:18:43 UTC | GIT 1.5.0.1 Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 February 2007, 00:18:43 UTC |
| 38eb932 | Fredrik Kuivinen | 18 February 2007, 09:36:51 UTC | Documentation/i18n.txt: it is i18n.commitencoding not core.commitencoding Similarly for i18n.logoutputencoding. Signed-off-by: Fredrik Kuivinen <frekui@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 February 2007, 23:58:20 UTC |
| 256c3fe | Fredrik Kuivinen | 18 February 2007, 09:36:22 UTC | Read the config in rev-list Otherwise "git rev-list --header HEAD" will not do the right thing if i18n.commitencoding is set. Signed-off-by: Fredrik Kuivinen <frekui@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 February 2007, 23:58:08 UTC |
| 372ef95 | Shawn O. Pearce | 18 February 2007, 07:12:32 UTC | git-gui: Correct crash when saving options in blame mode. Martin Waitz noticed that git-gui crashed while saving the user's options out if the application was started in blame mode. This was caused by the do_save_config procedure invoking reshow_diff incase the number of context lines was modified by the user. Because we bypassed main window UI setup to enter blame mode we did not set many of the globals which were accessed by reshow_diff, and reading unset variables is an error in Tcl. Aside from moving the globals to be set earlier, I also modified reshow_diff to not invoke clear_diff if there is no path currently in the diff viewer. This way reshow_diff does not crash when in blame mode due to the $ui_diff command not being defined. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 18 February 2007, 07:12:32 UTC |
| 21b4875 | Junio C Hamano | 17 February 2007, 23:47:46 UTC | Update draft release notes for 1.5.0.1 Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 February 2007, 00:15:22 UTC |
