| 6c41b80 | Junio C Hamano | 02 April 2008, 17:42:14 UTC | GIT 1.5.5-rc3 The rate of fixes that trickle in has slowed and we are definitely getting there. Hopefully one final round and we will have the final 1.5.5 soon. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2008, 18:13:25 UTC |
| eedb9d9 | Junio C Hamano | 02 April 2008, 18:13:23 UTC | Merge branch 'js/filter-branch' * js/filter-branch: filter-branch: Fix renaming a directory in the tree-filter filter-branch: Test renaming directories in a tree-filter | 02 April 2008, 18:13:23 UTC |
| cfc4ba3 | Teemu Likonen | 02 April 2008, 17:06:46 UTC | Describe the bug in handling filenames with funny characters in 'git add -i' The interactive mode does not work with files whose names contain characters that need C-quoting. `core.quotepath` configuration can be used to work this limitation around to some degree, but backslash, double-quote and control characters will still have problems. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2008, 17:36:31 UTC |
| 7ae512b | Junio C Hamano | 02 April 2008, 17:29:10 UTC | Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui 0.10 git-gui: Add shortcut keys for Show More/Less Context | 02 April 2008, 17:29:10 UTC |
| 5fbd0a4 | Junio C Hamano | 02 April 2008, 07:23:19 UTC | Merge branch 'bc/mktag' * bc/mktag: mktag.c: tweak validation of tagger field and adjust test script mktag.c: improve verification of tagger field and tests | 02 April 2008, 07:23:19 UTC |
| e0efa03 | Junio C Hamano | 02 April 2008, 07:22:20 UTC | Merge branch 'pb/cvsserver' * pb/cvsserver: git-cvsserver: handle change type T | 02 April 2008, 07:22:20 UTC |
| 22e885e | Junio C Hamano | 02 April 2008, 07:22:15 UTC | Merge branch 'dd/cvsserver' * dd/cvsserver: cvsserver: Use the user part of the email in log and annotate results cvsserver: Add test for update -p cvsserver: Implement update -p (print to stdout) cvsserver: Add a few tests for 'status' command cvsserver: Do not include status output for subdirectories if -l is passed cvsserver: Only print the file part of the filename in status header cvsserver: Respond to the 'editors' and 'watchers' commands | 02 April 2008, 07:22:15 UTC |
| 860bbd5 | Junio C Hamano | 02 April 2008, 07:22:06 UTC | Merge branch 'je/cvsserver' * je/cvsserver: Allow git-cvsserver database table name prefix to be specified. | 02 April 2008, 07:22:06 UTC |
| 64fb19b | Johannes Sixt | 02 April 2008, 06:52:37 UTC | t7004-tag: Skip more tests if gpg is not available. This test was already careful enough to skip signed tag tests if gpg is not available, but it must also skip all verify tests, even those that are about non-signed tags, because they also invoke gpg. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2008, 07:13:43 UTC |
| 69fe5ef | Johannes Sixt | 02 April 2008, 06:49:59 UTC | verify-tag: Clean up the temporary file if gpg cannot be started. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2008, 07:08:30 UTC |
| 4637e47 | Christian Couder | 02 April 2008, 03:47:41 UTC | help: Add a missing OPT_END(). Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2008, 06:40:06 UTC |
| e85dc0a | Junio C Hamano | 01 April 2008, 04:33:09 UTC | Accept git aliases outside a git repository af05d67 (Always set *nongit_ok in setup_git_directory_gently(), 2008-03-25) had a change from the patch originally submitted that resulted in disabling aliases outside a git repository. It turns out that some people used "alias.fubar = diff --color-words" in $HOME/.gitconfig to use non-index diff (or any command that do not need git repository) outside git repositories, and this change broke them, so this resurrects the support for such usage. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2008, 06:40:02 UTC |
| 3d654be | Shawn O. Pearce | 02 April 2008, 06:17:11 UTC | git-gui 0.10 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 April 2008, 06:17:11 UTC |
| c91ee2b | Jonathan del Strother | 01 April 2008, 10:54:03 UTC | git-gui: Add shortcut keys for Show More/Less Context Bound to Ctrl/Cmd + left & right square brackets, depending on your platform. [sp: Added missing binds for . to allow shortcuts to work when not focused in the commit message area.] Signed-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 April 2008, 05:33:32 UTC |
| ba26ab9 | Brandon Casey | 31 March 2008, 23:25:23 UTC | mktag.c: tweak validation of tagger field and adjust test script Update the verify_tag() function to remove an unnecessary test, and add additional check for angle brackets in the name and email field, and spaces in the email field. The timestamp and timezone sections are made more straight forward by using strspn(). Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 April 2008, 05:43:34 UTC |
| 6a589fd | veillette@yahoo.ca | 31 March 2008, 07:14:15 UTC | filter-branch: Fix renaming a directory in the tree-filter Commit d89c1df (filter-branch: don't use xargs -0, 2008-03-12) replaced a 'ls-files | xargs rm' pipeline by 'git clean'. 'git clean' however does not recurse and remove directories by default. Now, consider a tree-filter that renames a directory. 1. For the first commit everything works as expected 2. Then filter-branch checks out the files for the next commit. This leaves the new directory behind because there is no real "branch switching" involved that would notice that the directory can be removed. 3. Then filter-branch invokes 'git clean' to remove exactly those left-overs. But here it does not remove the directory. 4. The next tree-filter does not work as expected because there already exists a directory with the new name. Just add -d to 'git clean', so that empty directories are removed. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2008, 08:09:50 UTC |
| 9035628 | Johannes Sixt | 31 March 2008, 07:14:14 UTC | filter-branch: Test renaming directories in a tree-filter This test currently fails. If b is a directory then 'mv a b' is not a plain "rename", but really a "move", so we must also test that the directory does not exist with the old name in the directory with the new name. There's also some cleanup in the corresponding "rename file" test to avoid spurious shell syntax errors and "ambigous ref" error from 'git show' (but these should show up only if the test would fail anyway). Plus we also test for the non-existence of the old file. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> | 31 March 2008, 08:03:05 UTC |
| e0aaf78 | Brandon Casey | 27 March 2008, 16:16:04 UTC | mktag.c: improve verification of tagger field and tests Since nearly its birth, git's tags have included a "tagger" field which describes the name of tagger, email of tagger, and date and time of tagging. But, this field was only loosely tested by git-mktag. Provide some thorough testing for this field and also ensure that the tag header is separated from the tag body by an empty line to reduce the convenience of creating a flawed tag. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2008, 05:54:09 UTC |
| f58dbf2 | Junio C Hamano | 31 March 2008, 00:30:08 UTC | diff-files: careful when inspecting work tree items This fixes the same breakage in diff-files. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2008, 05:22:09 UTC |
| 948dd34 | Junio C Hamano | 31 March 2008, 00:29:48 UTC | diff-index: careful when inspecting work tree items Earlier, if you changed a staged path into a directory in the work tree, we happily ran lstat(2) on it and found that it exists, and declared that the user changed it to a gitlink. This is wrong for two reasons: (1) It may be a directory, but it may not be a submodule, and in the latter case, the change we need to report is "the blob at the path has disappeared". We need to check with resolve_gitlink_ref() to be consistent with what "git add" and "git update-index --add" does. (2) lstat(2) may have succeeded only because a leading component of the path was turned into a symbolic link that points at something that exists in the work tree. In such a case, the path itself does not exist anymore, as far as the index is concerned. This fixes these breakages in diff-index that the previous patch has exposed. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2008, 05:22:09 UTC |
| 6301f30 | Junio C Hamano | 31 March 2008, 00:28:05 UTC | Add corner case tests for diff-index and diff-files diff-index and diff-files can get confused in corner cases when an indexed blob turns into something else in the work tree. This patch adds tests to expose such breakages. The test is classified under t2XXX series instead of t4XXX series, because the ultimate objective is to fix "add -u" (and "commit -a" that shares the same issue). Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2008, 05:22:09 UTC |
| 6aeeffd | Josh Elsasser | 27 March 2008, 21:02:14 UTC | Allow git-cvsserver database table name prefix to be specified. Adds a gitcvs.dbtablenameprefix config variable, the contents of which are prepended to any database tables names used by git-cvsserver. The same substutions as gitcvs.dbname and gitcvs.dbuser are supported, and any non-alphabetic characters are replaced with underscores. A typo found in contrib/completion/git-completion.bash is also fixed. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2008, 05:21:35 UTC |
| c20711d | Bryan Donlan | 28 March 2008, 06:19:46 UTC | Silence cpio's "N blocks" output when cloning locally Pass --quiet to cpio in git-clone to hide the (confusing) "0 blocks" message. For compatibility with operating systems which might not support GNUisms, the presence of --quiet is probed for by grepping cpio's --help output. Signed-off-by: Bryan Donlan <bdonlan@fushizen.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2008, 05:21:06 UTC |
| 67dac28 | Eric Wong | 29 March 2008, 23:37:17 UTC | git-svn: remove redundant slashes from show-ignore Jonathan Scott Duff wrote: > Recently I tried "git svn showignore" on my parrot repository and it > failed. I tracked it down to the prop_walk() sub. When it recurses, > $path has an extra / on the beginning (i.e., when it recurses, it > tries to get the props for "//apps" instead of "/apps"). I *think* > this is because $path is used in the recursive call rather than $p > (which seems to contain a properly transformed $path). Anyway, I've > attached a patch that works for me and I think is generally the right > thing. Patch-submitted-by: Jonathan Scott Duff Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2008, 05:03:05 UTC |
| f3e5ae4 | Marius Storm-Olsen | 28 March 2008, 14:40:40 UTC | git-p4: Handle Windows EOLs properly after removal of p4 submit template handling. git-p4s handling of Windows style EOL was broken after the removal of the p4 submit template handling in commit f2a6059. Fix that, and make getP4OpenedType() more robust. Signed-off-by: Marius Storm-Olsen <marius@trolltech.com> Signed-off-by: Simon Hausmann <simon@lst.de> | 28 March 2008, 15:27:39 UTC |
| 9027efe | Paolo Bonzini | 16 March 2008, 19:00:21 UTC | git-cvsserver: handle change type T git-cvsserver does not support changes of type T (file type change, e.g. symlink->real file). This patch treats them the same as changes of type M. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2008, 06:51:33 UTC |
| 803d515 | Junio C Hamano | 28 March 2008, 03:43:51 UTC | GIT 1.5.5-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2008, 03:43:51 UTC |
| f8dd64f | Junio C Hamano | 28 March 2008, 03:36:35 UTC | GIT 1.5.4.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2008, 03:36:35 UTC |
| c1bc306 | Damien Diederen | 27 March 2008, 22:18:35 UTC | cvsserver: Use the user part of the email in log and annotate results Generate the CVS author names by taking the first eight characters of the user part of the email address. The resulting names are more likely to make sense (or at least reduce ambiguities) in "corporate" environments. Signed-off-by: Damien Diederen <dash@foobox.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2008, 23:05:27 UTC |
| 6e8937a | Damien Diederen | 27 March 2008, 22:18:23 UTC | cvsserver: Add test for update -p Signed-off-by: Damien Diederen <dash@foobox.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2008, 23:05:27 UTC |
| e78f69a | Damien Diederen | 27 March 2008, 22:18:12 UTC | cvsserver: Implement update -p (print to stdout) Cvs update -p -r <rev> <path> is the documented way to retrieve a specific revision of a file (similar to git show <rev>:<path>). Without this patch, the -p flag is ignored and status output is produced, causing clients to interpret it as the contents of the file. TkCVS uses update -p as a basis for implementing its various "View" and "Diff" commands. Signed-off-by: Damien Diederen <dash@foobox.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2008, 23:05:27 UTC |
| dded801 | Damien Diederen | 27 March 2008, 22:18:02 UTC | cvsserver: Add a few tests for 'status' command Signed-off-by: Damien Diederen <dash@foobox.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2008, 23:05:27 UTC |
| 852b921 | Damien Diederen | 27 March 2008, 22:17:53 UTC | cvsserver: Do not include status output for subdirectories if -l is passed This effectively implements the -l switch by pruning the entries whose filenames contain a path separator. It was previously ignored. Without this, TkCVS includes strange "ghost" entries in its directory listings. Signed-off-by: Damien Diederen <dash@foobox.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2008, 23:05:27 UTC |
| 23b7180 | Damien Diederen | 27 March 2008, 22:17:42 UTC | cvsserver: Only print the file part of the filename in status header The "File:" header of CVS status output only includes the basename of the file, even when generating a recursive listing; do the same. Signed-off-by: Damien Diederen <dash@foobox.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2008, 23:05:27 UTC |
| 38bcd31 | Damien Diederen | 27 March 2008, 22:17:26 UTC | cvsserver: Respond to the 'editors' and 'watchers' commands These commands list users editing and watching locked files. This trivial implementation always returns an empty response, since git-cvsserver does not implement file locking. Without this, TkCVS hangs at startup, waiting forever for a response. Signed-off-by: Damien Diederen <dash@foobox.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2008, 23:05:27 UTC |
| fe308f5 | Junio C Hamano | 25 March 2008, 06:20:51 UTC | builtin-prune: protect objects listed on the command line Finally, this resurrects the documented behaviour to protect other objects listed on the command line from getting pruned. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2008, 22:39:57 UTC |
| 629de47 | Michele Ballabio | 23 March 2008, 20:50:29 UTC | builtin-prune.c: use parse_options() Using the OPT_DATE() introduced earlier, this updates builtin-prune to use parse_options(). Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2008, 20:55:15 UTC |
| 0c62705 | Michele Ballabio | 23 March 2008, 21:34:34 UTC | Add tests for git-prune It seems that git prune changed behaviour with respect to revisions added from command line, probably when it became a builtin. Currently, it prints a short usage and exits: instead, it should take those revisions into account and not prune them. So add a couple of test to point this out. We'll be fixing this by switching to parse_options(), so add tests to detect bogus command line parameters as well, to keep ourselves from introducing regressions. Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2008, 20:55:15 UTC |
| 1f4a711 | Michele Ballabio | 24 March 2008, 14:02:21 UTC | parse-options.c: introduce OPT_DATE There are quite a few places that will need to call approxidate(), when they'll adopt the parse-options system, so this patch adds the function parse_opt_approxidate_cb(), used by OPT_DATE. Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2008, 20:55:15 UTC |
| 1768905 | Junio C Hamano | 27 March 2008, 20:37:29 UTC | Update draft release notes for 1.5.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2008, 20:37:29 UTC |
| 319a36a | Junio C Hamano | 27 March 2008, 20:35:18 UTC | Merge branch 'maint' * maint: Update draft release notes for 1.5.4.5 Documentation: clarify use of .git{ignore,attributes} versus .git/info/* t/t3800-mktag.sh: use test_must_fail rather than '!' Conflicts: t/t3800-mktag.sh | 27 March 2008, 20:35:18 UTC |
| 24362a5 | Junio C Hamano | 27 March 2008, 20:14:20 UTC | Update draft release notes for 1.5.4.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2008, 20:14:20 UTC |
| b88605f | Junio C Hamano | 27 March 2008, 20:03:56 UTC | Merge branch 'jc/maint-fetch-regression-1.5.4' into maint * jc/maint-fetch-regression-1.5.4: git-fetch test: test tracking fetch results, not just FETCH_HEAD Fix branches file configuration Tighten refspec processing | 27 March 2008, 20:03:56 UTC |
| 90b2290 | Jeff King | 27 March 2008, 05:31:00 UTC | Documentation: clarify use of .git{ignore,attributes} versus .git/info/* gitignore patterns can be read from three different files, while gitattributes can come from two files. Let's provide some hints to the user about the differences and how they are typically used. Suggested by Toby Corkindale, but gratuitously reworded by Jeff King. Signed-off-by: Toby Corkindale <toby.corkindale@rea-group.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2008, 20:03:51 UTC |
| 8ee002f | Junio C Hamano | 25 March 2008, 06:07:08 UTC | test_must_fail: 129 is a valid error code from usage() When a git command is run under test_must_fail to make sure that the argument parser catches bogus command line, it exits with 129. We need to catch it as a valid "graceful error exit". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2008, 19:13:39 UTC |
| 5b67b8e | Gerrit Pape | 26 March 2008, 18:05:17 UTC | imap-send: properly error out if imap.host is not set in config If no imap host is specified in the git config, git imap-send used to try to lookup a null pointer through gethostbyname(), causing a segfault. Since setting the imap.host variable is mandatory, imap-send now properly fails with an explanatory error message. The problem has been reported by picca through http://bugs.debian.org/472632 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 March 2008, 23:15:02 UTC |
| 40ae887 | Frank Lichtenheld | 26 March 2008, 17:34:20 UTC | t9600-cvsimport.sh: set HOME before checking for cvsps availability This actually sounds like a bug in cvsps, which requires an existing home directory when asked for the usage through -h $ HOME=/nonexistent cvsps -h Cannot create the cvsps directory '.cvsps': No such file or directory This made t9600 think that cvsps is not available if HOME did not exist, causing the tests to be skipped $ HOME=/nonexistent sh t9600-cvsimport.sh * skipping cvsimport tests, cvsps not found * passed all 0 test(s) Now t9600 sets HOME to the current working directory before checking for the availability of the cvsps program. This issue has been discovered by Marco Rodrigues, and fixed by Frank Lichtenheld through http://bugs.debian.org/471969 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 March 2008, 23:14:52 UTC |
| af05d67 | SZEDER Gábor | 25 March 2008, 21:06:26 UTC | Always set *nongit_ok in setup_git_directory_gently() setup_git_directory_gently() only modified the value of its *nongit_ok argument if we were not in a git repository. Now it will always set it to 0 when we are inside a repository. Also remove now unnecessary initializations in the callers of this function. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 March 2008, 22:41:35 UTC |
| 525d461 | Brandon Casey | 26 March 2008, 00:20:52 UTC | t/t3800-mktag.sh: use test_must_fail rather than '!' Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 March 2008, 21:26:52 UTC |
| 660b9c3 | Junio C Hamano | 26 March 2008, 08:49:41 UTC | Merge branch 'jc/maint-fetch-regression-1.5.4' * jc/maint-fetch-regression-1.5.4: git-fetch test: test tracking fetch results, not just FETCH_HEAD Fix branches file configuration Tighten refspec processing Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation. | 26 March 2008, 08:49:41 UTC |
| a466637 | Junio C Hamano | 26 March 2008, 08:17:07 UTC | git-fetch test: test tracking fetch results, not just FETCH_HEAD We really should have done this long time ago. Existing t5515 test was written for the specific purpose of catching regression to the contents of generated FETCH_HEAD file, but it also is a good place to make sure various fetch configurations do fetch what they intend to fetch (and nothing else). Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 March 2008, 08:29:54 UTC |
| 472fa4c | Daniel Barkalow | 25 March 2008, 23:35:28 UTC | Fix branches file configuration Fetched remote branch from .git/branches/foo should fetch into refs/heads/foo. Also when partial URL is given, the fetched head should always be remote HEAD, and the result should not be stored anywhere. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 March 2008, 07:50:51 UTC |
| c091b3d | Daniel Barkalow | 18 March 2008, 02:05:23 UTC | Tighten refspec processing This changes the pattern matching code to not store the required final / before the *, and then to require each side to be a valid ref (or empty). In particular, any refspec that looks like it should be a pattern but doesn't quite meet the requirements will be found to be invalid as a fallback non-pattern. This was cherry picked from commit ef00d15 (Tighten refspec processing, 2008-03-17), and two fix-up commits 46220ca (remote.c: Fix overtight refspec validation, 2008-03-20) and 7d19da4 (refspec: allow colon-less wildcard "refs/category/*", 2008-03-25) squashed in. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 March 2008, 07:10:55 UTC |
| 71a5099 | Guanqun Lu | 24 March 2008, 07:27:28 UTC | Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation. Texts between ~ and ~ will be subscripted during the asciidoc translation. Signed-off-by: Guanqun Lu <Guanqun.Lu@Gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> (cherry picked from commit 0c829391cfcdc57172765322575804a7ad5f3116) | 26 March 2008, 07:09:17 UTC |
| 7d19da4 | Junio C Hamano | 26 March 2008, 04:15:52 UTC | refspec: allow colon-less wildcard "refs/category/*" "git push --tags elsewhere" is implemented in terms of wildcarded refspec "refs/tags/*" these days, and the user wants to push the tags under the same name to the other branch. This resurrects the support for it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 March 2008, 04:55:38 UTC |
| 5cc8f37 | Johannes Schindelin | 24 March 2008, 15:14:52 UTC | init: show "Reinit" message even in an (existing) empty repository Earlier, git-init tested for a valid HEAD ref, but if the repository was empty, there was none. Instead, test for the existence of the file $GIT_DIR/HEAD. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 March 2008, 07:34:05 UTC |
| 76ce946 | Julian Phillips | 24 March 2008, 03:06:20 UTC | Documentation/git-checkout: Update summary to reflect current abilities For a while now, git-checkout has been more powerful than the man-page summary would suggest (the main text does describe the new features), so update the summary to hopefully better reflect the current functionality. Also update the glossary description of the word checkout. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 March 2008, 07:00:07 UTC |
| 995e8df | Dirk Süsserott | 24 March 2008, 19:43:08 UTC | Documentation: git-tag '-m'/'-F' implies '-a' | 25 March 2008, 05:14:35 UTC |
| ec31b0c | Johannes Sixt | 18 March 2008, 20:52:00 UTC | builtin-remote: Fix missing newline at end of listing of pushed branches Without this the output of 'git remote show' does not end with a new-line: bash> git remote show repo * remote repo URL: repo.or.cz:/srv/git/kdbg.git Tracked remote branches maint master mob Local branch pushed with 'git push' +master:masterbash> Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 March 2008, 00:11:33 UTC |
| 0c82939 | Guanqun Lu | 24 March 2008, 07:27:28 UTC | Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation. Texts between ~ and ~ will be subscripted during the asciidoc translation. Signed-off-by: Guanqun Lu <Guanqun.Lu@Gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2008, 19:02:11 UTC |
| 313da4f | Johannes Schindelin | 23 March 2008, 11:35:37 UTC | RelNotes: mention checkout/branch's --track option, too checkout and branch recently learnt to track local branches when branch.autosetupmerge = always, but they _also_ learnt to do that when asked explicitely with the option "--track". Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2008, 17:16:33 UTC |
| bc61000 | Junio C Hamano | 23 March 2008, 07:21:48 UTC | GIT 1.5.5-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2008, 07:22:29 UTC |
| 9706397 | Junio C Hamano | 23 March 2008, 07:04:48 UTC | gc --auto: raise default auto pack limit from 20 to 50 Recent discussion on the list, with the improvement f7c22cc (always start looking up objects in the last used pack first, 2007-05-30) brought in, reached the concensus that the current default 20 is too low. Reference: http://thread.gmane.org/gmane.comp.version-control.git/77586 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2008, 07:11:31 UTC |
| dc96bdb | Junio C Hamano | 23 March 2008, 07:02:06 UTC | Merge branch 'git-p4' of git://repo.or.cz/git/git-p4 * 'git-p4' of git://repo.or.cz/git/git-p4: git-p4: Use P4EDITOR environment variable when set git-p4: Unset P4DIFF environment variable when using 'p4 -du diff' git-p4: Optimize the fetching of data from perforce. | 23 March 2008, 07:02:06 UTC |
| 46220ca | Junio C Hamano | 21 March 2008, 06:34:37 UTC | remote.c: Fix overtight refspec validation We tightened the refspec validation code in an earlier commit ef00d15 (Tighten refspec processing, 2008-03-17) per my suggestion, but the suggestion was misguided to begin with and it broke this usage: $ git push origin HEAD~12:master The syntax of push refspecs and fetch refspecs are similar in that they are both colon separated LHS and RHS (possibly prefixed with a + to force), but the similarity ends there. For example, LHS in a push refspec can be anything that evaluates to a valid object name at runtime (except when colon and RHS is missing, or it is a glob), while it must be a valid-looking refname in a fetch refspec. To validate them correctly, the caller needs to be able to say which kind of refspecs they are. It is unreasonable to keep a single interface that cannot tell which kind it is dealing with, and ask it to behave sensibly. This commit separates the parsing of the two into different functions, and clarifies the code to implement the parsing proper (i.e. splitting into two parts, making sure both sides are wildcard or neither side is). This happens to also allow pushing a commit named with the esoteric "look for that string" syntax: $ git push ../test.git ':/remote.c: Fix overtight refspec:master' Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2008, 06:46:17 UTC |
| 9b33fa0 | Eyvind Bernhardsen | 21 March 2008, 15:25:18 UTC | fast-import: Document the effect of "merge" with no "from" in a commit The fast-import documentation currently does not document the behaviour of "merge" when there is no "from" in a commit. This patch adds a description of what happens: the commit is created with a parent, but no files. This behaviour is equivalent to "from" followed by "filedeleteall". Signed-off-by: Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2008, 06:20:01 UTC |
| 3644da7 | Kevin Ballard | 21 March 2008, 07:27:35 UTC | Make git-svn tests behave better on OS X Give lib-git-svn.sh a few alternate paths to look for apache2. Explicitly define the LockFile so httpd will actually start under OS X Signed-off-by: Kevin Ballard <kevin@sb.org> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2008, 00:53:12 UTC |
| bf7c902 | Ralf Wildenhues | 20 March 2008, 21:30:32 UTC | Improve description of git filter-branch. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2008, 00:25:16 UTC |
| c8a0869 | Brandon Casey | 20 March 2008, 16:54:30 UTC | t/t7003-filter-branch.sh: use test_must_fail rather than '!' Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2008, 00:23:29 UTC |
| 8114da1 | Kevin Ballard | 20 March 2008, 20:08:49 UTC | Don't try and percent-escape existing percent escapes in git-svn URIs git-svn project names are percent-escaped ever since f5530b8 (git-svn: support for funky branch and project names over HTTP(S), 2007-11-11). Unfortunately this breaks the scenario where the user hands git-svn an already-escaped URI. Fix the regexp to skip over what looks like existing percent escapes, and test this scenario. Signed-off-by: Kevin Ballard <kevin@sb.org> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2008, 06:59:12 UTC |
| 740fdd2 | Johannes Schindelin | 19 March 2008, 00:27:42 UTC | remote show: do not show symbolic refs For symbolic refs, a sane notion of being "stale" is that the ref they point to no longer exists. Since this is checked already, "remote show" does not need to show them at all. Incidentally, this fixes the issue that "HEAD" was shown as a stale ref by "remote show" in a freshly cloned repository. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2008, 00:33:30 UTC |
| a811e4f | Kevin Ballard | 19 March 2008, 06:16:29 UTC | Document the sendemail.smtpserverport config variable Add sendemail.smtpserverport to the Configuration section of the git-send-email manpage. It should probably be referenced in the --smtp-server-port option as well. Signed-off-by: Kevin Ballard <kevin@sb.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2008, 00:32:28 UTC |
| 7ccd366 | Kevin Ballard | 19 March 2008, 06:16:28 UTC | Add --reverse to the git-rev-list usage string git-rev-list accepts --reverse, as documented in the manpage, but the usage string does not list it. Signed-off-by: Kevin Ballard <kevin@sb.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2008, 00:31:51 UTC |
| 05f3045 | Nicolas Pitre | 19 March 2008, 21:06:11 UTC | make it easier for people who just want to get rid of 'git gc --auto' Give a direct hint to those who feel highly annoyed by the auto gc behavior. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2008, 00:30:53 UTC |
| b14d255 | Brandon Casey | 19 March 2008, 21:53:20 UTC | builtin-gc.c: allow disabling all auto-gc'ing by assigning 0 to gc.auto The gc.auto configuration variable is somewhat ambiguous now that there is also a gc.autopacklimit setting. Some users may assume that it controls all auto-gc'ing. Also, now users must set two configuration variables to zero when they want to disable autopacking. Since it is unlikely that users will want to autopack based on some threshold of pack files when they have disabled autopacking based on the number of loose objects, be nice and allow a setting of zero for gc.auto to disable all autopacking. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2008, 00:29:52 UTC |
| 02b00e1 | Miklos Vajna | 18 March 2008, 12:26:43 UTC | Documentation/git-merge: document subtree strategy. There was already some documentation about subtree under Documentation/howto but it was missing from git-merge manpage. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 March 2008, 08:43:02 UTC |
| 420e9af | Daniel Barkalow | 18 March 2008, 02:15:02 UTC | Fix tag following Before the second fetch-pack connection in the same process, unmark all of the objects marked in the first connection, in order that we'll list them as things we have instead of thinking we've already mentioned them. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 March 2008, 08:43:02 UTC |
| 7d00419 | Linus Torvalds | 18 March 2008, 01:56:33 UTC | Make revision limiting more robust against occasional bad commit dates The revision limiter uses the commit date to decide when it has seen enough commits to finalize the revision list, but that can get confused if there are incorrect dates far in the past on some commits. This makes the logic a bit more robust by - we always walk an extra SLOP commits from the source list even if we decide that the source list is probably all done (unless the source is entirely empty, of course, because then we really can't do anything at all) - we keep track of the date of the last commit we added to the destination list (this will *generally* be the oldest entry we've seen so far) - we compare that with the youngest entry (the first one) of the source list, and if the destination is older than the source, we know we want to look at the source. which causes occasional date mishaps to be handled cleanly. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 March 2008, 08:42:35 UTC |
| 1d0a694 | Daniel Barkalow | 18 March 2008, 02:04:40 UTC | Fix t3200 config "git-config name = value" doesn't do anything most of the time. The test meant "git-config name value", but that leaves the configuration such that later tests will be confused, so move it to the end. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 March 2008, 05:18:57 UTC |
| ef00d15 | Daniel Barkalow | 18 March 2008, 02:05:23 UTC | Tighten refspec processing This changes the pattern matching code to not store the required final / before the *, and then to require each side to be a valid ref (or empty). In particular, any refspec that looks like it should be a pattern but doesn't quite meet the requirements will be found to be invalid as a fallback non-pattern. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 March 2008, 05:18:57 UTC |
| 971f229 | Linus Torvalds | 17 March 2008, 15:56:27 UTC | Fix possible Solaris problem in 'checkout_entry()' Currently when checking out an entry "path", we try to unlink(2) it first (because there could be stale file), and if there is a directory there, try to deal with it (typically we run recursive rmdir). We ignore the error return from this unlink because there may not even be any file there. However if you are root on Solaris, you can unlink(2) a directory successfully and corrupt your filesystem. This moves the code around and check the directory first, and then unlink(2). Also we check the error code from it. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 March 2008, 05:18:57 UTC |
| c4758d3 | Junio C Hamano | 19 March 2008, 05:01:28 UTC | Fix read-tree not to discard errors This fixes the issue identified with recently added tests to t1004 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 March 2008, 05:17:22 UTC |
| 8a785dc | Junio C Hamano | 19 March 2008, 04:59:39 UTC | Add tests to catch problems with un-unlinkable symlinks This currently fails not because we refuse to check out, but because we detect error but incorrectly discard it in the callchain. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 March 2008, 05:17:22 UTC |
| 8d14ac9 | Junio C Hamano | 19 March 2008, 04:58:01 UTC | Test: catch if trash cannot be removed When your test creates an unwritable directory that test framework cannot clean out by "rm -fr trash", later tests cannot start in a fresh state they expect to. Detect this and error out early. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 March 2008, 05:17:22 UTC |
| 29dc133 | Junio C Hamano | 17 March 2008, 23:47:18 UTC | git-merge-one-file: fix longstanding stupid thinko When a merge result creates a new file, and when our side already has a file in the path, taking the merge result may clobber the untracked file. However, the logic to detect this situation was totally the wrong way. We should complain when the file exists, not when the file does not exist. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 March 2008, 05:17:17 UTC |
| deda26b | Junio C Hamano | 17 March 2008, 07:52:19 UTC | Merge branch 'jc/makefile' * jc/makefile: Makefile: flatten enumeration of headers, objects and programs Makefile: DIFF_OBJS is not special at all these days | 17 March 2008, 07:52:19 UTC |
| 7f8ab8d | Linus Torvalds | 16 March 2008, 18:42:50 UTC | Don't update unchanged merge entries In commit 34110cd4e394e3f92c01a4709689b384c34645d8 ("Make 'unpack_trees()' have a separate source and destination index") I introduced a really stupid bug in that it would always add merged entries with the CE_UPDATE flag set. That caused us to always re-write the file, even when it was already up-to-date in the source index. Not only is that really stupid from a performance angle, but more importantly it's actively wrong: if we have dirty state in the tree when we merge, overwriting it with the result of the merge will incorrectly overwrite that dirty state. This trivially fixes the problem - simply don't set the CE_UPDATE flag when the merge result matches the old state. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2008, 21:25:53 UTC |
| 198724a | Eyvind Bernhardsen | 16 March 2008, 19:49:09 UTC | fast-import: Allow "reset" to delete a new branch without error Creating a branch in fast-import and then resetting it without making any further commits to it currently causes an error message at the end of the import. This error is triggered by cvs2svn's git backend, which uses a temporary fixup branch when it creates tags, because the fixup branch is reset after each tag. This patch prevents the error, allowing "reset" to be used to delete temporary branches. Signed-off-by: Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no> Acked-by: Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2008, 21:24:32 UTC |
| 20fd60b | Junio C Hamano | 16 March 2008, 21:13:04 UTC | t1000: use "test_must_fail git frotz", not "! git frotz" Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2008, 21:13:04 UTC |
| 7092882 | Junio C Hamano | 16 March 2008, 06:59:29 UTC | Update draft release notes for 1.5.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2008, 08:15:31 UTC |
| c817faa | Junio C Hamano | 16 March 2008, 06:58:10 UTC | Resurrect git-rerere to contrib/examples It is handy to have a copy readily available for checking regressions. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2008, 08:11:07 UTC |
| 1eaa541 | Junio C Hamano | 16 March 2008, 08:03:16 UTC | Merge branch 'maint' * maint: Start draft ReleaseNotes for 1.5.4.5 rebase -m: do not trigger pre-commit verification Conflicts: RelNotes | 16 March 2008, 08:03:16 UTC |
| 81d6650 | Junio C Hamano | 16 March 2008, 06:29:28 UTC | Start draft ReleaseNotes for 1.5.4.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2008, 08:01:57 UTC |
| e637122 | Junio C Hamano | 16 March 2008, 07:50:22 UTC | rebase -m: do not trigger pre-commit verification When rebasing changes that contain issues that the pre-commit hook flags as problematic, the rebase cannot be continued. However, rebase is about transplanting commits that are already made with as little distortion as possible, and pre-commit check should not interfere. Earlier, c5b09fe (Avoid update hook during git-rebase --interactive, 2007-12-19) fixed "rebase -i", but "rebase -m" shared the same issue. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2008, 08:00:40 UTC |
| f4198c9 | Junio C Hamano | 16 March 2008, 06:07:54 UTC | Merge branch 'master' of git://repo.or.cz/git-gui * 'master' of git://repo.or.cz/git-gui: git-gui: Improve directions regarding POT update in po/README git-gui: Update Japanese translation git-gui: Adjusted Japanese translation to updated POT git-gui: Update Japanese translation git-gui: Don't translate the special Apple menu git-gui: Updated Hungarian translation (e5fba18) git-gui: update russian translation git-gui: remove spurious "fuzzy" attributes in po/it.po git-gui: updated Swedish translation git-gui: Regenerated po template and merged translations with it Update Hungarian translation. 100% completed. git-gui: update Italian translation | 16 March 2008, 06:07:54 UTC |
| 739a6d4 | Junio C Hamano | 15 March 2008, 07:43:34 UTC | git-gui: Improve directions regarding POT update in po/README Keeping POT up to date relative to the software is absolutely necessary. What is unwarranted is updating language files at the same time by running msgmerge without checking if there is any outstanding translation work first. If we assume that the translators do not have access to msgmerge, that is a good service to them (the less they have to do, the better), but otherwise, it is better to be leave po/${language}.po files alone. Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 March 2008, 06:06:12 UTC |
| 477ef32 | しらいしななこ | 15 March 2008, 11:12:00 UTC | git-gui: Update Japanese translation Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 March 2008, 03:57:28 UTC |
| 1f9ff0d | Junio C Hamano | 15 March 2008, 08:23:26 UTC | Redo "add test_cmp function for test scripts" We had a handful test updates since we accepted 82ebb0b (add test_cmp function for test scripts). This fixes them up. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 March 2008, 08:23:26 UTC |
| 1f17868 | Junio C Hamano | 15 March 2008, 08:10:53 UTC | Merge branch 'jk/portable' * jk/portable: t6000lib: re-fix tr portability t7505: use SHELL_PATH in hook t9112: add missing #!/bin/sh header filter-branch: use $SHELL_PATH instead of 'sh' filter-branch: don't use xargs -0 add NO_EXTERNAL_GREP build option t6000lib: tr portability fix t4020: don't use grep -a add test_cmp function for test scripts remove use of "tail -n 1" and "tail -1" grep portability fix: don't use "-e" or "-q" more tr portability test script fixes t0050: perl portability fix tr portability fixes | 15 March 2008, 08:10:53 UTC |
| 37bd6c5 | Junio C Hamano | 15 March 2008, 08:10:44 UTC | Merge branch 'py/submodule' * py/submodule: git-submodule summary: fix that some "wc" flavors produce leading spaces git-submodule summary: test git-submodule summary: documentation git-submodule summary: limit summary size git-submodule summary: show commit summary git-submodule summary: code framework | 15 March 2008, 08:10:44 UTC |
