aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Document core.excludesfile for git-addMichael Hendricks2007-05-17
| | | | | | | | 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>
* git-send-email: allow leading white space on mutt aliasesMichael Hendricks2007-05-16
| | | | | | | | 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>
* format-patch: add MIME-Version header when we add content-type.Jeff King2007-05-16
| | | | | | | When we add Content-Type: header, we should also add MIME-Version: header as well. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fixed link in user-manualSteffen Prohaska2007-05-16
| | | | | | | link to git-mergetool was broken. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'maint' of git://repo.or.cz/git/fastimport into maintJunio C Hamano2007-05-16
|\ | | | | | | | | * 'maint' of git://repo.or.cz/git/fastimport: import-tars: Use the "Link indicator" to identify directories
| * import-tars: Use the "Link indicator" to identify directoriesJohannes Schindelin2007-05-16
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | git name-rev writes beyond the end of malloc() with large generationsAndy Whitcroft2007-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Documentation/branch: fix small typo in -D exampleQuy Tonthat2007-05-14
|/ | | | | Signed-off-by: Quy Tonthat <qtonthat@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Prepare for 1.5.1.5 Release NotesJunio C Hamano2007-05-14
| | | | | | | 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>
* gitweb: Add a few comments about %feature hashJakub Narebski2007-05-14
| | | | | Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-am: Clean up the asciidoc documentationFrank Lichtenheld2007-05-14
| | | | | | | | | | | | | | | | | 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>
* Documentation: format-patch has no --mbox optionFrank Lichtenheld2007-05-14
| | | | | | | | | | | 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>
* builtin-log.c: Fix typo in commentFrank Lichtenheld2007-05-14
| | | | | | | s/fmt-patch/format-patch/ Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix git-clone buglet for remote case.Junio C Hamano2007-05-14
| | | | | | | | | 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>
* git-svn: don't attempt to minimize URLs by defaultEric Wong2007-05-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* git-svn: fix segfaults due to initial SVN pool being clearedEric Wong2007-05-13
| | | | | | | | | | | | | | 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>
* git-svn: clean up caching of SVN::Ra functionsEric Wong2007-05-13
| | | | | | | | | | | | | | | | | | | 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>
* git-svn: don't drop the username from URLs when dcommit is runEric Wong2007-05-13
| | | | | | 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.
* RPM spec: include files in technical/ to package.Quy Tonthat2007-05-13
| | | | | | | | 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>
* Remove stale non-static-inline prototype for tree_entry_extract()Matthieu Castet2007-05-13
| | | | | | | | | | 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>
* git-config: test for 'do not forget "a.b.var" ends "a.var" section'.Steffen Prohaska2007-05-13
| | | | | | | Added test for mentioned bugfix. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-config: do not forget seeing "a.b.var" means we are out of "a.var" section.Junio C Hamano2007-05-13
| | | | | | | | | | | 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>
* checkout: allow detaching to HEAD even when switching to the tip of a branchJunio C Hamano2007-05-12
| | | | | | | | | | | | 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>
* Updated documentation of hooks in git-receive-pack.Jan Hudec2007-05-12
| | | | | | | | | | 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>
* Allow fetching references from any namespaceAlex Riesen2007-05-12
| | | | | | | | | | | | | | | | 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>
* tiny fix in documentation of git-cloneSteffen Prohaska2007-05-12
| | | | | | | path in example was missing '../' Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix an unmatched comment end in arm/sha1_arm.SMarco Costalba2007-05-12
| | | | | | Signed-off-by: Marco Costalba <mcostalba@gmail.com> Acked-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'maint' of git://repo.or.cz/git/fastimport into maintJunio C Hamano2007-05-10
|\ | | | | | | | | | | * 'maint' of git://repo.or.cz/git/fastimport: Fix documentation of tag in git-fast-import.txt Properly handle '0' filenames in import-tars
| * Fix documentation of tag in git-fast-import.txtRichard P. Curnow2007-05-10
| | | | | | | | | | | | | | 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>
| * Merge branch 'gfi-maint' into maintShawn O. Pearce2007-05-10
| |\ | | | | | | | | | | | | * gfi-maint: Properly handle '0' filenames in import-tars
| | * Properly handle '0' filenames in import-tarsShawn O. Pearce2007-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | .mailmap: add some aliasesJunio C Hamano2007-05-10
| | |
* | | SPECIFYING RANGES typo fix: it it => it isJari Aalto2007-05-10
| | | | | | | | | | | | | | | Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | git-clone: don't get fooled by $PWDJunio C Hamano2007-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Fix documentation of tag in git-fast-import.txtRichard P. Curnow2007-05-09
|/ / | | | | | | | | | | | | 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>
* | GIT v1.5.1.4v1.5.1.4Junio C Hamano2007-05-08
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add howto files to rpm packages.Quy Tonthat2007-05-08
| | | | | | | | | | | | | | | | 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>
* | wcwidth redeclarationAmos Waterland2007-05-07
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | user-manual: fix clone and fetch typosJ. Bruce Fields2007-05-07
|/ | | | | | | | | 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>
* Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano2007-05-07
|\ | | | | | | | | * 'maint' of git://repo.or.cz/git-gui: git-gui: Allow spaces in path to 'wish'
| * git-gui: Allow spaces in path to 'wish'Shawn O. Pearce2007-05-02
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge git://git2.kernel.org/pub/scm/gitk/gitk into maintJunio C Hamano2007-05-07
|\ \ | | | | | | | | | | | | * git://git2.kernel.org/pub/scm/gitk/gitk: gitk: Allow user to choose whether to see the diff, old file, or new file
| * | gitk: Allow user to choose whether to see the diff, old file, or new filePaul Mackerras2007-04-19
| | | | | | | | | | | | | | | | | | | | | This adds a set of radiobuttons that select between displaying the full diff (both - and + lines), the old file (suppressing the + lines) and the new file (suppressing the - lines) in the diff display window. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | Documentation: don't reference non-existent 'git-cvsapplycommit'Jeff King2007-05-06
| | | | | | | | | | | | | | | Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | user-manual: stop deprecating the manualJ. Bruce Fields2007-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | user-manual: miscellaneous editingJ. Bruce Fields2007-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | user-manual: fix .gitconfig editing examplesJ. Bruce Fields2007-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | user-manual: clean up fast-forward and dangling-objects sectionsJ. Bruce Fields2007-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | user-manual: add section ID'sJ. Bruce Fields2007-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | user-manual: more discussion of detached heads, fix typosJ. Bruce Fields2007-05-07
| | | | | | | | | | | | | | | | | | | | | | | | 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>