| 6b68342 | Junio C Hamano | 19 May 2007, 00:21:31 UTC | GIT v1.5.1.5 Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 May 2007, 00:21:43 UTC |
| cecb98a | Junio C Hamano | 19 May 2007, 00:13:47 UTC | Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint * 'maint' of git://linux-nfs.org/~bfields/git: user-manual: reorganize public git repo discussion user-manual: listing commits reachable from some refs not others user-manual: introduce git user-manual: add a "counting commits" example user-manual: move howto/using-topic-branches into manual user-manual: move howto/make-dist.txt into user manual Documentation: remove howto's now incorporated into manual user-manual: move quick-start to an appendix glossary: expand and clarify some definitions, prune cross-references user-manual: revise birdseye-view chapter Add a birdview-on-the-source-code section to the user manual | 19 May 2007, 00:13:47 UTC |
| a5c2d26 | Petr Baudis | 18 May 2007, 23:21:53 UTC | Documentation: git-rev-list's "patterns" git-rev-list(1) talks about patterns as values for the --grep, --committed etc. parameters, without going into detail. This patch mentions that these patterns are actually regexps. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 May 2007, 00:12:10 UTC |
| eda6944 | J. Bruce Fields | 15 May 2007, 04:00:29 UTC | user-manual: reorganize public git repo discussion Helping a couple people set up public repos recently, I wanted to point them at this piece of the user manual, but found it wasn't as helpful as it could be: - It starts with a big explanation of why you'd want a public repository, not necessary in their case since they already knew why they wanted that. So, separate that out. - It skimps on some of the git-daemon details, and puts the http export information first. Fix that. Also group all the public repo subsections into a single section, and do some miscellaneous related editing. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 18 May 2007, 03:23:08 UTC |
| 629d9f7 | J. Bruce Fields | 14 May 2007, 02:58:06 UTC | user-manual: listing commits reachable from some refs not others This is just an amusing example raised by someone in irc. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 18 May 2007, 01:58:53 UTC |
| 99eaefd | J. Bruce Fields | 13 May 2007, 06:23:11 UTC | user-manual: introduce git Well, we should say at least something about what git is. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 18 May 2007, 01:58:53 UTC |
| 46acd3f | J. Bruce Fields | 13 May 2007, 06:14:45 UTC | user-manual: add a "counting commits" example This is partly just an excuse to mention --pretty= and rev-list. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 18 May 2007, 01:58:51 UTC |
| 9e2163e | J. Bruce Fields | 13 May 2007, 05:48:47 UTC | user-manual: move howto/using-topic-branches into manual Move howto/using-topic-branches into the user manual as an example for the "sharing development" chapter. While we're at it, remove some discussion that's covered in earlier chapters, modernize somewhat (use separate-heads setup, remotes, replace "whatchanged" by "log", etc.), and replace syntax we'd need to explain by syntax we've already covered (e.g. old..new instead of new ^old). The result may not really describe what Tony Luck does any more.... Hope that's not annoying. Cc: Tony Luck <tony.luck@intel.com> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 18 May 2007, 01:20:10 UTC |
| 82c8bf2 | J. Bruce Fields | 13 May 2007, 04:14:40 UTC | user-manual: move howto/make-dist.txt into user manual There seems to be a perception that the howto's are bit-rotting a little. The manual might be a more visible location for some of them, and make-dist.txt seems like a good candidate to include as an example in the manual. For now, incorporate much of it verbatim. Later we may want to update the example a bit. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 18 May 2007, 01:08:02 UTC |
| 4db75b7 | J. Bruce Fields | 13 May 2007, 03:52:24 UTC | Documentation: remove howto's now incorporated into manual These two howto's have both been copied into the manual. I'd rather not maintain both versions if possible, and I think the user-manual will be more visible than the howto directory. (Though I wouldn't mind some duplication if people really like having them here.) Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 18 May 2007, 01:05:46 UTC |
| 2624d9a | J. Bruce Fields | 13 May 2007, 02:55:40 UTC | user-manual: move quick-start to an appendix The quick start interrupts the flow of the manual a bit. Move it to "appendix A" but add a reference to it in the preface. Also rename the todo chapter to "appendix B", and revise the preface a little. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 18 May 2007, 01:05:46 UTC |
| 343cad9 | J. Bruce Fields | 13 May 2007, 02:17:03 UTC | glossary: expand and clarify some definitions, prune cross-references Revise and expand some of the definitions in the glossary, based in part on a recent thread started by a user looking for help with some of the jargon. I've borrowed some of the language from Linus's email on that thread. (I'm assuming standing permission to plagiarize Linus's email....) Also start making a few changes to mitigate the appearance of "circularity" mentioned in that thread: - feel free to use somewhat longer definitions and to explain some things more than once instead of relying purely on cross-references - don't use cross-references when they're redundant: eliminate self-references and repeated references to the same entry. Cc: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 18 May 2007, 01:03:59 UTC |
| a5fc33b | J. Bruce Fields | 12 May 2007, 23:48:31 UTC | user-manual: revise birdseye-view chapter Some revisions suggested by Junio along with some minor style fixes and one compile fix (asterisks need escaping). Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 18 May 2007, 01:02:35 UTC |
| 164b198 | Michael Hendricks | 17 May 2007, 05:08:50 UTC | Document core.excludesfile for git-add During the discussion of core.excludesfile in the user-manual, I realized that the configuration wasn't mentioned in the man pages. Signed-off-by: Michael Hendricks <michael@ndrix.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 May 2007, 00:36:38 UTC |
| 504ceab | Michael Hendricks | 17 May 2007, 05:15:16 UTC | git-send-email: allow leading white space on mutt aliases mutt version 1.5.14 (perhaps earlier versions too) permits alias files to have white space before the 'alias' keyword. Signed-off-by: Michael Hendricks <michael@ndrix.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 May 2007, 05:33:04 UTC |
| 126640a | Johannes Schindelin | 10 May 2007, 10:36:15 UTC | Add a birdview-on-the-source-code section to the user manual In http://thread.gmane.org/gmane.comp.version-control.git/42479, a birdview on the source code was requested. J. Bruce Fields suggested that my reply should be included in the user manual, and there was nothing of an outcry, so here it is, not 2 months later. It includes modifications as suggested by J. Bruce Fields, Karl Hasselström and Daniel Barkalow. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> | 17 May 2007, 00:36:13 UTC |
| 0ab564b | Jeff King | 15 May 2007, 15:35:13 UTC | format-patch: add MIME-Version header when we add content-type. When we add Content-Type: header, we should also add MIME-Version: header as well. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 May 2007, 19:37:25 UTC |
| 61d7256 | Steffen Prohaska | 16 May 2007, 05:48:47 UTC | Fixed link in user-manual link to git-mergetool was broken. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 May 2007, 19:32:29 UTC |
| df9f91f | Junio C Hamano | 16 May 2007, 19:13:55 UTC | Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint * 'maint' of git://repo.or.cz/git/fastimport: import-tars: Use the "Link indicator" to identify directories | 16 May 2007, 19:13:55 UTC |
| df8cfac | Johannes Schindelin | 16 May 2007, 16:22:26 UTC | import-tars: Use the "Link indicator" to identify directories Earlier, we used the mode to determine if a name was associated with a directory. This fails, since some tar programs do not set the mode correctly. However, the link indicator _has_ to be set correctly. Noticed by Chris Riddoch. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 May 2007, 18:54:22 UTC |
| cf606e3 | Andy Whitcroft | 15 May 2007, 16:33:25 UTC | git name-rev writes beyond the end of malloc() with large generations When using git name-rev on my kernel tree I triggered a malloc() corruption warning from glibc. apw@pinky$ git log --pretty=one $N/base.. | git name-rev --stdin *** glibc detected *** malloc(): memory corruption: 0x0bff8950 *** Aborted This comes from name_rev() which is building the name of the revision in a malloc'd string, which it sprintf's into: char *new_name = xmalloc(len + 8); [...] sprintf(new_name, "%.*s~%d^%d", len, tip_name, generation, parent_number); This allocation is only sufficient if the generation number is less than 5 digits, in my case generation was 13432. In reality parent_number can be up to 16 so that also can require two digits, reducing us to 3 digits before we are at risk of blowing this allocation. This patch introduces a decimal_length() which approximates the number of digits a type may hold, it produces the following: Type Longest Value Len Est ---- ------------- --- --- unsigned char 256 3 4 unsigned short 65536 5 6 unsigned long 4294967296 10 11 unsigned long long 18446744073709551616 20 21 char -128 4 4 short -32768 6 6 long -2147483648 11 11 long long -9223372036854775808 20 21 This is then used to size the new_name. Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 May 2007, 01:14:42 UTC |
| 045fe3c | Quy Tonthat | 15 May 2007, 02:51:02 UTC | Documentation/branch: fix small typo in -D example Signed-off-by: Quy Tonthat <qtonthat@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 May 2007, 03:17:00 UTC |
| 52e7b74 | Junio C Hamano | 15 May 2007, 00:49:55 UTC | Prepare for 1.5.1.5 Release Notes Hopefully we will have 1.5.2 soonish, to contain all of these, but we should summarize what we have done regardless. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 May 2007, 00:51:12 UTC |
| b4b20b2 | Jakub Narebski | 14 May 2007, 23:55:44 UTC | gitweb: Add a few comments about %feature hash Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 May 2007, 00:26:46 UTC |
| 870e0d6 | Frank Lichtenheld | 14 May 2007, 14:44:53 UTC | git-am: Clean up the asciidoc documentation Add --keep to synopsis. The synopsys used a mix of tabs and spaces, unify to use only spaces. Shuffle options around in synopsys and description for grouping them logically. Add more gitlink references to other commands. Various grammatical fixes and improvements. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 May 2007, 00:25:02 UTC |
| 7b1885d | Frank Lichtenheld | 14 May 2007, 14:44:52 UTC | Documentation: format-patch has no --mbox option git-applymbox and git-mailinfo refer to a --mbox option of git-format-patch when talking about their -k options. But there is no such option. What -k does to the former two commands is to keep the Subject: lines unmunged, meant to be used on output generated with format-patch -k. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 May 2007, 00:23:52 UTC |
| 2dc189a | Frank Lichtenheld | 14 May 2007, 14:44:51 UTC | builtin-log.c: Fix typo in comment s/fmt-patch/format-patch/ Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 May 2007, 23:52:02 UTC |
| 223fa32 | Junio C Hamano | 14 May 2007, 21:24:02 UTC | Fix git-clone buglet for remote case. c2f599e09fd0496413d1744b5b89b9b5c223555d introduced a buglet while cloning from a remote URL; we forgot to squelch the unnecessary error message when we try to cd to the given "remote" name, in order to see if it is a local directory. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 May 2007, 21:24:02 UTC |
| 4a1bb4c | Eric Wong | 13 May 2007, 16:58:14 UTC | git-svn: don't attempt to minimize URLs by default For tracking branches and tags, git-svn prefers to connect to the root of the repository or at least the level that houses branches and tags as well as trunk. However, users that are accustomed to tracking a single directory have no use for this feature. As pointed out by Junio, users may not have permissions to connect to connect to a higher-level path in the repository. While the current minimize_url() function detects lack of permissions to certain paths _after_ successful logins, it cannot effectively determine if it is trying to access a login-only portion of a repo when the user expects to connect to a part where anonymous access is allowed. For people used to the git-svnimport switches of --trunk, --tags, --branches, they'll already pass the repository root (or root+subdirectory), so minimize URL isn't of too much use to them, either. For people *not* used to git-svnimport, git-svn also supports: git svn init --minimize-url \ --trunk http://repository-root/foo/trunk \ --branches http://repository-root/foo/branches \ --tags http://repository-root/foo/tags And this is where the new --minimize-url command-line switch comes in to allow for this behavior to continue working. | 13 May 2007, 19:10:43 UTC |
| 4c03c3e | Eric Wong | 13 May 2007, 08:04:44 UTC | git-svn: fix segfaults due to initial SVN pool being cleared Some parts of SVN always seem to use it, even if the SVN::Ra object we're using is no longer used and we've created a new one in its place. It's also true that only one SVN::Ra connection can exist at once... Using SVN::Pool->new_default when the SVN::Ra object is created doesn't seem to help very much, either... Hopefully this fixes all segfault problems users have been experiencing over the past few months. Signed-off-by: Eric Wong <normalperson@yhbt.net> | 13 May 2007, 19:10:42 UTC |
| 0dc03d6 | Eric Wong | 13 May 2007, 08:04:43 UTC | git-svn: clean up caching of SVN::Ra functions This patch was originally intended to make the Perl GC more sensitive to the SVN::Pool objects and not accidentally clean them up when they shouldn't be (causing segfaults). That didn't work, but this patch makes the code a bit cleaner regardless Put our caches for get_dir and check_path calls directly into the SVN::Ra object so they auto-expire when it is destroyed. dirents returned by get_dir() no longer needs the pool object stored persistently along with the cache data, as they'll be converted to native Perl hash references. Since calling rev_proplist repeatedly per-revision is no longer needed in git-svn, we do not cache calls to it. Signed-off-by: Eric Wong <normalperson@yhbt.net> | 13 May 2007, 19:10:42 UTC |
| 645833b | Eric Wong | 12 May 2007, 21:36:20 UTC | git-svn: don't drop the username from URLs when dcommit is run We no longer store usernames in URLs stored in git-svn-id lines for dcommit, so we shouldn't rely on those URLs when connecting to the remote repository to commit. | 13 May 2007, 19:10:42 UTC |
| b24dd51 | Quy Tonthat | 13 May 2007, 11:41:45 UTC | RPM spec: include files in technical/ to package. Not only that they are interesting to users, some of the files are linked to by the included "Git User's Manual" Signed-off-by: Quy Tonthat <qtonthat@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 May 2007, 19:00:28 UTC |
| 0ab311d | Matthieu Castet | 13 May 2007, 18:57:00 UTC | Remove stale non-static-inline prototype for tree_entry_extract() When 4651ece8 made the function a "static inline", it should have removd the stale prototype but everybody missed that. Thomas Glanzmann noticed this broke compilation with Forte12 compiler on his Sun boxes. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 May 2007, 18:57:00 UTC |
| b18a2be | Steffen Prohaska | 13 May 2007, 07:12:52 UTC | git-config: test for 'do not forget "a.b.var" ends "a.var" section'. Added test for mentioned bugfix. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 May 2007, 07:24:46 UTC |
| ae9ee41 | Junio C Hamano | 13 May 2007, 04:49:33 UTC | git-config: do not forget seeing "a.b.var" means we are out of "a.var" section. Earlier code tried to be half-careful and knew the logic that seeing "a.var" after seeing "a.b.var" is a sign of the previous "a.b." section has ended, but forgot it has to handle the other way. Seeing "a.b.var" after seeing "a.var" is a sign that "a." section has ended, so a new "a.var2" variable should be added before the location "a.b.var" appears. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 May 2007, 07:19:58 UTC |
| fdc99cb | Junio C Hamano | 29 March 2007, 08:02:50 UTC | checkout: allow detaching to HEAD even when switching to the tip of a branch You cannot currently checkout the tip of an existing branch without moving to the branch. This allows you to detach your HEAD and place it at such a commit, with: $ git checkout master^0 Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 May 2007, 19:35:54 UTC |
| cbb84e5 | Jan Hudec | 12 May 2007, 17:11:13 UTC | Updated documentation of hooks in git-receive-pack. Added documentation of pre-receive and post-receive hooks and updated documentation of update and post-update hooks. [jc: with minor copy-editing] Signed-off-by: Jan Hudec <bulb@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 May 2007, 18:13:08 UTC |
| 96f12b5 | Alex Riesen | 11 May 2007, 20:35:22 UTC | Allow fetching references from any namespace not only from the three defined: heads, tags and remotes. Noticed when I tried to fetch the references created by git-p4-import.bat: they are placed into separate namespace (refs/p4import/, to avoid showing them in git-branch output). As canon_refs_list_for_fetch always prepended refs/heads/ it was impossible, and annoying: it worked before. Normally, the p4import references are useless anywhere but in the directory managed by perforce, but in this special case the cloned directory was supposed to be a backup, including the p4import branch: it keeps information about where the imported perforce state came from. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 May 2007, 16:36:06 UTC |
| a6e3768 | Steffen Prohaska | 12 May 2007, 11:32:34 UTC | tiny fix in documentation of git-clone path in example was missing '../' Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 May 2007, 16:20:51 UTC |
| 7e9116b | Marco Costalba | 12 May 2007, 10:35:29 UTC | Fix an unmatched comment end in arm/sha1_arm.S Signed-off-by: Marco Costalba <mcostalba@gmail.com> Acked-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 May 2007, 16:16:50 UTC |
| a9d9a1b | Junio C Hamano | 10 May 2007, 21:47:14 UTC | Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint * 'maint' of git://repo.or.cz/git/fastimport: Fix documentation of tag in git-fast-import.txt Properly handle '0' filenames in import-tars | 10 May 2007, 21:47:14 UTC |
| 419ca50 | Richard P. Curnow | 09 May 2007, 22:13:44 UTC | Fix documentation of tag in git-fast-import.txt The tag command does not take a trailing LF. Signed-off-by: Richard P. Curnow <rc@rc0.org.uk> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 May 2007, 21:32:40 UTC |
| da774e8 | Shawn O. Pearce | 10 May 2007, 21:31:27 UTC | Merge branch 'gfi-maint' into maint * gfi-maint: Properly handle '0' filenames in import-tars | 10 May 2007, 21:31:27 UTC |
| b722b95 | Junio C Hamano | 10 May 2007, 20:24:21 UTC | .mailmap: add some aliases | 10 May 2007, 20:26:26 UTC |
| e18ee57 | Jari Aalto | 30 April 2007, 18:37:57 UTC | SPECIFYING RANGES typo fix: it it => it is Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 May 2007, 20:26:26 UTC |
| c2f599e | Junio C Hamano | 10 May 2007, 00:11:15 UTC | git-clone: don't get fooled by $PWD If you have /home/me/git symlink pointing at /pub/git/mine, trying to clone from /pub/git/his/ using relative path would not work as expected: $ cd /home/me $ cd git $ ls ../ his mine $ git clone -l -s -n ../his/stuff.git This is because "cd ../his/stuff.git" done inside git-clone to check if the repository is local is confused by $PWD, which is set to /home/me, and tries to go to /home/his/stuff.git which is different from /pub/git/his/stuff.git. We could probably say "set -P" (or "cd -P") instead, if we know the shell is POSIX, but the way the patch is coded is probably more portable. [jc: this is updated with Andy Whitcroft's improvements] Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 May 2007, 20:26:14 UTC |
| c69f405 | Richard P. Curnow | 09 May 2007, 22:13:44 UTC | Fix documentation of tag in git-fast-import.txt The tag command does not take a trailing LF. Signed-off-by: Richard P. Curnow <rc@rc0.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 May 2007, 02:04:54 UTC |
| 1cc202b | Junio C Hamano | 09 May 2007, 05:10:56 UTC | GIT v1.5.1.4 Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 May 2007, 05:11:17 UTC |
| 22f0958 | Quy Tonthat | 08 May 2007, 14:19:41 UTC | Add howto files to rpm packages. RPM packages did not include howto files which causes broken links in howto-index.html Signed-off-by: Quy Tonthat <qtonthat@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 May 2007, 05:09:04 UTC |
| b51be13 | Amos Waterland | 08 May 2007, 04:46:08 UTC | wcwidth redeclaration Build fails for git 1.5.1.3 on AIX, with the message: utf8.c:66: error: conflicting types for 'wcwidth' /.../lib/gcc/powerpc-ibm-aix5.3.0.0/4.0.3/include/string.h:266: error: previous declaration of 'wcwidth' was here Fix this by renaming our static variant to our own name. Signed-off-by: Amos Waterland <apw@us.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 May 2007, 05:02:40 UTC |
| 52c8003 | J. Bruce Fields | 08 May 2007, 03:34:26 UTC | user-manual: fix clone and fetch typos More typo fixes from Santi Béjar, plus a couple other mistakes I noticed along the way. Cc: Santi Béjar <sbejar@gmail.com> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 May 2007, 04:25:09 UTC |
| d966e6a | Shawn O. Pearce | 08 May 2007, 01:13:40 UTC | Properly handle '0' filenames in import-tars Randal L. Schwartz pointed out multiple times that we should be testing the length of the name string here, not if it is "true". The problem is the string '0' is actually false in Perl when we try to evaluate it in this context, as '0' is 0 numerically and the number 0 is treated as a false value. This would cause us to break out of the import loop early if anyone had a file or directory named "0". Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 May 2007, 01:13:40 UTC |
| 53a5824 | Junio C Hamano | 07 May 2007, 21:46:15 UTC | Merge branch 'maint' of git://repo.or.cz/git-gui into maint * 'maint' of git://repo.or.cz/git-gui: git-gui: Allow spaces in path to 'wish' | 07 May 2007, 21:46:15 UTC |
| bff898b | Junio C Hamano | 07 May 2007, 21:40:41 UTC | Merge git://git2.kernel.org/pub/scm/gitk/gitk into maint * git://git2.kernel.org/pub/scm/gitk/gitk: gitk: Allow user to choose whether to see the diff, old file, or new file | 07 May 2007, 21:40:41 UTC |
| 604d7a1 | Jeff King | 07 May 2007, 05:28:34 UTC | Documentation: don't reference non-existent 'git-cvsapplycommit' Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 May 2007, 06:30:38 UTC |
| a1dc34f | J. Bruce Fields | 07 May 2007, 05:01:42 UTC | user-manual: stop deprecating the manual It's just as much a work-in-progress, but at least now it's gotten enough technical review to shake out most of the really bad lies, so hopefully it doesn't do any actual damage. And if we encourage people to read it, they'll be more likely to whine about it, which will help get it fixed faster. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 07 May 2007, 05:03:53 UTC |
| c64415e | J. Bruce Fields | 07 May 2007, 04:56:45 UTC | user-manual: miscellaneous editing I cherry-picked some additional miscellaneous fixes from those suggested by Santi Béjar, including fixes to: - correct discussion of repository/HEAD->repository shortcut - add mention of git-mergetool - add mention of --track - mention "-f" as well as "+" for fetch Cc: Santi Béjar <sbejar@gmail.com> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 07 May 2007, 05:03:53 UTC |
| 58c19d1 | J. Bruce Fields | 07 May 2007, 04:16:33 UTC | user-manual: fix .gitconfig editing examples Santi Béjar points out that when telling people how to "introduce themselves" to git we're advising them to replace their entire .gitconfig file. Fix that. Cc: "Santi Béjar <sbejar@gmail.com> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 07 May 2007, 05:03:53 UTC |
| 5972304 | J. Bruce Fields | 30 April 2007, 15:11:02 UTC | user-manual: clean up fast-forward and dangling-objects sections The previous commit calls attention to the fact that we have two sections each devoted to fast-forwards and to dangling objects. Revise and attempt to differentiate them a bit. Some more reorganization may be required later.... Signed-off-by: J. Bruce Fields | 07 May 2007, 05:03:52 UTC |
| e34caac | J. Bruce Fields | 18 April 2007, 04:46:19 UTC | user-manual: add section ID's Any section lacking an id gets an annoying warning when you build the manual. More seriously, the table of contents then generates volatile id's which change with every build, with the effect that we get URL's that change all the time. The ID's are manually generated and sometimes inconsistent, but that's OK. XXX: what to do about the preface? Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 07 May 2007, 05:03:52 UTC |
| 953f3d6 | J. Bruce Fields | 18 April 2007, 04:20:46 UTC | user-manual: more discussion of detached heads, fix typos Nicolas Pitre pointed out a couple typos and some room for improvement in the discussion of detached heads. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Cc: Nicolas Pitre <nico@cam.org> | 07 May 2007, 05:03:52 UTC |
| e102d43 | Alex Riesen | 04 May 2007, 21:51:32 UTC | Small correction in reading of commit headers Check if a line of the header has enough characters to possibly contain the requested prefix. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 May 2007, 06:46:18 UTC |
| cf593cc | James Bowes | 05 May 2007, 18:23:12 UTC | Documentation: fix typo in git-remote.txt Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 May 2007, 06:10:59 UTC |
| c2a0636 | Junio C Hamano | 06 May 2007, 05:36:19 UTC | Add test for blame corner cases. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 May 2007, 05:40:39 UTC |
| c63777c | Junio C Hamano | 06 May 2007, 04:18:57 UTC | blame: -C -C -C When you do this, existing "blame -C -C" would not find that the latter half of the file2 came from the existing file1: ... both file1 and file2 are tracked ... $ cat file1 >>file2 $ git add file1 file2 $ git commit This is because we avoid the expensive find-copies-harder code that makes unchanged file (in this case, file1) as a candidate for copy & paste source when annotating an existing file (file2). The third -C now allows it. However, this obviously makes the process very expensive. We've actually seen this patch before, but I dismissed it because it covers such a narrow (and arguably stupid) corner case. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 May 2007, 05:40:27 UTC |
| dd166aa | Junio C Hamano | 05 May 2007, 16:13:26 UTC | blame: Notice a wholesale incorporation of an existing file. The -C option to blame tries to find a section of a preimage file by running diff against the lines whose origin is still unknown, and excluding the different parts. The code however did not cover the case where the tail part of the section matched, which we handle for the normal non-move/copy codepath. This breakage was most visible when preimage file matches in its entirety and failed to pass blame in such a case. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 May 2007, 05:40:13 UTC |
| e330a40 | Linus Torvalds | 05 May 2007, 22:18:03 UTC | Fix --boundary output "git log --boundary" incorrectly honoured the option only when "left-right" was enabled. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 May 2007, 04:09:34 UTC |
| 3b559ea | Jakub Narebski | 04 May 2007, 22:48:35 UTC | diff format documentation: describe raw combined diff format Add description of raw combined diff format to diff-formats.txt, as "diff format for merges" section, before "Generating patches..." section. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 23:58:17 UTC |
| 71f4b18 | Carl Worth | 04 May 2007, 18:27:10 UTC | Mention version 1.5.1 in tutorial and user-manual Most other documentation will frequently be read from an installation of git so will naturally be associated with the installed version. But these two documents in particular are often read from web pages while users are still exploring git. It's important to mention version 1.5.1 since these documents provide example commands that won't work with previous versions of git. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 23:58:03 UTC |
| 171af11 | Karl Hasselström | 03 May 2007, 05:51:35 UTC | Add --no-rebase option to git-svn dcommit git-svn dcommit exports commits to Subversion, then imports them back to git again, and last but not least rebases or resets HEAD to the last of the new commits. I guess this rebasing is convenient when using just git, but when the commits to be exported are managed by StGIT, it's really annoying. So add an option to disable this behavior. And document it, too! Signed-off-by: Karl Hasselström <kha@treskal.com> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 22:08:31 UTC |
| cc1793e | Karl Hasselström | 04 May 2007, 07:03:22 UTC | Fix markup in git-svn man page Some of the existing markup was just plain broken, and some subcommand options weren't indented properly. Signed-off-by: Karl Hasselström <kha@treskal.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 22:03:48 UTC |
| e3ad95a | Ismail Dönmez | 01 May 2007, 21:12:13 UTC | gitweb: use decode_utf8 directly Using decode() tries to decode data that is already UTF-8 and borks, but decode_utf8 from Encode.pm has a built-in safety against that. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 06:22:12 UTC |
| c256acb | Bryan Larsen | 02 May 2007, 21:53:23 UTC | posix compatibility for t4200 Fix t4200 so that it also works on OS X by not relying on gnu extensions to sed. Signed-off-by: Bryan Larsen <bryan@larsen.st> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 05:58:01 UTC |
| e4e92b3 | Arjen Laarhoven | 03 May 2007, 18:29:15 UTC | Document 'opendiff' value in config.txt and git-mergetool.txt Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 05:56:23 UTC |
| 5318f69 | Bryan Larsen | 03 May 2007, 22:58:56 UTC | Allow PERL_PATH="/usr/bin/env perl" There is a mechanism PERL_PATH in the Makefile to specify path to Perl binary, but sometimes it is convenient to let 'env' figure out where Perl comes from, with PERL_PATH="/usr/bin/env perl". Allowing this would make things easier to MacPorts, where we wish to work with the MacPorts perl if it is installed, but fall back to the system perl if it isn't. Signed-off-by: Bryan Larsen <bryan@larsen.st> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 05:36:32 UTC |
| 5094102 | Daniel Barkalow | 03 May 2007, 02:49:41 UTC | Make xstrndup common This also improves the implementation to match how strndup is specified (by GNU): if the length given is longer than the string, only the string's length is allocated and copied, but the string need not be null-terminated if it is at least as long as the given length. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 05:28:55 UTC |
| cdda666 | Junio C Hamano | 03 May 2007, 20:00:43 UTC | diff.c: fix "size cache" handling. We broke the size-cache handling when we changed the function signature of sha1_object_info() in 21666f1a. We obviously wanted to cache the size we obtained when sha1_object_info() succeeded, not when it failed. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 05:12:40 UTC |
| 9cf0430 | Alexandre Julliard | 02 May 2007, 12:53:23 UTC | http-fetch: Disable use of curl multi support for libcurl < 7.16. curl_multi_remove_handle() is broken in libcurl < 7.16, in that it doesn't correctly update the active handles count when a request is aborted. This causes the transfer to hang forever waiting for the handle count to become less than the number of active requests. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2007, 05:12:40 UTC |
| 7a33b0b | Junio C Hamano | 02 May 2007, 18:00:16 UTC | Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint * 'maint' of git://repo.or.cz/git/fastimport: Teach import-tars about GNU tar's @LongLink extension. | 02 May 2007, 18:00:16 UTC |
| a7da9ad | Frank Lichtenheld | 02 May 2007, 00:43:14 UTC | cvsserver: Handle re-added files correctly We can't unconditionally assign revision 1.1 to newly added files. In case the file did exist in the past and was deleted we need to honor the old revision number. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 May 2007, 17:41:52 UTC |
| 775477a | Johannes Schindelin | 01 May 2007, 21:42:44 UTC | Teach import-tars about GNU tar's @LongLink extension. This extension allows GNU tar to process file names in excess of the 100 characters defined by the original tar standard. It does this by faking a file, named '././@LongLink' containing the true file name, and then adding the file with a truncated name. The idea is that tar without this extension will write out a file with the long file name, and write the contents into a file with truncated name. Unfortunately, GNU tar does a lousy job at times. When truncating results in a _directory_ name, it will happily use _that_ as a truncated name for the file. An example where this actually happens is gcc-4.1.2, where the full path of the file WeThrowThisExceptionHelper.java truncates _exactly_ before the basename. So, we have to support that ad-hoc extension. This bug was noticed by Chris Riddoch on IRC. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 May 2007, 17:22:34 UTC |
| 681bfd5 | Shawn O. Pearce | 02 May 2007, 16:44:44 UTC | git-gui: Allow spaces in path to 'wish' If the path of our wish executable that are running under contains spaces we need to make sure they are escaped in a proper Tcl list, otherwise we are unable to start gitk. Reported by Randal L. Schwartz on #git. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 May 2007, 16:44:44 UTC |
| adb7b5f | Martin Koegler | 01 May 2007, 09:47:55 UTC | Fix compilation of test-delta The code used write_in_full() without pulling its declarations from the header file. When header is included, usage[] collides with usage() function. Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 May 2007, 09:59:08 UTC |
| b5cc62f | Junio C Hamano | 01 May 2007, 00:09:48 UTC | GIT v1.5.1.3 Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 May 2007, 00:09:48 UTC |
| 928a559 | Jari Aalto | 30 April 2007, 12:37:28 UTC | send-email documentation: clarify --smtp-server It can be either hostname/address, or a full path to a local executable. Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 April 2007, 23:50:55 UTC |
| 34b604a | Jari Aalto | 30 April 2007, 11:21:38 UTC | git.7: Mention preformatted html doc location Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 April 2007, 23:43:12 UTC |
| a7af09d | Jari Aalto | 30 April 2007, 16:04:25 UTC | Clarify SubmittingPatches Checklist Separate things to be checked when making commits, and things to be checked when sending patches. Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 April 2007, 23:39:18 UTC |
| b3cb7e4 | Adam Roben | 29 April 2007, 08:35:27 UTC | git-svn: Add 'find-rev' command This patch adds a new 'find-rev' command to git-svn that lets you easily translate between SVN revision numbers and git tree-ish. Signed-off-by: Adam Roben <aroben@apple.com> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 April 2007, 22:58:37 UTC |
| bcd8ee5 | Junio C Hamano | 29 April 2007, 21:05:54 UTC | Fix symlink handling in git-svn, related to PerlIO After reading the leading contents from a symlink data obtained from subversion, which we expect to begin with 'link ', the code forked to hash the remainder (which should match readlink() result) using git-hash-objects, by redirecting its STDIN from the filehandle we read that 'link ' from. This was Ok with Perl on modern Linux, but on Mac OS, the read in the parent process slurped more than we asked for in stdio buffer, and the child did not correctly see the "remainder". This attempts to fix the issue by using lower level sysseek and sysread instead of seek and read to bypass the stdio buffer. Signed-off-by: Junio C Hamano <junkio@cox.net> Acked-by: Eric Wong <normalperson@yhbt.net> Acked-by: Seth Falcon <sethfalcon@gmail.com> | 30 April 2007, 22:50:13 UTC |
| e9d54bd | Julian Phillips | 29 April 2007, 02:46:42 UTC | http.c: Fix problem with repeated calls of http_init Calling http_init after calling http_cleanup causes a segfault. This is due to the pragma_header curl_slist being freed but not being set to NULL. The subsequent call to http_init tries to setup the slist again, but it now points to an invalid memory location. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 April 2007, 08:34:59 UTC |
| 4e58bf9 | Josh Triplett | 29 April 2007, 01:40:12 UTC | Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation Signed-off-by: Josh Triplett <josh@freedesktop.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 April 2007, 08:34:59 UTC |
| d0c32b6 | Junio C Hamano | 29 April 2007, 07:31:14 UTC | Fix import-tars fix. This heeds advice from our resident Perl expert to make sure the script is not confused with a string that ends with /\n Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 April 2007, 08:34:59 UTC |
| 2342c4e | Junio C Hamano | 29 April 2007, 07:22:00 UTC | Update .mailmap with "Michael" Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 April 2007, 08:34:59 UTC |
| 4e6380e | Junio C Hamano | 28 April 2007, 07:15:48 UTC | Do not barf on too long action description Reflog message is primarily about easier identification, and leaving truncated entry is much better than dying. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 April 2007, 08:33:13 UTC |
| 5b5fe9a | Junio C Hamano | 29 April 2007, 01:15:00 UTC | Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint * 'maint' of git://repo.or.cz/git/fastimport: Don't allow empty pathnames in fast-import import-tars: be nice to wrong directory modes | 29 April 2007, 01:15:00 UTC |
| cb2cada | Shawn O. Pearce | 29 April 2007, 00:29:23 UTC | Catch empty pathnames in trees during fsck Released versions of fast-import have been able to create a tree that contains files or subtrees that contain no name. Unfortunately these trees aren't valid, but people may have actually tried to create them due to bugs in import-tars.perl or their own fast-import frontend. We now look for this unusual condition and warn the user if at least one of their tree objects contains the problem. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 April 2007, 01:06:00 UTC |
| ec771a7 | Shawn O. Pearce | 29 April 2007, 00:05:20 UTC | Merge commit 'jc/maint' into gfi-maint * commit 'jc/maint': (35 commits) Update git-http-fetch documentation Update git-local-fetch documentation Update git-http-push documentation Update -L documentation for git-blame/git-annotate Update git-grep documentation Update git-fmt-merge documentation Document additional options for git-fetch Removing -n option from git-diff-files documentation Start preparing for 1.5.1.3 Sanitize @to recipients. git-svn: Ignore usernames in URLs in find_by_url Document --dry-run and envelope-sender for git-send-email. Allow users to optionally specify their envelope sender. Ensure clean addresses are always used with Net::SMTP Validate @recipients before using it for sendmail and Net::SMTP. Perform correct quoting of recipient names. Change the scope of the $cc variable as it is not needed outside of send_message. Debugging cleanup improvements Prefix Dry- to the message status to denote dry-runs. Document --dry-run parameter to send-email. ... | 29 April 2007, 00:05:20 UTC |
| 475d1b3 | Shawn O. Pearce | 29 April 2007, 00:01:27 UTC | Don't allow empty pathnames in fast-import riddochc on #git noticed corruption caused by import-tars. This was fixed in the prior commit by Dscho, but fast-import was wrong to have allowed a tree to be created with an empty string as the filename. No operating system allows this, and Git itself doesn't accept this into the index. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 April 2007, 00:03:25 UTC |
| 87859f3 | Johannes Schindelin | 28 April 2007, 23:59:47 UTC | import-tars: be nice to wrong directory modes Some tars seem to have modes 0755 for directories, not 01000755. Do not generate an empty object for them, but ignore them. Noticed by riddochc on IRC. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 April 2007, 00:01:36 UTC |
