| 685e9d9 | Junio C Hamano | 05 January 2011, 22:46:07 UTC | Git 1.7.4-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2011, 22:57:19 UTC |
| 8594495 | Junio C Hamano | 05 January 2011, 22:50:33 UTC | Merge branch 'maint' to sync with 1.7.3.5 | 05 January 2011, 22:50:33 UTC |
| 6e97ef3 | Junio C Hamano | 05 January 2011, 22:49:19 UTC | Git 1.7.3.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2011, 22:49:19 UTC |
| bf9b46c | Junio C Hamano | 05 January 2011, 21:34:43 UTC | Merge branch 'jn/svn-fe' (early part) * 'jn/svn-fe' (early part): vcs-svn: Error out for v3 dumps Conflicts: t/t9010-svn-fe.sh | 05 January 2011, 21:34:43 UTC |
| d3cae60 | Junio C Hamano | 05 January 2011, 21:31:25 UTC | Merge branch 'ao/t9001-fix' * ao/t9001-fix: t/t9001-send-email.sh: fix '&&' chain in some tests | 05 January 2011, 21:31:25 UTC |
| 9e98354 | Junio C Hamano | 05 January 2011, 21:31:01 UTC | Merge branch 'pw/convert-pathname-substitution' * pw/convert-pathname-substitution: t0021: avoid getting filter killed with SIGPIPE convert filter: supply path to external driver | 05 January 2011, 21:31:01 UTC |
| 0c30ed0 | Junio C Hamano | 05 January 2011, 21:30:29 UTC | Merge branch 'mg/cvsimport' * mg/cvsimport: cvsimport: handle the parsing of uppercase config options cvsimport: partial whitespace cleanup | 05 January 2011, 21:30:29 UTC |
| cc7e816 | Antonio Ospite | 04 January 2011, 20:56:58 UTC | t/t9001-send-email.sh: fix '&&' chain in some tests t/README recommends chaining test assertions. Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2011, 23:46:29 UTC |
| 60d5985 | Michael J Gruber | 29 December 2010, 21:55:34 UTC | cvsimport: handle the parsing of uppercase config options The current code leads to fatal: bad config value for 'cvsimport.r' in .git/config for a standard use case with cvsimport.r set. cvsimport sets internal variables by checking the config for each possible command line option. The problem is that config items are case insensitive, so config.r and config.R are the same. The ugly error is due to that fact that cvsimport expects a bool for -R (and thus config.R) but a remote name for -r (and thus config.r). Fix this by making cvsimport expect long names for uppercase options. config options for cvsimport have been undocumented so far, though present in the code and advertised in several tutorials. So one may read "enhance" for "fix". Similarly, the names for the options are "documented" in the code, waitiing for their lowercase equivalents to be transformed into long config options, as well. Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2011, 21:31:03 UTC |
| f2665ec | Junio C Hamano | 04 January 2011, 19:23:45 UTC | Merge branch 'maint' * maint: gitweb: skip logo in atom feed when there is none t9001: Fix test prerequisites | 04 January 2011, 19:23:45 UTC |
| 081f84e | Jonathan Nieder | 04 January 2011, 04:04:46 UTC | daemon: support <directory> arguments again Ever since v1.7.4-rc0~125^2~8 (daemon: use run-command api for async serving, 2010-11-04), git daemon spawns child processes instead of forking to serve requests. The child processes learn that they are being run for this purpose from the presence of the --serve command line flag. When running with <ok_path> arguments, the --serve flag is treated as one of the path arguments and the special child behavior does not kick in. So the child becomes an ordinary git daemon process, notices that all the addresses it needs are in use, and exits with the message "fatal: unable to allocate any listen sockets on port 9418". Fix it by putting --serve at the beginning of the command line, where the flag cannot be mistaken for a path argument. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2011, 19:23:42 UTC |
| 469bfc9 | Ralf Wildenhues | 03 January 2011, 19:03:34 UTC | Fix typos in the documentation Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2011, 19:23:42 UTC |
| 9d9f5e7 | Jonathan Nieder | 04 September 2010, 00:44:39 UTC | gitweb: skip logo in atom feed when there is none With v1.5.0-rc0~169 (gitweb: Fix Atom feed <logo>: it is $logo, not $logo_url, 2006-12-04), the logo URI to be written to Atom feeds was corrected but the case of no logo forgotten. Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2011, 18:48:37 UTC |
| 57da204 | Robin H. Johnson | 29 December 2010, 21:02:31 UTC | t9001: Fix test prerequisites Add in missing Perl prerequisites for new tests of send-email. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2010, 21:39:05 UTC |
| 01b97a4 | Junio C Hamano | 28 December 2010, 21:52:52 UTC | Git 1.7.4-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2010, 21:53:24 UTC |
| 2cd900f | Junio C Hamano | 28 December 2010, 21:50:11 UTC | Merge branch 'maint' * maint: Prepare for 1.7.3.5 Fix false positives in t3404 due to SHELL=/bin/false close file on error in read_mmfile() Conflicts: RelNotes | 28 December 2010, 21:50:11 UTC |
| 1736793 | Junio C Hamano | 28 December 2010, 21:48:54 UTC | Prepare for 1.7.3.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2010, 21:48:54 UTC |
| a121d53 | Junio C Hamano | 28 December 2010, 21:45:12 UTC | Merge branch 'jk/commit-die-on-bogus-ident' into maint * jk/commit-die-on-bogus-ident: commit: die before asking to edit the log message ident: die on bogus date format | 28 December 2010, 21:45:12 UTC |
| 359f34f | Junio C Hamano | 28 December 2010, 21:44:58 UTC | Merge branch 'ks/blame-worktree-textconv-cached' into maint * ks/blame-worktree-textconv-cached: fill_textconv(): Don't get/put cache if sha1 is not valid t/t8006: Demonstrate blame is broken when cachetextconv is on | 28 December 2010, 21:44:58 UTC |
| 58c58c8 | Junio C Hamano | 28 December 2010, 21:43:10 UTC | Merge branch 'jc/maint-rebase-rewrite-last-skip' into maint * jc/maint-rebase-rewrite-last-skip: rebase --skip: correctly wrap-up when skipping the last patch | 28 December 2010, 21:43:10 UTC |
| 2f73969 | Junio C Hamano | 28 December 2010, 21:42:55 UTC | Merge branch 'jc/maint-am-abort-safely' into maint * jc/maint-am-abort-safely: am --abort: keep unrelated commits since the last failure and warn | 28 December 2010, 21:42:55 UTC |
| 0ec9ee3 | Junio C Hamano | 28 December 2010, 21:23:20 UTC | Merge branch 'kb/maint-status-cquote' into maint * kb/maint-status-cquote: status: Quote paths with spaces in short format | 28 December 2010, 21:23:20 UTC |
| d2559f7 | Brandon Casey | 22 December 2010, 23:58:53 UTC | t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-' The '--no-chain-reply-to' option is a Getopt::Long boolean option. The '--no-' prefix (as in --no-chain-reply-to) for boolean options is not supported in Getopt::Long version 2.32 which was released with Perl 5.8.0. This version only supports '--no' as in '--nochain-reply-to'. More recent versions of Getopt::Long, such as version 2.34, support either prefix. So use the older form in the tests. See also: 907a0b1e04ea31cb368e9422df93d8ebb0187914 84eeb687de7a6c7c42af3fb51b176e0f412a979e 3fee1fe87144360a1913eab86af9ad136c810076 Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2010, 19:27:12 UTC |
| 5765870 | Junio C Hamano | 28 December 2010, 19:26:59 UTC | Merge branch 'jc/maint-rebase-rewrite-last-skip' * jc/maint-rebase-rewrite-last-skip: rebase --skip: correctly wrap-up when skipping the last patch | 28 December 2010, 19:26:59 UTC |
| f3bb8b4 | Junio C Hamano | 28 December 2010, 19:26:55 UTC | Merge branch 'nd/setup' * nd/setup: (47 commits) setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd git.txt: correct where --work-tree path is relative to Revert "Documentation: always respect core.worktree if set" t0001: test git init when run via an alias Remove all logic from get_git_work_tree() setup: rework setup_explicit_git_dir() setup: clean up setup_discovered_git_dir() t1020-subdirectory: test alias expansion in a subdirectory setup: clean up setup_bare_git_dir() setup: limit get_git_work_tree()'s to explicit setup case only Use git_config_early() instead of git_config() during repo setup Add git_config_early() git-rev-parse.txt: clarify --git-dir t1510: setup case #31 t1510: setup case #30 t1510: setup case #29 t1510: setup case #28 t1510: setup case #27 t1510: setup case #26 t1510: setup case #25 ... | 28 December 2010, 19:26:55 UTC |
| 5cd3e10 | Robin H. Johnson | 27 December 2010, 08:03:43 UTC | Fix false positives in t3404 due to SHELL=/bin/false If the user's shell in NSS passwd is /bin/false (eg as found during Gentoo's package building), the git-rebase exec tests will fail, because they call $SHELL around the command, and in the existing testcase, $SHELL was not being cleared sufficently. This lead to false positive failures of t3404 on systems where the package build user was locked down as noted above. Signed-off-by: "Robin H. Johnson" <robbat2@gentoo.org> X-Gentoo-Bug: 349083 X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=349083 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2010, 19:22:16 UTC |
| 0ed7481 | Nguyễn Thái Ngọc Duy | 27 December 2010, 01:26:04 UTC | setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd When setup_work_tree() is called, it moves cwd to $GIT_WORK_TREE and makes internal copy of $GIT_WORK_TREE absolute. The environt variable, if set by user, remains unchanged. If the variable is relative, it is no longer correct because its base dir has changed. Instead of making $GIT_WORK_TREE absolute too, we just say "." and let subsequent git processes handle it. Reported-by: Michel Briand <michelbriand@free.fr> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2010, 16:34:19 UTC |
| 26517de | Junio C Hamano | 26 December 2010, 19:18:39 UTC | Merge branch 'rs/maint-diff-fd-leak' into maint * rs/maint-diff-fd-leak: close file on error in read_mmfile() | 26 December 2010, 19:18:39 UTC |
| 5fd8981 | René Scharfe | 25 December 2010, 12:38:46 UTC | close file on error in read_mmfile() Reported in http://qa.debian.org/daca/cppcheck/sid/git_1.7.2.3-2.2.html and in http://thread.gmane.org/gmane.comp.version-control.git/123042. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 December 2010, 19:17:18 UTC |
| 73e7b2e | Junio C Hamano | 23 December 2010, 20:51:11 UTC | Merge branch 'rj/maint-difftool-cygwin-workaround' * rj/maint-difftool-cygwin-workaround: difftool: Fix failure on Cygwin | 23 December 2010, 20:51:11 UTC |
| 4e3a1b2 | Junio C Hamano | 23 December 2010, 04:33:12 UTC | Merge branch 'maint' * maint: test-lib.sh/test_decode_color(): use octal not hex in awk script | 23 December 2010, 04:33:12 UTC |
| 19128d6 | Brandon Casey | 22 December 2010, 23:58:51 UTC | Makefile: add NO_FNMATCH_CASEFOLD to IRIX sections IRIX's fnmatch() does not support the GNU FNM_CASEFOLD extension, so set NO_FNMATCH_CASEFOLD so that the internal fnmatch implementation will be used. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 December 2010, 03:56:02 UTC |
| c2ed29b | Brandon Casey | 22 December 2010, 23:58:52 UTC | test-lib.sh/test_decode_color(): use octal not hex in awk script POSIX awk seems to explicitly not support hexadecimal escape sequences. From http://pubs.opengroup.org/onlinepubs/009695399/: Regular expressions in awk have been extended somewhat... One sequence that is not supported is hexadecimal value escapes beginning with '\x'. This affects the awk on IRIX 6.5, and causes t4015.56 to fail. Use octal instead. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 December 2010, 03:46:52 UTC |
| ef88ad2 | Junio C Hamano | 23 December 2010, 00:50:28 UTC | rebase --skip: correctly wrap-up when skipping the last patch When "rebase --skip" is used to skip the last patch in the series, the code to wrap up the rewrite by copying the notes from old to new commits and also by running the post-rewrite hook was bypassed. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 December 2010, 00:50:28 UTC |
| 4290f69 | Junio C Hamano | 22 December 2010, 23:18:47 UTC | t0021: avoid getting filter killed with SIGPIPE The fake filter did not read from the standard input at all, which caused the calling side to die with SIGPIPE, depending on the timing. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2010, 23:18:47 UTC |
| 48e0ad0 | Junio C Hamano | 22 December 2010, 22:41:26 UTC | Merge branch 'rj/maint-test-fixes' * rj/maint-test-fixes: t9501-*.sh: Fix a test failure on Cygwin lib-git-svn.sh: Add check for mis-configured web server variables lib-git-svn.sh: Avoid setting web server variables unnecessarily t9142: Move call to start_httpd into the setup test t3600-rm.sh: Don't pass a non-existent prereq to test #15 | 22 December 2010, 22:41:26 UTC |
| cfa775c | Junio C Hamano | 22 December 2010, 22:41:19 UTC | Merge branch 'jc/maint-am-abort-safely' * jc/maint-am-abort-safely: am --abort: keep unrelated commits since the last failure and warn | 22 December 2010, 22:41:19 UTC |
| 3ea3860 | Junio C Hamano | 22 December 2010, 22:41:14 UTC | Merge branch 'jk/commit-die-on-bogus-ident' * jk/commit-die-on-bogus-ident: commit: die before asking to edit the log message ident: die on bogus date format Conflicts: builtin/commit.c | 22 December 2010, 22:41:14 UTC |
| 02fedc0 | Junio C Hamano | 22 December 2010, 22:40:55 UTC | Merge branch 'pd/bash-4-completion' * pd/bash-4-completion: bash: simple reimplementation of _get_comp_words_by_ref bash: get --pretty=m<tab> completion to work with bash v4 Conflicts: contrib/completion/git-completion.bash | 22 December 2010, 22:40:55 UTC |
| e39212a | Junio C Hamano | 22 December 2010, 22:40:26 UTC | Merge branch 'nd/maint-fix-add-typo-detection' * nd/maint-fix-add-typo-detection: Revert "excluded_1(): support exclude files in index" unpack-trees: fix sparse checkout's "unable to match directories" unpack-trees: move all skip-worktree checks back to unpack_trees() dir.c: add free_excludes() cache.h: realign and use (1 << x) form for CE_* constants | 22 December 2010, 22:40:26 UTC |
| 716958c | Junio C Hamano | 22 December 2010, 22:40:17 UTC | Merge branch 'tf/commit-list-prefix' * tf/commit-list-prefix: commit: Add commit_list prefix in two function names. Conflicts: sha1_name.c | 22 December 2010, 22:40:17 UTC |
| e7d1efb | Nguyễn Thái Ngọc Duy | 26 November 2010, 15:32:43 UTC | git.txt: correct where --work-tree path is relative to Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2010, 22:34:25 UTC |
| 98acf75 | Nguyễn Thái Ngọc Duy | 26 November 2010, 15:32:42 UTC | Revert "Documentation: always respect core.worktree if set" This reverts commit f5e025a9d5b35e24768475f6890b836ce0d5ed15. The commit reflected what the code did. But the code did that because it had bugs. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2010, 22:34:25 UTC |
| 4ad8332 | Jonathan Nieder | 26 November 2010, 15:32:41 UTC | t0001: test git init when run via an alias Add some tests to document the correct behavior of (possibly aliased) init when run within and outside a git directory. If I set up a simple git alias “quietinit = init --quiet”, usually it will work just like ‘git init --quiet’. There are some differences, unfortunately, since in the process of checking for aliases, git has to look for a .git/config file. If ‘git quietinit’ is run from a subdirectory of an existing git repository, that repository’s configuration will affect the configuration of the new repository. In particular, the new repository can inherit bogus values for core.bare and core.worktree. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2010, 22:34:24 UTC |
| 8351836 | Nguyễn Thái Ngọc Duy | 26 November 2010, 15:32:40 UTC | Remove all logic from get_git_work_tree() This logic is now only used by cmd_init_db(). setup_* functions do not rely on it any more. Move all the logic to cmd_init_db() and turn get_git_work_tree() into a simple function. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2010, 22:34:24 UTC |
| b3f66fd | Nguyễn Thái Ngọc Duy | 26 November 2010, 15:32:39 UTC | setup: rework setup_explicit_git_dir() This function is the most complex one among the three setup_* functions because all GIT_DIR, GIT_WORK_TREE, core.worktree and core.bare are involved. Because core.worktree is only effective inside setup_explicit_git_dir() and the extra code in setup_git_directory() is to handle that. The extra code can now be retired. Also note that setup_explicit assignment is removed, worktree setting is no longer decided by get_git_work_tree(). get_git_work_tree() will be simplified in the next commit. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2010, 22:34:24 UTC |
| 9951d3b | Nguyễn Thái Ngọc Duy | 26 November 2010, 15:32:38 UTC | setup: clean up setup_discovered_git_dir() If core.bare is true, discard the discovered worktree, move back to original cwd. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2010, 22:34:24 UTC |
| 101662c | Michael J Gruber | 26 November 2010, 15:32:37 UTC | t1020-subdirectory: test alias expansion in a subdirectory Add a test for alias expansion in a subdirectory of the worktree. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2010, 22:34:24 UTC |
| 1cd8031 | Nguyễn Thái Ngọc Duy | 26 November 2010, 15:32:36 UTC | setup: clean up setup_bare_git_dir() work_tree_env argument is removed because this function does not need it. GIT_WORK_TREE is only effective inside setup_explicit_git_dir. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2010, 22:34:24 UTC |
| e6aea2d | Nguyễn Thái Ngọc Duy | 26 November 2010, 15:32:35 UTC | setup: limit get_git_work_tree()'s to explicit setup case only get_git_work_tree() takes input as core.worktree, core.bare, GIT_WORK_TREE and decides correct worktree setting. Unfortunately it does not do its job well. core.worktree and GIT_WORK_TREE should only be taken into account, if GIT_DIR is set (which is handled by setup_explicit_git_dir). For other setup cases, only core.bare matters. Add a temporary variable setup_explicit to adjust get_git_work_tree() behavior as such. This variable will be gone once setup_* rework is done. Also remove is_bare_repository_cfg check in set_git_work_tree() to ease the rework. We are going to check for core.bare and core.worktree early before setting worktree. For example, if core.bare is true, no need to set worktree. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2010, 22:34:24 UTC |
| 337e51c | Nguyễn Thái Ngọc Duy | 26 November 2010, 15:32:34 UTC | Use git_config_early() instead of git_config() during repo setup When git_config() is called, either git_dir has already been set (by $GIT_DIR env or set_git_dir()), or it will default git_dir to ".git". git_config_early() gives setup functions more freedom because it does not require git_dir. Give it a config path, it will happily examine it. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2010, 22:34:24 UTC |
| dbdf585 | Nguyễn Thái Ngọc Duy | 26 November 2010, 15:32:33 UTC | Add git_config_early() This version of git_config() will be used during repository setup. As a repository is being set up, $GIT_DIR is not nailed down yet, git_pathdup() should not be used to get $GIT_DIR/config. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2010, 22:34:24 UTC |
| a2b665d | Pete Wyckoff | 22 December 2010, 14:40:13 UTC | convert filter: supply path to external driver Filtering to support keyword expansion may need the name of the file being filtered. In particular, to support p4 keywords like $File: //depot/product/dir/script.sh $ the smudge filter needs to know the name of the file it is smudging. Allow "%f" in the custom filter command line specified in the configuration. This will be substituted by the filename inside a single-quote pair to be passed to the shell. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2010, 18:19:32 UTC |
| 853563d | Junio C Hamano | 21 December 2010, 22:45:28 UTC | Merge branch 'maint' * maint: t0050: fix printf format strings for portability t3419-*.sh: Fix arithmetic expansion syntax error | 21 December 2010, 22:45:28 UTC |
| 6ae7a51 | Junio C Hamano | 21 December 2010, 22:30:52 UTC | Merge branch 'ks/blame-worktree-textconv-cached' * ks/blame-worktree-textconv-cached: fill_textconv(): Don't get/put cache if sha1 is not valid t/t8006: Demonstrate blame is broken when cachetextconv is on | 21 December 2010, 22:30:52 UTC |
| 3f246b1 | Junio C Hamano | 21 December 2010, 22:30:47 UTC | Merge branch 'jk/t2107-now-passes' * jk/t2107-now-passes: t2107: mark passing test as success | 21 December 2010, 22:30:47 UTC |
| f7d07cc | Junio C Hamano | 21 December 2010, 22:30:43 UTC | Merge branch 'jk/maint-decorate-01-bool' * jk/maint-decorate-01-bool: handle arbitrary ints in git_config_maybe_bool | 21 December 2010, 22:30:43 UTC |
| 876e78f | Junio C Hamano | 21 December 2010, 22:30:23 UTC | Merge branch 'tc/completion-reflog' * tc/completion-reflog: bash completion: add basic support for git-reflog | 21 December 2010, 22:30:23 UTC |
| 41cd797 | Junio C Hamano | 21 December 2010, 22:30:19 UTC | Merge branch 'nd/oneline-sha1-name-from-specific-ref' * nd/oneline-sha1-name-from-specific-ref: get_sha1: handle special case $commit^{/} get_sha1: support $commit^{/regex} syntax get_sha1_oneline: make callers prepare the commit list to traverse get_sha1_oneline: fix lifespan rule of temp_commit_buffer variable | 21 December 2010, 22:30:19 UTC |
| 643b6ef | Junio C Hamano | 21 December 2010, 22:30:09 UTC | Merge branch 'jn/maint-gitweb-pathinfo-fix' * jn/maint-gitweb-pathinfo-fix: gitweb: Fix handling of whitespace in generated links | 21 December 2010, 22:30:09 UTC |
| 77e5726 | Jonathan Nieder | 21 December 2010, 20:27:55 UTC | t0050: fix printf format strings for portability Unlike bash and ksh, dash passes through hexadecimal \xcc escapes. So when run with dash, these tests *pass* (since '\xcc' is a perfectly reasonable filename) but they are not testing what was intended. Use octal escapes instead, in the spirit of v1.6.1-rc1~55^2 (2008-11-09). Reported-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2010, 21:26:32 UTC |
| 00f66f0 | Ramsay Jones | 21 December 2010, 18:50:47 UTC | t3419-*.sh: Fix arithmetic expansion syntax error Some shells, for example dash versions older than 0.5.4, need to spell a variable reference as '$N' rather than 'N' in an arithmetic expansion. In order to avoid the syntax error, we change the offending variable reference from 'i' to '$i' in function scramble. There is nothing bash specific to this test script (and we shouldn't have any bash dependent test). Fix its shebang line. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2010, 20:26:21 UTC |
| 7b3b7e3 | Junio C Hamano | 21 December 2010, 18:35:53 UTC | am --abort: keep unrelated commits since the last failure and warn After making commits (either by pulling or doing their own work) after a failed "am", the user will be reminded by next "am" invocation that there was a failed "am" that the user needs to decide to resolve or to get rid of the old "am" attempt. The "am --abort" option was meant to help the latter. However, it rewinded the HEAD back to the beginning of the failed "am" attempt, discarding commits made (perhaps by mistake) since. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2010, 19:16:28 UTC |
| 00b0d7f | Junio C Hamano | 21 December 2010, 17:24:18 UTC | set_try_to_free_routine(NULL) means "do nothing special" This way, the next caller that wants to disable our memory reclamation machinery does not have to define its own do_nothing() stub. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2010, 17:25:14 UTC |
| 4c28e4a | Junio C Hamano | 21 December 2010, 01:00:36 UTC | commit: die before asking to edit the log message When determine_author_info() returns to the calling prepare_to_commit(), we already know the pieces of information necessary to determine what author ident will be used in the final message, but deferred making a call to fmt_ident() before the final commit_tree(). Most importantly, we would open the editor to ask the user to compose the log message before it. As one important side effect of fmt_ident() is to error out when the given information is malformed, this resulted in us spawning the editor first and then refusing to commit due to error, even though we had enough information to detect the error before starting the editor, which was annoying. Move the fmt_ident() call to the end of determine_author_info() where we have final determination of author info to rectify this. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2010, 01:45:51 UTC |
| 6068ac8 | Martin von Zweigbergk | 20 December 2010, 15:18:25 UTC | completion: add missing configuration variables Quite a few configuration variables have been added since 226b343 (completion: add missing configuration variables to _git_config(), 2009-05-03). Add these variables to the Bash completion script. Also remove the obsolete 'add.ignore-errors' and 'color.grep.external', as well as 'diff.renameLimit.', which never existed and rename the misspelled 'sendemail.aliasesfiletype'. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2010, 01:21:21 UTC |
| 4579bb4 | Jeff King | 13 December 2010, 17:02:25 UTC | ident: die on bogus date format If the user gives "git commit --date=foobar", we silently ignore the --date flag. We should note the error. This patch puts the fix at the lowest level of fmt_ident, which means it also handles GIT_AUTHOR_DATE=foobar, as well. There are two down-sides to this approach: 1. Technically this breaks somebody doing something like "git commit --date=now", which happened to work because bogus data is the same as "now". Though we do explicitly handle the empty string, so anybody passing an empty variable through the environment will still work. If the error is too much, perhaps it can be downgraded to a warning? 2. The error checking happens _after_ the commit message is written, which can be annoying to the user. We can put explicit checks closer to the beginning of git-commit, but that feels a little hack-ish; suddenly git-commit has to care about how fmt_ident works. Maybe we could simply call fmt_ident earlier? Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2010, 18:28:19 UTC |
| 9ec09b0 | Kirill Smelkov | 18 December 2010, 14:54:12 UTC | fill_textconv(): Don't get/put cache if sha1 is not valid When blaming files in the working tree, the filespec is marked with !sha1_valid, as we have not given the contents an object name yet. The function to cache textconv results (keyed on the object name), however, didn't check this condition, and ended up on storing the cached result under a random object name. Cc: Axel Bonnet <axel.bonnet@ensimag.imag.fr> Cc: Clément Poulain <clement.poulain@ensimag.imag.fr> Cc: Diane Gasselin <diane.gasselin@ensimag.imag.fr> Cc: Jeff King <peff@peff.net> Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2010, 02:41:32 UTC |
| b1b14ec | Kirill Smelkov | 18 December 2010, 14:54:11 UTC | t/t8006: Demonstrate blame is broken when cachetextconv is on I have a git repository with lots of .doc and .pdf files. There diff works ok, but blaming is painfully slow without textconv cache, and with textconv cache, blame says lots of lines are 'Not Yet Committed' which is wrong. Here is a test that demonstrates the problem. Cc: Axel Bonnet <axel.bonnet@ensimag.imag.fr> Cc: Clément Poulain <clement.poulain@ensimag.imag.fr> Cc: Diane Gasselin <diane.gasselin@ensimag.imag.fr> Cc: Jeff King <peff@peff.net> Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2010, 02:17:00 UTC |
| f29db85 | Junio C Hamano | 20 December 2010, 01:49:42 UTC | Merge branch 'maint' * maint: gitweb: Include links to feeds in HTML header only for '200 OK' response fsck docs: remove outdated and useless diagnostic userdiff: fix typo in ruby and python word regexes trace.c: mark file-local function static Fix typo in git-gc document. | 20 December 2010, 01:49:42 UTC |
| 4de0bbd | Jonathan Nieder | 13 December 2010, 09:28:05 UTC | t9300: use perl "head -c" clone in place of "dd bs=1 count=16000" kluge It is unfortunate to have to issue thousands of one-byte read calls to work around dd's refusal to buffer input that would fill a block after a short read (a3a6f4, 2010-12-13). We could do better by using "head -c", if it were available on all platforms we cared about. Replace it with some simple perl. While doing so, restructure 9300.114 to use a subshell instead of a script. Subshells can inherit functions (like the new head_c) from the parent shell while external scripts cannot. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2010, 21:51:09 UTC |
| ac5ad86 | Jeff King | 19 December 2010, 03:53:58 UTC | t2107: mark passing test as success This failed on the branch where it was introduced, but was fixed by merging with 6e67619 (Merge branch 'jn/parse-options-extra'). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2010, 18:49:34 UTC |
| db6195e | Jeff King | 19 December 2010, 03:36:41 UTC | handle arbitrary ints in git_config_maybe_bool This function recently gained the ability to recognize the documented "0" and "1" values as false/true. However, unlike regular git_config_bool, it did not treat arbitrary non-zero numbers as true. While this is undocumented and probably ridiculous for somebody to rely on, it is safer to behave exactly as git_config_bool would. Because git_config_maybe_bool can be used to retrofit new non-bool values onto existing bool options, not behaving in exactly the same way is technically a regression. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2010, 18:46:08 UTC |
| 834d9eb | Thiago Farina | 19 December 2010, 11:56:25 UTC | builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc. Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2010, 18:44:06 UTC |
| fcbc0d8 | Thiago Farina | 14 December 2010, 01:59:55 UTC | builtin/branch.c: Use ALLOC_GROW instead of alloc_nr and xrealloc. Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2010, 18:43:53 UTC |
| 05bb5a2 | Jakub Narebski | 18 December 2010, 20:02:13 UTC | gitweb: Include links to feeds in HTML header only for '200 OK' response To do that, generating "<link />"s to feeds were refactored into print_feed_meta() subroutine, to keep nesting (indent) level in git_header_html() low. This has also the advantage of making code more clear. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: John 'Warthog9' Hawley <warthog9@eaglescrag.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2010, 06:58:45 UTC |
| 0c806a0 | Mark Lodato | 18 December 2010, 05:38:38 UTC | fsck docs: remove outdated and useless diagnostic In git-fsck(1), there was a reference to the warning "<tree> has full pathnames in it". This exact wording has not been used since 2005 (commit f1f0d0889e55), when the wording was changed slightly. More importantly, the description of that warning was useless, and there were many other similar warning messages which were not document at all. Since all these warnings are fairly obvious, there is no need for them to be in the man page. Signed-off-by: Mark Lodato <lodatom@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2010, 06:58:40 UTC |
| b34f69f | Thomas Rast | 18 December 2010, 16:17:53 UTC | userdiff: fix typo in ruby and python word regexes Both had an unclosed ] that ruined the safeguard against not matching a non-space char. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2010, 06:58:40 UTC |
| 8e8aa44 | Vasyl' Vavrychuk | 16 December 2010, 22:38:42 UTC | trace.c: mark file-local function static Signed-off-by: Vasyl' Vavrychuk <vvavrychuk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2010, 21:40:32 UTC |
| 057f327 | Tay Ray Chuan | 16 December 2010, 06:56:08 UTC | bash completion: add basic support for git-reflog "Promote" the reflog command out of plumbing, so that we now run completion for it. After all, it's listed under porcelain (ancillary), and we do run completion for those commands. Add basic completion for the three subcommands - show, expire, delete. Try completing refs for these too. Helped-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2010, 19:55:19 UTC |
| 4be0c35 | Jiang Xin | 16 December 2010, 07:16:49 UTC | Fix typo in git-gc document. The variable gc.packrefs for git-gc can be set to true, false and "notbare", not "nobare". Signed-off-by: Jiang Xin <jiangxin@ossxp.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2010, 19:53:53 UTC |
| 1b97434 | Junio C Hamano | 17 December 2010, 05:43:08 UTC | Update draft release notes to 1.7.4 We are getting closer to -rc0 ;-) Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2010, 05:43:08 UTC |
| 38a5932 | Junio C Hamano | 17 December 2010, 00:36:03 UTC | Merge branch 'maint' * maint: difftool: provide basename to external tools git-difftool.txt: correct the description of $BASE and describe $MERGED | 17 December 2010, 00:36:03 UTC |
| 4322842 | Nguyễn Thái Ngọc Duy | 15 December 2010, 09:02:54 UTC | get_sha1: handle special case $commit^{/} Empty regex pattern should always match. But the exact behavior of regexec() may vary. Because it always matches anyway, we can just return 'matched' without calling regex machinery. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2010, 21:11:42 UTC |
| 4a689af | Michael J Gruber | 14 December 2010, 09:18:35 UTC | difftool: provide basename to external tools Currently, only configured diff helpers get the basename of the file being compared. Tools specified with "git difftool -x" only get the names of temporary files for the different versions. Export BASE so that an external tool can read the name from the environment. Rather than using a third argument, this avoids breaking existing scripts which may somewhat carelessly be using "$@" rather than "$1" "$2". Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2010, 21:01:36 UTC |
| 51bacee | Michael J Gruber | 14 December 2010, 09:18:34 UTC | git-difftool.txt: correct the description of $BASE and describe $MERGED Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2010, 21:01:31 UTC |
| cf7a64b | Junio C Hamano | 16 December 2010, 20:58:59 UTC | Merge branch 'kb/diff-C-M-synonym' * kb/diff-C-M-synonym: diff: use "find" instead of "detect" as prefix for long forms of -M and -C diff: add --detect-copies-harder as a synonym for --find-copies-harder | 16 December 2010, 20:58:59 UTC |
| 9145842 | Junio C Hamano | 16 December 2010, 20:58:38 UTC | Merge branch 'jn/fast-import-blob-access' * jn/fast-import-blob-access: t9300: avoid short reads from dd t9300: remove unnecessary use of /dev/stdin fast-import: Allow cat-blob requests at arbitrary points in stream fast-import: let importers retrieve blobs fast-import: clarify documentation of "feature" command fast-import: stricter parsing of integer options Conflicts: fast-import.c | 16 December 2010, 20:58:38 UTC |
| 4bb4d30 | Junio C Hamano | 16 December 2010, 20:57:15 UTC | Merge branch 'jl/fetch-submodule-recursive' * jl/fetch-submodule-recursive: fetch_populated_submodules(): document dynamic allocation Submodules: Add the "fetchRecurseSubmodules" config option Add the 'fetch.recurseSubmodules' config setting fetch/pull: Add the --recurse-submodules option Conflicts: builtin/fetch.c | 16 December 2010, 20:57:15 UTC |
| b5c6aac | Junio C Hamano | 16 December 2010, 20:55:36 UTC | Merge branch 'rj/msvc-fix' * rj/msvc-fix: msvc: Fix macro redefinition warnings msvc: Fix build by adding missing INTMAX_MAX define msvc: git-daemon.exe: Fix linker "unresolved externals" error msvc: Fix compilation errors in compat/win32/sys/poll.c | 16 December 2010, 20:55:36 UTC |
| 620b89c | Junio C Hamano | 16 December 2010, 20:51:05 UTC | Merge branch 'nd/extended-sha1-relpath' * nd/extended-sha1-relpath: get_sha1: teach ":$n:<path>" the same relative path logic get_sha1: support relative path ":path" syntax Make prefix_path() return char* without const Conflicts: sha1_name.c | 16 December 2010, 20:51:05 UTC |
| f68b780 | Junio C Hamano | 16 December 2010, 20:50:03 UTC | Merge branch 'aa/status-hilite-branch' * aa/status-hilite-branch: default color.status.branch to "same as header" status: show branchname with a configurable color | 16 December 2010, 20:50:03 UTC |
| b932c3c | Junio C Hamano | 16 December 2010, 20:49:59 UTC | Merge branch 'ak/describe-exact' * ak/describe-exact: describe: Delay looking up commits until searching for an inexact match describe: Store commit_names in a hash table by commit SHA1 describe: Do not use a flex array in struct commit_name describe: Use for_each_rawref | 16 December 2010, 20:49:59 UTC |
| 20cb8e2 | Junio C Hamano | 16 December 2010, 20:49:48 UTC | Merge branch 'nd/maint-relative' * nd/maint-relative: get_cwd_relative(): do not misinterpret root path | 16 December 2010, 20:49:48 UTC |
| b720c75 | Junio C Hamano | 16 December 2010, 20:49:35 UTC | Merge branch 'jn/maint-svn-fe' * jn/maint-svn-fe: t9010 fails when no svn is available vcs-svn: fix intermittent repo_tree corruption treap: make treap_insert return inserted node t9010 (svn-fe): Eliminate dependency on svn perl bindings | 16 December 2010, 20:49:35 UTC |
| f1f7677 | Junio C Hamano | 16 December 2010, 20:49:28 UTC | Merge branch 'jc/maint-svn-info-test-fix' * jc/maint-svn-info-test-fix: t9119: do not compare "Text Last Updated" line from "svn info" | 16 December 2010, 20:49:28 UTC |
| 7eaf4af | Junio C Hamano | 16 December 2010, 20:49:22 UTC | Merge branch 'jn/submodule-b-current' * jn/submodule-b-current: git submodule: Remove now obsolete tests before cloning a repo git submodule -b ... of current HEAD fails | 16 December 2010, 20:49:22 UTC |
| c835288 | Junio C Hamano | 16 December 2010, 20:49:16 UTC | Merge branch 'jn/maint-fast-import-object-reuse' * jn/maint-fast-import-object-reuse: fast-import: insert new object entries at start of hash bucket | 16 December 2010, 20:49:16 UTC |
| f73c3e9 | Junio C Hamano | 16 December 2010, 20:49:11 UTC | Merge branch 'jn/fast-import-ondemand-checkpoint' * jn/fast-import-ondemand-checkpoint: fast-import: treat SIGUSR1 as a request to access objects early | 16 December 2010, 20:49:11 UTC |
| 15368e1 | Junio C Hamano | 15 December 2010, 23:30:49 UTC | Sync with 1.7.3.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2010, 00:27:40 UTC |
