| 8c4e4ef | Junio C Hamano | 31 January 2007, 23:06:21 UTC | GIT v1.5.0-rc3 Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 January 2007, 23:41:49 UTC |
| bfcd4ca | Junio C Hamano | 31 January 2007, 23:41:27 UTC | Do not use hardcoded path to xhmtl.xsl to generate user's manual It does not seem to need it either and gives an error on FC5 I use at kernel.org to cut documentation tarballs, so remove it in the meantime. Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 January 2007, 23:41:45 UTC |
| c0b4a00 | Junio C Hamano | 31 January 2007, 22:53:51 UTC | git main documentation: point at the user's manual. Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 January 2007, 22:53:51 UTC |
| 9299c4f | Junio C Hamano | 31 January 2007, 22:41:17 UTC | Merge branch 'master' of git://linux-nfs.org/~bfields/git This is in the hope of giving JBF's user-manual wider exposure. I am not very happy with trailing whitespaces in the new document, but let's not worry too much about the formatting issues for now, but concentrate more on the structure and the contents. | 31 January 2007, 22:43:30 UTC |
| 3c23d66 | Junio C Hamano | 31 January 2007, 22:25:52 UTC | t9200: do not test -x bit if the filesystem does not support it. The last test in t9200 wants to see if executable bit is retained, which has no chance of succeeding on a filesystem that does not handle executable bit correctly. Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 January 2007, 22:25:52 UTC |
| 1a91ebf | Junio C Hamano | 31 January 2007, 22:21:48 UTC | t9200: Re-code non-ascii path test in UTF-8 For the purpose of this test we do not really care if the paths are in latin-1, but people on Cygwin seem to be having problem on foreign-looking pathnames that do not play well with their locale. Let's try to re-code them in UTF-8 and see who screams, thanks, or reports no-improvements. Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 January 2007, 22:21:48 UTC |
| 8933364 | Aneesh Kumar K.V | 30 January 2007, 07:56:51 UTC | Update git-cat-file documentation Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 January 2007, 21:32:38 UTC |
| 84a978f | Junio C Hamano | 31 January 2007, 21:30:54 UTC | Documentation: "git-checkout <tree> <path>" takes any tree-ish Especially, it is not limited to branch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 January 2007, 21:30:54 UTC |
| 6e598c3 | David Kågedal | 31 January 2007, 16:12:03 UTC | Improved error message from git-rebase If the index wasn't clean, git-rebase would simply show the output from git-diff-index with no further comment to the user. Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 January 2007, 21:16:52 UTC |
| 9ebe6cf | Alex Riesen | 31 January 2007, 13:34:17 UTC | Fix git-update-index to work with relative pathnames. In particular, it fixes the following (typical for cygwin) problem: $ git-update-index --chmod=-x ../wrapper/Jamfile fatal: git-update-index: cannot chmod -x '../wrapper/Jamfile' Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 January 2007, 21:14:32 UTC |
| 4a91a1f | Shawn O. Pearce | 30 January 2007, 18:11:49 UTC | Escape --upload-pack from expr. Recent commit ae1dffcb28ee89a23f8d2747be65e17c8eab1690 by Junio changed the way --upload-pack was passed around between clone, fetch and ls-remote and modified the handling of the command line parameter parsing. Unfortunately FreeBSD 6.1 insists that the expression expr --upload-pack=git-upload-pack : '-[^=]*=\(.*\)' is illegal, as the --upload-pack option is not supported by their implementation of expr. Elsewhere in Git we use z as a leading prefix of both arguments, ensuring the -- isn't seen by expr. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 January 2007, 21:09:58 UTC |
| 76f8a30 | Shawn O. Pearce | 31 January 2007, 07:24:44 UTC | Don't coredump on bad refs in update-server-info. Apparently if we are unable to parse an object update-server-info coredumps, as it doesn't bother to check the return value of its call to parse_object. Instead of coredumping, skip the ref. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 January 2007, 21:09:58 UTC |
| d117452 | Nicolas Pitre | 31 January 2007, 19:10:37 UTC | tone down the detached head warning This is not meant to frighten people or even to suggest they might be doing something wrong, but rather to notify them of a state change and provide a likely option in the case this state was entered by mistake. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 January 2007, 21:09:57 UTC |
| 63460f2 | Junio C Hamano | 31 January 2007, 05:03:11 UTC | Fix git-tag -u ... which I broke when we introduced user.signingkey configuration. There was no reason to add a new variable keyid to the script. Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 January 2007, 05:03:11 UTC |
| 0b375ab | J. Bruce Fields | 30 January 2007, 17:48:48 UTC | user-manual: todo's Update todo's. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 30 January 2007, 17:48:48 UTC |
| a8cd140 | J. Bruce Fields | 30 January 2007, 17:43:36 UTC | user-manual: point to README for gitweb information I'd like complete gitweb setup instructions some day, but for now just refer to the gitweb README. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 30 January 2007, 17:43:36 UTC |
| 73a2acc | Aneesh Kumar K.V | 30 January 2007, 07:56:49 UTC | blameview: Use git-cat-file to read the file content. Fix blameview to use git-cat-file to read the file content. This make sure we show the right content when we have modified file in the working directory which is not committed. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 January 2007, 10:32:28 UTC |
| 153e98d | Santi Béjar | 30 January 2007, 09:36:24 UTC | git-fetch: Allow fetching the remote HEAD ... with: $ git fetch ${remote} HEAD Also $ git fetch ${remote} :${localref} worked, but $ git fetch ${remote} HEAD:{localref} didn't. Now both are equivalent. Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 January 2007, 10:30:25 UTC |
| 3740b04 | Junio C Hamano | 30 January 2007, 10:22:37 UTC | git-send-email: remove debugging output. rfc2047 unquoter spitted out an annoying "- unquoted" which was added during debugging but I forgot to remove. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 January 2007, 10:30:25 UTC |
| f830641 | Johannes Sixt | 24 January 2007, 15:03:42 UTC | Add a missing fork() error check. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 January 2007, 10:30:25 UTC |
| 1732a1f | Junio C Hamano | 30 January 2007, 01:36:22 UTC | git-blame: somewhat better commenting. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 January 2007, 03:41:21 UTC |
| b4dfefe | Mark Wooding | 29 January 2007, 15:48:06 UTC | Make fsck and fsck-objects be builtins. The earlier change df391b192 to rename fsck-objects to fsck broke fsck-objects. This should fix it again. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 January 2007, 17:36:21 UTC |
| dbaa06a | Junio C Hamano | 29 January 2007, 09:06:27 UTC | git-commit -s: no extra space when sign-offs appear at the end already. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 January 2007, 09:06:27 UTC |
| def2747 | Simon 'corecode' Schubert | 29 January 2007, 08:09:25 UTC | Replace perl code with pure shell code Signed-off-by: Simon 'corecode' Schubert <corecode@fs.ei.tum.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 January 2007, 09:05:01 UTC |
| a2f9fe9 | Junio C Hamano | 29 January 2007, 08:57:07 UTC | lock_any_ref_for_update(): do not accept malformatted refs. We used to use lock_any_ref_for_update() because the command needs to also update HEAD (which is not under refs/, so lock_ref_sha1() cannot be used). The function however did not check for refs with illegal characters in them. Use check_ref_format() to catch malformed refs. For this check, we specifically do not want to say having less than two levels in the name is illegal to allow HEAD (and perhaps other special refs in the future). Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 January 2007, 08:57:07 UTC |
| 036be17 | Junio C Hamano | 29 January 2007, 07:16:46 UTC | Two small typofixes. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 January 2007, 07:18:53 UTC |
| d55ae92 | J. Bruce Fields | 29 January 2007, 07:16:45 UTC | user-manual: SHA1 -> object name Prefer "object name" to SHA1, at least in higher level documentation. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 29 January 2007, 07:16:45 UTC |
| 4a7979c | J. Bruce Fields | 29 January 2007, 06:55:33 UTC | user-manual: document git-show-branch example Document Junio's show-branch trick for finding out which tags are descendents of a given comit. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 29 January 2007, 07:00:35 UTC |
| 9a24122 | J. Bruce Fields | 29 January 2007, 06:43:33 UTC | user-manual: minor "TODO" updates I still really want a section on interoperability with CVS, subversion, etc., but I'm not getting around to it very fast, so just add this to the TODO section for now. And a few other minor todo updates. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 29 January 2007, 06:43:33 UTC |
| 1191ee1 | J. Bruce Fields | 29 January 2007, 06:33:55 UTC | user-manual: rewrap a few long lines Rewrap some long lines. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 29 January 2007, 06:33:55 UTC |
| 559e4d7 | J. Bruce Fields | 29 January 2007, 06:31:35 UTC | user-manual: reflogs, other recovery Add a brief discussion of reflogs. Also recovery of dangling commits seems to fit in here, so move some of the discussion out of Linus's email to here. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 29 January 2007, 06:31:35 UTC |
| 61b4179 | J. Bruce Fields | 29 January 2007, 05:45:33 UTC | user-manual: fix a header level Oops. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 29 January 2007, 05:45:33 UTC |
| 988b27d | J. Bruce Fields | 29 January 2007, 05:33:57 UTC | user-manual: typo fix Oops Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 29 January 2007, 05:33:57 UTC |
| fc90c53 | J. Bruce Fields | 29 January 2007, 05:17:51 UTC | user-manual: add references to git-config man page Direct editing of config files may be more natural for users than using the git-config commandline; but we should still reference the git-config man page when we describe such editing, so people know where to go for details on the config file syntax and meanings of the variables. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 29 January 2007, 05:17:51 UTC |
| 9d13bda | J. Bruce Fields | 29 January 2007, 04:50:22 UTC | user-manual: repo-config -> config Looks like we're going to allow git-config as the preferred alias to git-repo-config, so let's document that instead. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 29 January 2007, 04:50:22 UTC |
| 04e50e9 | J. Bruce Fields | 29 January 2007, 04:31:47 UTC | user-manual: fsck-objects -> fsck There seems to be an agreement to rename fsck-objects to fsck. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 29 January 2007, 04:31:47 UTC |
| 21dcb3b | J. Bruce Fields | 29 January 2007, 04:29:19 UTC | user-manual: git-fsck, dangling objects Initial import of fsck and dangling objects discussion, mostly lifted from an email from Linus. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 29 January 2007, 04:29:19 UTC |
| df391b1 | Junio C Hamano | 29 January 2007, 00:33:58 UTC | git-fsck-objects is now synonym to git-fsck Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 January 2007, 00:33:58 UTC |
| e0d10e1 | Tom Prince | 29 January 2007, 00:16:53 UTC | [PATCH] Rename git-repo-config to git-config. Signed-off-by: Tom Prince <tom.prince@ualberta.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 January 2007, 00:16:53 UTC |
| 829a686 | Andy Parkins | 26 January 2007, 09:01:04 UTC | Heavily expanded update hook to send more useful emails than the old hook I know it's only an example, but having this might save someone else the trouble of writing an enhanced version for themselves. It basically does the same job as the old update hook, but with these differences: * The recipients list is read from the repository config file from hooks.mailinglist * Updating unannotated tags can be allowed by setting hooks.allowunannotated * Announcement emails (via annotated tag creation) can be sent to a different mailing list by setting hooks.announcelist * Output email is more verbose and generates specific content depending on whether the ref is a tag, an annotated tag, a branch, or a tracking branch * The email is easier to filter; the subject line is prefixed with [SCM] and a project description pulled from the "description" file * It catches (and displays differently) branch updates that are performed with a --force Obviously, it's nothing that clever - it's the update hook I use on my repositories but I've tried to keep it general, and tried to make the output always relevant to the type of update. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 January 2007, 22:38:11 UTC |
| a69aba6 | Andy Parkins | 26 January 2007, 08:58:48 UTC | UNIX reference time of 1970-01-01 00:00 is UTC timezone, not local time zone I got bitten because in the UK (where one would expect 1970-01-01 00:00 to be UTC 0) some politicians decided to mess around with daylight savings time from 1968 to 1971; it was permanently BST (+0100). That means that on my computer the following is true: $ date --date="1970-01-01 00:00" +"%F %T %z (%Z)" 1970-01-01 00:00:00 +0100 (BST) This of course means that the --date argument to date is specified in local time, not UTC. So when the hooks--update script does this: date=$(date --date="1970-01-01 00:00:00 $ts seconds") It's actually saying (in my timezone) "1970-01-01 01:00:00 UTC" + $ts. Clearly this is wrong. The UNIX epoch started at midnight UTC not 1am UTC. This leads to the tagged time in hooks--update being shown as one hour earlier than the true tagged time (in my timezone). The problem would be worse for other timezones. For a +1300 timezone on 1970-01-01, the tagged time would be 13 hours earlier. Oops. The solution is to force the reference time to UTC, which is what this patch does. In my timezone: $ date --date="1970-01-01 00:00 +0000" +"%F %T %z (%Z)" 1970-01-01 01:00:00 +0100 (BST) Much better. Signed-off-by: Andy Parkins <andyparkins@gmail.com> | 28 January 2007, 22:35:50 UTC |
| 5558e55 | Shawn O. Pearce | 28 January 2007, 07:39:13 UTC | Teach for-each-ref about a little language called Tcl. Love it or hate it, some people actually still program in Tcl. Some of those programs are meant for interfacing with Git. Programs such as gitk and git-gui. It may be useful to have Tcl-safe output available from for-each-ref, just like shell, Perl and Python already enjoy. Thanks to Sergey Vlasov for pointing out the horrible flaws in the first and second version of this patch, and steering me in the right direction for Tcl value quoting. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 January 2007, 21:00:26 UTC |
| cace16f | Jeff King | 28 January 2007, 20:53:26 UTC | Add a sample program 'blameview' to show how to use git-blame --incremental Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 January 2007, 20:53:26 UTC |
| 4b3b1e1 | Linus Torvalds | 21 January 2007, 19:04:13 UTC | git-push through git protocol This allows pushing over the git:// protocol, and while it's not authenticated, it could make sense from within a firewalled setup where nobody but trusted internal people can reach the git port. git-daemon is possibly easier and faster to set up in the kind of situation where you set up git instead of CVS inside a company. "git-receive-pack" is disabled by default, so you need to enable it explicitly by starting git-daemon with the "--enable=receive-pack" command line argument, or by having your config enable it automatically. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 January 2007, 20:31:56 UTC |
| 57e7a0a | Junio C Hamano | 28 January 2007, 20:21:53 UTC | Document 'git-blame --incremental' Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 January 2007, 20:26:21 UTC |
| 4f193f2 | Mark Wooding | 28 January 2007, 15:17:36 UTC | Documentation/config.txt: Fix documentation of colour config tweaks. * The description of valid colour specifications was rather incomplete, so fix it so that it actually describes colour specs as accepted by color_parse(). * The list of colour items allowed in color.diff.BLAH was missing the `commit' and `whitespace' entries. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 January 2007, 19:06:59 UTC |
| c3e821c | Mark Wooding | 28 January 2007, 14:55:03 UTC | wt-status: Actually accept `color.status.BLAH' configuration variables. A stupid typo stopped this from working. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 January 2007, 19:04:44 UTC |
| 4f0219a | Ren,Ai(B Scharfe | 28 January 2007, 14:25:55 UTC | git-blame --incremental: don't use pager Starting a pager defeats the purpose of the incremental output mode. This changes git-blame to only paginate if --incremental was not given. git -p blame --incremental still starts the pager, though. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 January 2007, 19:00:57 UTC |
| 1b600e6 | Shawn O. Pearce | 27 January 2007, 06:54:21 UTC | Compute accurate distances in git-describe before output. My prior change to git-describe attempts to print the distance between the input commit and the best matching tag, but this distance was usually only an estimate as we always aborted revision walking as soon as we overflowed the configured limit on the number of possible tags (as set by --candidates). Displaying an estimated distance is not very useful and can just be downright confusing. Most users (heck, most Git developers) don't immediately understand why this distance differs from the output of common tools such as `git rev-list | wc -l`. Even worse, the estimated distance could change in the future (including decreasing despite no rebase occuring) if we find more possible tags earlier on during traversal. (This could happen if more tags are merged into the branch between queries.) These factors basically make an estimated distance useless. Fortunately we are usually most of the way through an accurate distance computation by the time we abort (due to reaching the current --candidates limit). This means we can simply finish counting out the revisions still in our commit queue to present the accurate distance at the end. The number of commits remaining in the commit queue is probably less than the number of commits already traversed, so finishing out the count is not likely to take very long. This final distance will then always match the output of `git rev-list | wc -l`. We can easily reduce the total number of commits that need to be walked at the end by stopping as soon as all of the commits in the commit queue are flagged as being merged into the already selected best possible tag. If that's true then there are no remaining unseen commits which can contribute to our best possible tag's depth counter, so further traversal is useless. Basic testing on my Mac OS X system shows there is no noticable performance difference between this accurate distance counting version of git-describe and the prior version of git-describe, at least when run on git.git. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 January 2007, 10:08:51 UTC |
| 1891261 | Junio C Hamano | 27 January 2007, 07:24:07 UTC | Update describe documentation. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 January 2007, 10:08:51 UTC |
| 237fb6c | Shawn O. Pearce | 25 January 2007, 17:39:54 UTC | Teach git-describe to display distances from tags. If you get two different describes at different times from a non-rewinding branch and they both come up with the same tag name, you can tell which is the 'newer' one by distance. This is rather common in practice, so its incredibly useful. [jc: still needs documentation and fixups when traversal gives up early.] Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 January 2007, 10:08:51 UTC |
| 46e5e69 | Junio C Hamano | 28 January 2007, 09:42:31 UTC | git-blame --porcelain: quote filename in c-style when needed. Otherwise a pathname that has funny characters such as LF would screw up the parsing programs of the output. Strictly speaking, this is not backward compatible, but the current output for pathnames that have embedded LF and such cannot be sanely parsed anyway, and pathnames that only use characters from the portable pathname character set won't be affected. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 January 2007, 10:04:48 UTC |
| 717d146 | Linus Torvalds | 28 January 2007, 09:34:06 UTC | git-blame --incremental This adds --incremental option to help GUI porcelains to show the result from git-blame incrementally. The output gives the origin information in the same format as the porcelain format. The first line has commit object name, the line number of the first line in the group in the original file, the line number of that file in the final image, and number of lines in the group. Then subsequent lines show the metainformation for the commit when the commit is shown for the first time, except the filename information is always shown (we cannot even make it conditional to -C option as blame always follows the renaming of the file wholesale). Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 January 2007, 10:04:48 UTC |
| 0175476 | Junio C Hamano | 28 January 2007, 08:50:53 UTC | Don't force everybody to call setup_ident(). Back when only handful commands that created commit and tag were the only users of committer identity information, it made sense to explicitly call setup_ident() to pre-fill the default value from the gecos information. But it is much simpler for programs to make the call automatic when get_ident() is called these days, since many more programs want to use the information when updating the reflog. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 January 2007, 09:58:50 UTC |
| 903b45f | Nicolas Pitre | 28 January 2007, 03:40:36 UTC | git-log -g --pretty=oneline should display the reflog message In the context of reflog output the reflog message is more useful than the commit message's first line. When relevant the reflog message will contain that line anyway. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 January 2007, 09:54:42 UTC |
| 16507fc | Bill Lear | 27 January 2007, 13:21:53 UTC | Document --check option to git diff. Signed-off-by: Bill Lear <rael@zopyra.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 January 2007, 21:46:59 UTC |
| d67778e | Andy Parkins | 26 January 2007, 14:13:46 UTC | Allow the tag signing key to be specified in the config file I did this: $ git tag -s test-sign gpg: skipped "Andy Parkins <andyparkins@gmail.com>": secret key not available gpg: signing failed: secret key not available failed to sign the tag with GPG. The problem is that I have used the comment field in my key's UID definition. $ gpg --list-keys andy pub 1024D/4F712F6D 2003-08-14 uid Andy Parkins (Google) <andyparkins@gmail.com> So when git-tag looks for "Andy Parkins <andyparkins@gmail.com>"; obviously it's not going to be found. There shouldn't be a requirement that I use the same form of my name in my git repository and my gpg key - I might want to be formal (Andrew) in my gpg key and informal (Andy) in the repository. Further I might have multiple keys in my keyring, and might want to use one that doesn't match up with the address I use in commit messages. This patch adds a configuration entry "user.signingkey" which, if present, will be passed to the "-u" switch for gpg, allowing the tag signing key to be overridden. If the entry is not present, the fallback is the original method, which means existing behaviour will continue untouched. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 January 2007, 21:46:59 UTC |
| f127404 | Andy Parkins | 26 January 2007, 14:28:55 UTC | If abbrev is set to zero in git-describe, don't add the unique suffix When on a non-tag commit, git-describe normally outputs descriptions of the form v1.0.0-g1234567890 Some scripts (for example the update hook script) might just want to know the name of the nearest tag, so they then have to do x=$(git-describe HEAD | sed 's/-g*//') This is costly, but more importantly is fragile as it is relying on the output format of git-describe, which we would then have to maintain forever. This patch adds support for setting the --abbrev option to zero. In that case git-describe does as it always has, but outputs only the nearest found tag instead of a completely unique name. This means that scripts would not have to parse the output format and won't need changing if the git-describe suffix is ever changed. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 January 2007, 06:38:52 UTC |
| eb3204d | Nicolas Pitre | 26 January 2007, 16:50:06 UTC | fix suggested branch creation command when detaching head Doing: $ git checkout HEAD^ Generates the following message: |warning: you are not on ANY branch anymore. |If you meant to create a new branch from the commit, you need -b to |associate a new branch with the wanted checkout. Example: | git checkout -b <new_branch_name> HEAD^ Of course if the user does as told at this point the created branch won't be located at the expected commit. Reword this message a bit to avoid such confusion. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 January 2007, 06:38:00 UTC |
| b181d57 | J. Bruce Fields | 27 January 2007, 06:03:07 UTC | user-manual: reorganize fetch discussion, add internals, etc. Keep git remote discussion in the first chapter, but postpone lower-level git fetch usage (to fetch individual branches) till later. Import a bunch of slightly modified text from the readme to give an architectural overview at the end. Add more discussion of history rewriting. And a bunch of other miscellaneous changes.... Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 27 January 2007, 06:12:19 UTC |
| d848804 | Junio C Hamano | 27 January 2007, 01:39:03 UTC | write_in_full: size_t is unsigned. It received the return value from xwrite() in a size_t variable 'written' and expected comparison with 0 would catch an error from xwrite(). Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 January 2007, 01:39:03 UTC |
| 8a56da2 | Junio C Hamano | 27 January 2007, 01:00:57 UTC | create_symref: check error return from open(). Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 January 2007, 01:00:57 UTC |
| 40d6dc0 | Alexandre Julliard | 26 January 2007, 10:57:50 UTC | vc-git.el: Take into account the destination name in vc-checkout. This is necessary for vc-version-other-window. Based on a patch by Sam Vilain <sam.vilain@catalyst.net.nz>. Currently, the vc-git-checkout function uses `git checkout' to fetch a file from the git repository to the working copy. However, it is completely ignoring the input argument that specifies the destination file. `git-checkout' does not support specifying this, so we have to use `git-cat-file', capture the output in a buffer and then save it. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 January 2007, 23:38:27 UTC |
| 7f9acb2 | Junio C Hamano | 26 January 2007, 23:09:02 UTC | git-merge: leave sensible reflog message when used as the first level UI. It used to throw potentially multi-line log message at reflog. Just record the heads that were given to be merged at the command line and the action. Revert the removal of the check in "git-update-ref -m" I made earlier which was only a work-around for this. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 January 2007, 23:38:21 UTC |
| 8ac6593 | Junio C Hamano | 26 January 2007, 10:26:04 UTC | Make sure we do not write bogus reflog entries. The file format dictates that entries are LF terminated so the message cannot have one in it. Chomp the message to make sure it only has a single line if necessary, while removing the leading whitespace. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 January 2007, 10:26:04 UTC |
| 8a8169c | Shawn O. Pearce | 25 January 2007, 17:40:03 UTC | Remove unnecessary found variable from describe. Junio added the found variable to enforce commit date order when two tags have the same distance from the requested commit. Except it is unnecessary as match_cnt is already used to record how many possible tags have been identified thus far. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 January 2007, 08:08:48 UTC |
| 007e2ba | Jason Riedy | 25 January 2007, 21:11:40 UTC | Use inttypes.h rather than stdint.h. Older Solaris machines lack stdint.h but have inttypes.h. The standard has inttypes.h including stdint.h, so at worst this pollutes the namespace a bit. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 January 2007, 08:03:23 UTC |
| af67e91 | Junio C Hamano | 26 January 2007, 06:51:49 UTC | Documentation: pack-refs --all vs default behaviour Document the recommended way to prime a repository with tons of references with 'pack-refs --all -prune'. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 January 2007, 08:02:51 UTC |
| df373ea | Junio C Hamano | 26 January 2007, 06:14:45 UTC | show-branch -g: default to HEAD Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 January 2007, 06:31:10 UTC |
| a9eefb3 | Linus Torvalds | 26 January 2007, 05:55:34 UTC | Add dangling objects tips. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 January 2007, 06:03:37 UTC |
| ae9c6ff | Junio C Hamano | 26 January 2007, 05:50:49 UTC | parse-remote: do not barf on a remote shorthand without any refs to fetch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 January 2007, 06:03:16 UTC |
| e1b1611 | Jeff King | 26 January 2007, 04:48:58 UTC | diffcore-pickaxe: fix infinite loop on zero-length needle The "contains" algorithm runs into an infinite loop if the needle string has zero length. The loop could be modified to handle this, but it makes more sense to simply have an empty needle return no matches. Thus, a command like git log -S produces no output. We place the check at the top of the function so that we get the same results with or without --pickaxe-regex. Note that until now, git log -S --pickaxe-regex would match everything, not nothing. Arguably, an empty pickaxe string should simply produce an error message; however, this is still a useful assertion to add to the algorithm at this layer of the code. Noticed by Bill Lear. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 January 2007, 05:17:19 UTC |
| 11e016a | J. Bruce Fields | 26 January 2007, 05:17:12 UTC | user-manual: stub discussion of fsck and reflog Have some sort of recovery/reliability section that deals with reflog and fsck. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> | 26 January 2007, 05:17:12 UTC |
| cb280e1 | Junio C Hamano | 26 January 2007, 03:05:01 UTC | Allow non-developer to clone, checkout and fetch more easily. The code that uses committer_info() in reflog can barf and die whenever it is asked to update a ref. And I do not think calling ignore_missing_committer_name() upfront like recent receive-pack did in the aplication is a reasonable workaround. What the patch does. - git_committer_info() takes one parameter. It used to be "if this is true, then die() if the name is not available due to bad GECOS, otherwise issue a warning once but leave the name empty". The reason was because we wanted to prevent bad commits from being made by git-commit-tree (and its callers). The value 0 is only used by "git var -l". Now it takes -1, 0 or 1. When set to -1, it does not complain but uses the pw->pw_name when name is not available. Existing 0 and 1 values mean the same thing as they used to mean before. 0 means issue warnings and leave it empty, 1 means barf and die. - ignore_missing_committer_name() and its existing caller (receive-pack, to set the reflog) have been removed. - git-format-patch, to come up with the phoney message ID when asked to thread, now passes -1 to git_committer_info(). This codepath uses only the e-mail part, ignoring the name. It used to barf and die. The other call in the same program when asked to add signed-off-by line based on committer identity still passes 1 to make sure it barfs instead of adding a bogus s-o-b line. - log_ref_write in refs.c, to come up with the name to record who initiated the ref update in the reflog, passes -1. It used to barf and die. The last change means that git-update-ref, git-branch, and commit walker backends can now be used in a repository with reflog by somebody who does not have the user identity required to make a commit. They all used to barf and die. I've run tests and all of them seem to pass, and also tried "git clone" as a user whose GECOS is empty -- git clone works again now (it was broken when reflog was enabled by default). But this definitely needs extra sets of eyeballs. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 January 2007, 05:16:58 UTC |
| fd73423 | Sam Vilain | 25 January 2007, 23:41:23 UTC | contrib/emacs/vc-git.el: support vc-version-other-window Currently, the vc-git-checkout function uses `git checkout' to fetch a file from the git repository to the working copy. However, it is completely ignoring the input argument that specifies the destination file. `git-checkout' does not support specifying this, so we have to use `git-cat-file', capture the output in a buffer and then save it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 January 2007, 03:27:03 UTC |
| 1b55593 | Linus Torvalds | 26 January 2007, 00:51:21 UTC | Fix seriously broken "git pack-refs" Do *NOT* try this on a repository you care about: git pack-refs --all --prune git pack-refs because while the first "pack-refs" does the right thing, the second pack-refs will totally screw you over. This is because the second one tries to pack only tags; we should also pack what are already packed -- otherwise we would lose them. [jc: with an additional test] Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 January 2007, 03:16:07 UTC |
| 535514f | Andy Parkins | 22 January 2007, 10:56:27 UTC | New files in git weren't being downloaded during CVS update If a repository was checked out via git-cvsserver and then later a new file is added to the git repository via some other method; a CVS update wasn't fetching the new file. It would be reported as a new file as A some/dir/newfile.c but would never appear in the directory. The problem seems to be that git-cvsserver was treating these two cases identically, as "A" type results. 1. New file in repository 2. New file locally In fact, traditionally, case 1 is treated as a "U" result, and case 2 only is treated as an "A" result. "A", should just report that the file is added locally and then skip that file during an update as there is (of course) nothing to send. In both these cases there is no working revision, so the checking for "is there no working revision" will return true. The test for case 2 needs refining to say "if there is no working revision and no upstream revision". This patch does just that, leaving case 1 to be handled by the normal "U" handler. I've also updated the log message to more accurately describe the operation. i.e. that "A" means that content is scheduled for addition; not that it actually has been added. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 January 2007, 07:38:55 UTC |
| 5dee29a | Uwe Kleine-König | 25 January 2007, 04:45:39 UTC | make --upload-pack option to git-fetch configurable This introduces the config item remote.<name>.uploadpack to override the default value (which is "git-upload-pack"). Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 January 2007, 07:06:30 UTC |
| e28714c | Junio C Hamano | 25 January 2007, 01:02:15 UTC | Consolidate {receive,fetch}.unpackLimit This allows transfer.unpackLimit to specify what these two configuration variables want to set. We would probably want to deprecate the two separate variables, as I do not see much point in specifying them independently. Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 January 2007, 02:08:02 UTC |
| af7cf26 | Junio C Hamano | 25 January 2007, 00:47:24 UTC | fetch-pack: remove --keep-auto and make it the default. This makes git-fetch over git native protocol to automatically decide to keep the downloaded pack if the fetch results in more than 100 objects, just like receive-pack invoked by git-push does. This logic is disabled when --keep is explicitly given from the command line, so that a very small clone still keeps the downloaded pack as before. The 100 threshold can be adjusted with fetch.unpacklimit configuration. We might want to introduce transfer.unpacklimit to consolidate the two unpacklimit variables, which will be a topic for the next patch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 January 2007, 02:08:02 UTC |
| 9e10fd1 | Junio C Hamano | 23 January 2007, 06:37:33 UTC | Allow fetch-pack to decide keeping the fetched pack without exploding With --keep-auto option, fetch-pack decides to keep the pack without exploding it just like receive-pack does. We may want to later make this the default. Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 January 2007, 02:08:02 UTC |
| a69e542 | Junio C Hamano | 23 January 2007, 05:55:18 UTC | Refactor the pack header reading function out of receive-pack.c Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 January 2007, 02:08:02 UTC |
| 196055c | Alex Riesen | 23 January 2007, 15:51:18 UTC | Allow default core.logallrefupdates to be overridden with template's config Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 January 2007, 01:33:25 UTC |
| ae1dffc | Junio C Hamano | 23 January 2007, 08:51:53 UTC | ls-remote and clone: accept --upload-pack=<path> as well. This makes them consistent with other commands that take the path to the upload-pack program. We also pass --upload-pack instead of --exec to the underlying fetch-pack, although it is not strictly necessary. [jc: original motivation from Uwe] Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 January 2007, 00:12:15 UTC |
| 27dca07 | Uwe Kleine-König | 23 January 2007, 08:20:17 UTC | rename --exec to --upload-pack for fetch-pack and peek-remote Just some option name disambiguation. This is the counter part to commit d23842fd which made a similar change for push and send-pack. --exec continues to work. Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 January 2007, 00:12:15 UTC |
| 497171e | Peter Eriksen | 24 January 2007, 19:54:46 UTC | Documentation: --amend cannot be combined with -c/-C/-F. We used to get the following confusing error message: $ git commit --amend -a -m foo Option -m cannot be combined with -c/-C/-F This is because --amend cannot be combined with -c/-C/-F, which makes sense, because they try to handle the same log message in different ways. So update the documentation to reflect this. Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 January 2007, 23:32:52 UTC |
| 191453f | Jakub Narebski | 24 January 2007, 14:14:33 UTC | Documentation/config.txt: Correct info about subsection name Contrary to variable values, in subsection names parsing character escape codes (besides literal escaping of " as \", and \ as \\) is not performed; subsection name cannot contain newlines. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 January 2007, 23:30:37 UTC |
| eda95d9 | Junio C Hamano | 24 January 2007, 23:29:07 UTC | git-daemon documentation on enabling services. Noticed by Franck Bui-Huu. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 January 2007, 23:29:07 UTC |
| 084ae0a | Johannes Schindelin | 24 January 2007, 14:05:16 UTC | reflog inspection: introduce shortcut "-g" A short-hand "-g" for "git log --walk-reflogs" and "git show-branch --reflog" makes it easier to access the reflog info. [jc: added -g to show-branch for symmetry] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 January 2007, 23:13:47 UTC |
| e955ae9 | Johannes Schindelin | 24 January 2007, 14:04:37 UTC | annotate: use pager Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 January 2007, 23:08:31 UTC |
| 83cd10a | Jakub Narebski | 23 January 2007, 12:37:25 UTC | t/t1300-repo-config.sh: value continued on next line Documentation/config.txt: Variable value ending in a '`\`' is continued on the next line in the customary UNIX fashion. Test it. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 January 2007, 01:35:48 UTC |
| d7ebd53 | Junio C Hamano | 24 January 2007, 00:51:22 UTC | git-checkout -m: fix merge case Commit c1a4278e switched the "merging checkout" implementation from 3-way read-tree to merge-recursive, but forgot that merge-recursive will signal an unmerged state with its own exit status code. This prevented the clean-up phase (paths cleanly merged should not be updated in the index) from running. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 January 2007, 00:58:13 UTC |
| c9a8992 | Junio C Hamano | 23 January 2007, 05:39:03 UTC | reflog gc: a tag that does not point at a commit is not a crime. Although unusual, tags can point at any object. Warning only once is fine, but warning every time about the same tag gets annoying. Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 January 2007, 05:39:03 UTC |
| 222664e | Jeff King | 23 January 2007, 03:21:15 UTC | contrib/vim: update syntax for changed commit template Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 January 2007, 04:40:26 UTC |
| 90f70a9 | Jeff King | 23 January 2007, 03:38:28 UTC | format-patch: fix bug with --stdout in a subdirectory We set the output directory to the git subdirectory prefix if one has not already been specified. However, in the case of --stdout, we explicitly _don't_ want the output directory to be set. The result was that "git-format-patch --stdout" in a directory besides the project root produced the "standard output, or directory, which one?" error message. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 January 2007, 03:46:19 UTC |
| 83e24dc | Junio C Hamano | 22 January 2007, 21:03:31 UTC | [PATCH] honor --author even with --amend, -C, and -c. Earlier code discarded GIT_AUTHOR_DATE taken from the base commit when --author was specified. This was often wrong as that use is likely to fix the spelling of author's name. Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 January 2007, 03:40:57 UTC |
| 5e207b4 | Junio C Hamano | 23 January 2007, 00:25:15 UTC | .mailmap: fix screw-ups in Uwe's name Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 January 2007, 00:25:15 UTC |
| cea70cf | Eric Wong | 22 January 2007, 20:25:30 UTC | git-svn: remove leading slash when printing removed directories Not sure why it was there in the first place, we always do our work relative to the URL we're connected to; even if that URL is the root of the repository, so the leading slash is pointless... Lets be consistent when printing things for the user to see. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 January 2007, 21:15:50 UTC |
| 8276c00 | Peter Eriksen | 22 January 2007, 20:29:45 UTC | sha1_file.c: Avoid multiple calls to find_pack_entry(). We used to call find_pack_entry() twice from read_sha1_file() in order to avoid printing an error message, when the object did not exist. This is fixed by moving the call to error() to the only place it really could be called. Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 January 2007, 21:11:46 UTC |
| e136f33 | Jakub Narebski | 22 January 2007, 15:25:47 UTC | Documentation/config.txt: Document config file syntax better Separate part of Documentation/config.txt which deals with git config file syntax into "Syntax" subsection, and expand it. Add information about subsections, boolean values, escaping and escape sequences in string values, and continuing variable value on the next line. Add also proxy settings to config file example to show example of partially enclosed in double quotes string value. Parts based on comments by Junio C Hamano, Johannes Schindelin, config.c, and the smb.conf(5) man page. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 January 2007, 20:54:02 UTC |
