| 9694ec4 | Junio C Hamano | 03 April 2007, 18:31:21 UTC | GIT 1.5.0.7 Not that this release really matters, as we will be doing 1.5.1 tomorrow. This commit is to tie the loose ends and merge all of "maint" branch into "master" in preparation. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 April 2007, 02:27:41 UTC |
| eb33596 | Junio C Hamano | 03 April 2007, 23:28:46 UTC | rerere should not repeat the earlier hunks in later ones When a file has more then one conflicting hunks, it repeated the contents of previous hunks in output for later ones. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 April 2007, 02:01:36 UTC |
| 3ac53e0 | H. Peter Anvin | 27 March 2007, 23:45:06 UTC | git-upload-pack: make sure we close unused pipe ends Right now, we don't close the read end of the pipe when git-upload-pack runs git-pack-object, so we hang forever (why don't we get SIGALRM?) instead of dying with SIGPIPE if the latter dies, which seems to be the norm if the client disconnects. Thanks to Johannes Schindelin <Johannes.Schindelin@gmx.de> for pointing out where this close() needed to go. This patch has been tested on kernel.org for several weeks and appear to resolve the problem of git-upload-pack processes hanging around forever. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from commit 465b3518a9ad5080a4b652ef35fb13c61a93e7a4) | 29 March 2007, 08:41:23 UTC |
| c2c6d93 | Gerrit Pape | 29 March 2007, 06:42:44 UTC | Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES. Please see http://bugs.debian.org/404795: In git-rev-parse(1), there is an example commit tree, which is used twice. The explanation for this tree is very clear: B and C are commit *parents* to A. However, when the tree is reused as an example in the SPECIFYING RANGES, the manpage author screws up and uses A as a commit *parent* to B and C! I.e., he inverts the tree. And the fact that for this example you need to read the tree backwards is not explained anywhere (and it would be confusing even if it was). Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 March 2007, 08:38:28 UTC |
| 3e63e0d | Gerrit Pape | 29 March 2007, 06:41:42 UTC | Documentation/git-svnimport.txt: fix typo. This was noticed by Frederik Schwarzer. SVN's repository by default has trunk, tags/, and branch_es_/. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 March 2007, 08:38:11 UTC |
| 9529a25 | Junio C Hamano | 28 March 2007, 20:53:00 UTC | GIT 1.5.0.6 | 28 March 2007, 22:28:14 UTC |
| d0e50cb | Jeff King | 28 March 2007, 21:52:09 UTC | commit: fix pretty-printing of messages with "\nencoding " The function replace_encoding_header is given the whole commit buffer, including the commit message. When looking for the encoding header, if none was found in the header, it would locate any line in the commit message matching "\nencoding " and remove it. Instead, we now make sure to search only to the end of the header. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 March 2007, 22:06:18 UTC |
| 75c962c | Johannes Schindelin | 23 March 2007, 01:05:28 UTC | t4118: be nice to non-GNU sed Elias Pipping: > I'm on a mac, hence /usr/bin/sed is not gnu sed, which makes > t4118 fail. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Ack'd-by: Elias Pipping <pipping@macports.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 March 2007, 21:54:30 UTC |
| d3e41eb | Junio C Hamano | 28 March 2007, 10:05:08 UTC | git-commit: "read-tree -m HEAD" is not the right way to read-tree quickly It still looks at the working tree and checks for locally modified paths. When are preparing a temporary index from HEAD, we do not want any of that. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 March 2007, 10:34:55 UTC |
| fd2a759 | Junio C Hamano | 25 March 2007, 22:07:27 UTC | Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint * 'maint' of git://linux-nfs.org/~bfields/git: user-manual: introduce "branch" and "branch head" differently glossary: clean up cross-references glossary: stop generating automatically user-manual: Use def_ instead of ref_ for glossary references. user-manual.txt: fix a tiny typo. user-manual: run xsltproc without --nonet option | 25 March 2007, 22:07:27 UTC |
| cd67c8e | Jakub Narebski | 24 March 2007, 19:59:53 UTC | gitweb: Add some installation notes in gitweb/INSTALL Add some installation and configuration notes for gitweb in gitweb/INSTALL. Make use of filling gitweb configuration by Makefile. It does not cover (yet?) all the configuration variables and options. Some of contents duplicates information in gitweb/README file (it is referred from gitweb/INSTALL). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 March 2007, 05:26:33 UTC |
| 4ae89b7 | Jakub Narebski | 24 March 2007, 19:59:13 UTC | gitweb: Fix not marking signoff lines in "log" view The CSS selector for signoff lines style was too strict: in the "log" view the commit message is not encompassed in container "page_body" div. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 March 2007, 05:25:55 UTC |
| 346d5e1 | Jakub Narebski | 07 March 2007, 01:21:25 UTC | gitweb: Don't escape attributes in CGI.pm HTML methods There is no need to escape HTML tag's attributes in CGI.pm HTML methods (like CGI::a()), because CGI.pm does attribute escaping automatically. $cgi->a({ ... -attribute => atribute_value }, tag_contents) is translated to <a ... attribute="attribute_value">tag_contents</a> The rules for escaping attribute values (which are string contents) are different. For example you have to take care about escaping embedded '"' and "'" characters; CGI::a() does that for us automatically. CGI::a() does not HTML escape tag_contents; we would need to write <a href="URL">some <b>bold</b> text</a> for example. So we use esc_html (or esc_path) to escape tag_contents as needed. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 March 2007, 05:25:47 UTC |
| 290b146 | Li Yang | 06 March 2007, 03:58:56 UTC | gitweb: Change to use explicitly function call cgi->escapHTML() Change to use explicitly function call cgi->escapHTML(). This fix the problem on some systems that escapeHTML() is not functioning, as default CGI is not setting 'escape' parameter. Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 March 2007, 05:25:40 UTC |
| f9308a1 | Jakub Narebski | 23 March 2007, 20:04:31 UTC | gitweb: Fix "next" link in commit view Fix copy'n'paste error in commit c9d193df which caused that "next" link for merge commits in "commit" view (merge: _commit_ _commit_ ...) was to "commitdiff" view instead of being to "commit" view. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 March 2007, 21:54:52 UTC |
| 979ea58 | Peter Eriksen | 21 March 2007, 18:43:37 UTC | Documentation/pack-format.txt: Clear up description of types. Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 March 2007, 10:05:19 UTC |
| a947ab7 | Michael S. Tsirkin | 21 March 2007, 08:37:36 UTC | fix typo in git-am manpage Fix typo in git-am manpage Signed-off-by: Michael S. Tsirkin <mst@dev.mellanox.co.il> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 March 2007, 09:22:28 UTC |
| 81b6c95 | J. Bruce Fields | 19 March 2007, 03:02:14 UTC | user-manual: introduce "branch" and "branch head" differently I was using "branch" to mean "head", but that's perhaps a little sloppy; so instead start by using the terms "branch head" and "head", while still quickly falling back on "branch", since that's what people actually say more frequently. Also include glossary references on the first uses of "head" and "tag". Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 19 March 2007, 03:06:00 UTC |
| cbd9192 | J. Bruce Fields | 18 March 2007, 21:53:29 UTC | glossary: clean up cross-references Manual clean-up of cross-references, and also clean up a few definitions (e.g. git-rebase). Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 19 March 2007, 03:06:00 UTC |
| f562e6f | J. Bruce Fields | 18 March 2007, 21:02:37 UTC | glossary: stop generating automatically The sort_glossary.pl script sorts the glossary, checks for duplicates, and automatically adds cross-references. But it's not so hard to do all that by hand, and sometimes the automatic cross-references are a little wrong; so let's run the script one last time and check in its output. Note: to make the output fit better into the user manual I also deleted the acknowledgements at the end, which was maybe a little rude; feel free to object and I can find a different solution. Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 19 March 2007, 03:06:00 UTC |
| 06e7ea3 | J. Bruce Fields | 18 March 2007, 00:40:13 UTC | user-manual: Use def_ instead of ref_ for glossary references. I'd like to start using references to the glossary in the user manual. The "ref_" prefix for these references seems a little generic; so replace with "def_". Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 19 March 2007, 01:53:50 UTC |
| 21f13ee | Jim Meyering | 18 March 2007, 17:39:56 UTC | user-manual.txt: fix a tiny typo. "file patch" was doubtless intended to be "file path", but "directory name" is clearer. Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 19 March 2007, 01:53:29 UTC |
| 0a3985d | J. Bruce Fields | 16 March 2007, 15:45:29 UTC | user-manual: run xsltproc without --nonet option The --nonet option prevents xsltproc from going to the network to find anything. But it always tries to find them locally first, so for a user with the necessary docbook stylesheets installed the build will work just fine without xsltproc attempting to use the network; all --nonet does is make it fail rather than falling back on that. That doesn't seem particularly helpful. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 19 March 2007, 01:53:19 UTC |
| 6bf035f | Junio C Hamano | 18 March 2007, 21:40:35 UTC | GIT 1.5.0.5 Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 March 2007, 21:43:29 UTC |
| 2be08a8 | Santi Béjar | 16 March 2007, 10:46:09 UTC | git-merge: finish when git-read-tree fails The message formating (commit v1.5.0.3-28-gbe242d5) broke the && chain. Noticed by Dmitry Torokhov. Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 March 2007, 11:34:17 UTC |
| 3d4e193 | Junio C Hamano | 14 March 2007, 22:56:49 UTC | GIT 1.5.0.4 Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 22:56:49 UTC |
| 9debca9 | Yann Dirson | 14 March 2007, 21:08:41 UTC | Clarify doc for git-config --unset-all. Previous formulation could make it appear as removing all lines matching a regexp (at least, I was looking for such a flag, and confused this flag for what I was looking for). Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 21:38:38 UTC |
| 41f5d73 | Junio C Hamano | 14 March 2007, 16:48:13 UTC | git-checkout: fix "eval" used for merge labelling. The symbolic notation of the fork point can contain whitespaces (e.g. "git checkout -m 'HEAD@{9 hours ago}'"). Quote strings properly when using eval to prepare GITHEAD_$new Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 16:48:13 UTC |
| ad0f8c9 | Frank Lichtenheld | 13 March 2007, 17:24:26 UTC | cvsserver: asciidoc formatting changes Format some lists really as lists. Improves both html and man output. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 04:16:05 UTC |
| 65d61e5 | Junio C Hamano | 13 March 2007, 06:08:27 UTC | Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint * 'maint' of git://repo.or.cz/git/fastimport: fast-import: grow tree storage more aggressively | 13 March 2007, 06:08:27 UTC |
| f022f85 | Jeff King | 11 March 2007, 02:39:17 UTC | fast-import: grow tree storage more aggressively When building up a tree for a commit, fast-import dynamically allocates memory for the tree entries. When more space is needed, the allocated memory is increased by a constant amount. For very large trees, this means re-allocating and memcpy()ing the memory O(n) times. To compound this problem, releasing the previous tree resource does not free the memory; it is kept in a pool for future trees. This means that each of the O(n) allocations will consume increasing amounts of memory, giving O(n^2) memory consumption. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 March 2007, 19:01:44 UTC |
| 115f0fe | Shawn O. Pearce | 12 March 2007, 17:40:31 UTC | Don't package the git-gui credits file anymore Since git-gui 0.6.4 the credits file is no longer produced. This file was removed from git-gui due to build issues that a lot of users and Git developers have reported running into. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 March 2007, 18:44:46 UTC |
| 3ed02de | Junio C Hamano | 12 March 2007, 18:43:22 UTC | Merge branch 'maint' of git://repo.or.cz/git-gui into maint * 'maint' of git://repo.or.cz/git-gui: git-gui: Allow 'git gui version' outside of a repository git-gui: Revert "git-gui: Display all authors of git-gui." git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed." git-gui: Allow committing empty merges | 12 March 2007, 18:43:22 UTC |
| 756d846 | Shawn O. Pearce | 12 March 2007, 17:24:10 UTC | git-gui: Allow 'git gui version' outside of a repository I got a little surprise one day when I tried to run 'git gui version' outside of a Git repository to determine what version of git-gui was installed on that system. Turns out we were doing the repository check long before we got around to command line argument handling. We now look to see if the only argument we have been given is 'version' or '--version', and if so, print out the version and exit immediately; long before we consider looking at the Git version or working directory. This way users can still get to the git-gui version number even if Git's version cannot be read. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 March 2007, 17:26:06 UTC |
| bb616dd | Shawn O. Pearce | 12 March 2007, 17:26:04 UTC | git-gui: Revert "git-gui: Display all authors of git-gui." This reverts commit 871f4c97ad7e021d1a0a98c80c5da77fcf70e4af. Too many users have complained about the credits generator in git-gui, so I'm backing the entire thing out. This revert will finish that series. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 March 2007, 17:26:04 UTC |
| 56a7fde | Shawn O. Pearce | 12 March 2007, 17:25:58 UTC | git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed." This reverts commit 92446aba47b0e0db28f7b858ea387efcca30ab44. Too many users have complained about the credits generator in git-gui, so I'm backing the entire thing out. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 March 2007, 17:25:58 UTC |
| c7bafad | Shawn O. Pearce | 12 March 2007, 17:03:47 UTC | git-gui: Allow committing empty merges Johannes Sixt noticed that git-gui would not let the user commit a merge created by `git merge -s ours` as the ours strategy does not alter the tree (that is HEAD^1^{tree} = HEAD^{tree} after the merge). The same issue arises from amending such a merge commit. We now permit an empty commit (no changed files) if we are doing a merge commit. Core Git does this with its command line based git-commit tool, so it makes sense for the GUI to do the same. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 March 2007, 17:03:47 UTC |
| fc09524 | Avi Kivity | 11 March 2007, 17:19:43 UTC | git-send-email: Document configuration options Wishing to implement an email aliases file, I found that they were already implmented. Document them for the next user. Signed-off-by: Avi Kivity <avi@qumranet.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 March 2007, 06:52:03 UTC |
| be242d5 | J. Bruce Fields | 11 March 2007, 16:28:56 UTC | git-merge: warn when -m provided on a fast forward Warn the user that the "-m" option is ignored in the case of a fast forward. That may save some confusion in the case where the user doesn't know about fast forwards yet and may not realize that the behavior here is intentional. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 March 2007, 06:49:20 UTC |
| 60fa08e | Alexandre Julliard | 10 March 2007, 18:22:26 UTC | git.el: Retrieve commit log information from .dotest directory. If a git-am or git-rebase is in progress, fill the commit log buffer from the commit information found in the various files in the .dotest directory. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 March 2007, 05:58:26 UTC |
| 3844814 | Alexandre Julliard | 10 March 2007, 18:21:25 UTC | git.el: Avoid appending a signoff line that is already present. Also avoid inserting an extra newline if other signoff lines are present. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 March 2007, 05:58:21 UTC |
| 96a5702 | Matthias Lederhofer | 11 March 2007, 01:35:00 UTC | setup_git_directory_gently: fix off-by-one error don't tell getcwd that the buffer has one spare byte for an extra / Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 March 2007, 05:47:45 UTC |
| 8bb2b51 | Junio C Hamano | 11 March 2007, 05:47:01 UTC | Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint * 'maint' of git://linux-nfs.org/~bfields/git: user-manual: install user manual stylesheet with other web documents user-manual: fix rendering of history diagrams user-manual: fix missing colon in git-show example user-manual: fix inconsistent use of pull and merge user-manual: fix inconsistent example glossary: fix overoptimistic automatic linking of defined terms | 11 March 2007, 05:47:01 UTC |
| 8ce9d83 | J. Bruce Fields | 11 March 2007, 03:58:54 UTC | user-manual: install user manual stylesheet with other web documents Install the stylesheet needed for the user manual. This should solve the problem of, e.g., http://www.kernel.org/pub/software/scm/git/docs/user-manual.html lacking a lot of formatting. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 11 March 2007, 04:05:02 UTC |
| 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 |
| c4431d3 | Jeff King | 09 March 2007, 20:21:41 UTC | Documentation: s/seperator/separator/ Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 March 2007, 01:27:43 UTC |
| 443b92b | Matthias Kestenholz | 09 March 2007, 22:38:57 UTC | Adjust reflog filemode in shared repository Without this, committing in a group-shared repository would not work even though all developers are in the same group. Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 March 2007, 00:46:53 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 |
