| bc1bbe0 | Junio C Hamano | 13 November 2011, 06:14:53 UTC | Git 1.7.8-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 November 2011, 06:14:53 UTC |
| dc865af | Junio C Hamano | 12 November 2011, 05:34:06 UTC | Merge branch 'ly/mktree-using-strbuf' * ly/mktree-using-strbuf: mktree: fix a memory leak in write_tree() | 12 November 2011, 05:34:06 UTC |
| c444c16 | Junio C Hamano | 10 November 2011, 17:10:51 UTC | Merge "Move 'builtin-*' into a 'builtin/' subdirectory" | 10 November 2011, 17:10:51 UTC |
| 77f143b | Junio C Hamano | 10 November 2011, 17:05:31 UTC | Merge 'build-in git-mktree' * commit '633e3556ccbc': (5835 commits) build-in git-mktree allow -t abbreviation for --track in git branch gitweb: Remove function prototypes (cleanup) Documentation: cloning to empty directory is allowed Clarify kind of conflict in merge-one-file helper git config: clarify --add and --get-color archive-tar.c: squelch a type mismatch warning Start 1.6.4 development Start 1.6.3.1 maintenance series. GIT 1.6.3 t4029: use sh instead of bash t4200: convert sed expression which operates on non-text file to perl t4200: remove two unnecessary lines t/annotate-tests.sh: avoid passing a non-newline terminated file to sed t4118: avoid sed invocation on file without terminating newline t4118: add missing '&&' t8005: use egrep when extended regular expressions are required git-clean doc: the command only affects paths under $(cwd) improve error message in config.c t4018-diff-funcname: add cpp xfuncname pattern to syntax test ... | 10 November 2011, 17:05:31 UTC |
| cd9519b | Liu Yuan | 10 November 2011, 08:39:22 UTC | mktree: fix a memory leak in write_tree() We forget to call strbuf_release to release the buf memory. Signed-off-by: Liu Yuan <tailai.ly@taobao.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 November 2011, 17:04:08 UTC |
| 248dbbe | Junio C Hamano | 09 November 2011, 13:46:39 UTC | Merge branch 'sn/complete-bash-wo-process-subst' * sn/complete-bash-wo-process-subst: completion: don't leak variable from the prompt into environment | 09 November 2011, 13:46:39 UTC |
| 4804d43 | SZEDER Gábor | 09 November 2011, 10:02:50 UTC | completion: don't leak variable from the prompt into environment Commit e5b8eebc (completion: fix issue with process substitution not working on Git for Windows, 2011-10-26) introduced a new variable in __git_ps1_show_upstream(), but didn't declare it as local to prevent it from leaking into the environment. We may want to rewrite it like the following, but that can wait until the next cycle. while read key value do ... done <<-EOF $(git config -z --get-regexp ...) EOF Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 November 2011, 13:44:05 UTC |
| 8a04247 | Junio C Hamano | 09 November 2011, 00:42:33 UTC | Update draft release notes to 1.7.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 November 2011, 00:42:33 UTC |
| d7a0129 | Junio C Hamano | 09 November 2011, 00:40:31 UTC | Merge branch 'jc/remote-setbranches-usage-fix' * jc/remote-setbranches-usage-fix: remote: fix set-branches usage | 09 November 2011, 00:40:31 UTC |
| 8327ee8 | Junio C Hamano | 09 November 2011, 00:40:27 UTC | Merge branch 'fc/remote-seturl-usage-fix' * fc/remote-seturl-usage-fix: remote: fix remote set-url usage | 09 November 2011, 00:40:27 UTC |
| 14ba45a | Junio C Hamano | 09 November 2011, 00:38:14 UTC | Sync with 1.7.7.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 November 2011, 00:38:14 UTC |
| d4d5ab4 | Junio C Hamano | 09 November 2011, 00:37:00 UTC | Git 1.7.7.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 November 2011, 00:37:00 UTC |
| 916034b | Junio C Hamano | 09 November 2011, 00:35:53 UTC | Merge branch 'jc/maint-remove-renamed-ref' into maint * jc/maint-remove-renamed-ref: branch -m/-M: remove undocumented RENAMED-REF Conflicts: refs.c | 09 November 2011, 00:35:53 UTC |
| 1a61a9d | Junio C Hamano | 09 November 2011, 00:26:50 UTC | Merge branch 'jm/maint-gitweb-filter-forks-fix' into maint * jm/maint-gitweb-filter-forks-fix: gitweb: fix regression when filtering out forks | 09 November 2011, 00:26:50 UTC |
| 992499d | Junio C Hamano | 09 November 2011, 00:26:45 UTC | Merge branch 'dm/pack-objects-update' into maint * dm/pack-objects-update: pack-objects: don't traverse objects unnecessarily pack-objects: rewrite add_descendants_to_write_order() iteratively pack-objects: use unsigned int for counter and offset values pack-objects: mark add_to_write_order() as inline | 09 November 2011, 00:26:45 UTC |
| fcbebfd | Junio C Hamano | 08 November 2011, 18:17:40 UTC | docs: Update install-doc-quick The preformatted documentation pages live in their own repositories these days. Adjust the installation procedure to the updated layout. Tested-by: Stefan Naewe <stefan.naewe@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 November 2011, 21:37:10 UTC |
| 939ca96 | Jeff King | 08 November 2011, 21:29:30 UTC | docs: don't mention --quiet or --exit-code in git-log(1) These are diff-options, but they don't actually make sense in the context of log. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 November 2011, 21:37:02 UTC |
| 4cb6764 | Junio C Hamano | 08 November 2011, 00:48:34 UTC | Git 1.7.8-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 November 2011, 00:48:34 UTC |
| 92622e6 | Junio C Hamano | 08 November 2011, 00:43:19 UTC | Merge branch 'ss/blame-textconv-fake-working-tree' * ss/blame-textconv-fake-working-tree: blame.c: Properly initialize strbuf after calling textconv_object(), again | 08 November 2011, 00:43:19 UTC |
| 8518088 | Sebastian Schuberth | 07 November 2011, 17:33:34 UTC | blame.c: Properly initialize strbuf after calling textconv_object(), again 2564aa4 started to initialize buf.alloc, but that should actually be one more byte than the string length due to the trailing \0. Also, do not modify buf.alloc out of the strbuf code. Use the existing strbuf_attach instead. Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 November 2011, 00:42:57 UTC |
| 5ae0f68 | Junio C Hamano | 07 November 2011, 05:22:22 UTC | Merge branch 'ab/i18n-test-fix' * ab/i18n-test-fix: t/t7508-status.sh: use test_i18ncmp t/t6030-bisect-porcelain.sh: use test_i18ngrep | 07 November 2011, 05:22:22 UTC |
| 78c17b9 | Junio C Hamano | 07 November 2011, 05:22:19 UTC | Merge branch 'sn/http-auth-with-netrc-fix' * sn/http-auth-with-netrc-fix: http: don't always prompt for password | 07 November 2011, 05:22:19 UTC |
| de26347 | Junio C Hamano | 07 November 2011, 05:21:57 UTC | Merge branch 'pw/p4-appledouble-fix' * pw/p4-appledouble-fix: git-p4: ignore apple filetype | 07 November 2011, 05:21:57 UTC |
| c49904e | Felipe Contreras | 07 November 2011, 03:36:57 UTC | remote: fix remote set-url usage Bad copy-paste. Otherwise the help text for "git remote set-url --help" would show help for "git remote update" subcommand. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 November 2011, 05:16:34 UTC |
| 656cdf0 | Junio C Hamano | 07 November 2011, 05:12:59 UTC | remote: fix set-branches usage Bad copy-paste. Otherwise "git remote set-branches" without necessary argument will result in an error message and help for set-url subcommand. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 November 2011, 05:15:30 UTC |
| 9f7ef0e | Pete Wyckoff | 05 November 2011, 17:36:07 UTC | git-p4: ignore apple filetype Revert 97a21ca (git-p4: stop ignoring apple filetype, 2011-10-16) and add a test case. Reported-by: Michael Wookey <michaelwookey@gmail.com> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 November 2011, 06:17:52 UTC |
| ca0f515 | Ævar Arnfjörð Bjarmason | 05 November 2011, 17:28:43 UTC | t/t7508-status.sh: use test_i18ncmp Change a i18n-specific comparison in t/t7508-status.sh to use test_i18ncmp instead. This was introduced in v1.7.6.3~11^2 and has been broken under GETTEXT_POISON=YesPlease since. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 November 2011, 06:14:26 UTC |
| 475b377 | Ævar Arnfjörð Bjarmason | 05 November 2011, 17:28:42 UTC | t/t6030-bisect-porcelain.sh: use test_i18ngrep Change a i18n-specific grep in t/t6030-bisect-porcelain.sh to use test_i18ngrep instead. This was introduced in v1.7.7.2~5^2~11 and has been broken under GETTEXT_POISON=YesPlease since. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 November 2011, 06:14:25 UTC |
| 986bbc0 | Stefan Naewe | 04 November 2011, 07:03:08 UTC | http: don't always prompt for password When a username is already specified at the beginning of any HTTP transaction (e.g. "git push https://user@hosting.example.com/project.git" or "git ls-remote https://user@hosting.example.com/project.git"), the code interactively asks for a password before calling into the libcurl library. It is very likely that the reason why user included the username in the URL is because the user knows that it would require authentication to access the resource. Asking for the password upfront would save one roundtrip to get a 401 response, getting the password and then retrying the request. This is a reasonable optimization. HOWEVER. This is done even when $HOME/.netrc might have a corresponding entry to access the site, or the site does not require authentication to access the resource after all. But neither condition can be determined until we call into libcurl library (we do not read and parse $HOME/.netrc ourselves). In these cases, the user is forced to respond to the password prompt, only to give a password that is not used in the HTTP transaction. If the password is in $HOME/.netrc, an empty input would later let the libcurl layer to pick up the password from there, and if the resource does not require authentication, any input would be taken and then discarded without getting used. It is wasteful to ask this unused information to the end user. Reduce the confusion by not trying to optimize for this case and always incur roundtrip penalty. An alternative might be to document this and keep this round-trip optimization as-is. Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 November 2011, 16:47:18 UTC |
| ee6dfb2 | Junio C Hamano | 03 November 2011, 19:15:08 UTC | receive-pack: do not expect object 0{40} to exist When pushing to delete a ref, it uses 0{40} as an object name to signal that the request is a deletion. We shouldn't trigger "deletion of a corrupt ref" warning in such a case, which was designed to notice that a ref points at an object that is truly missing from the repository. Reported-by: Stefan Näwe Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 November 2011, 21:27:04 UTC |
| db85b3a | Stefan Naewe | 02 November 2011, 15:07:05 UTC | t3200: add test case for 'branch -m' Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 November 2011, 19:36:56 UTC |
| 3706ed2 | Tay Ray Chuan | 02 November 2011, 16:17:12 UTC | branch -m: handle no arg properly Modify the option parsing heuristic to handle all -m (rename) cases, including the no-arg case. Previously, this "fell through" to the (argc <= 2) case and caused segfault. Reported-by: Stefan Näwe <stefan.naewe@atlas-elektronik.com> Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 November 2011, 19:35:37 UTC |
| 87bf9a7 | Junio C Hamano | 01 November 2011, 23:37:33 UTC | Update draft release notes to 1.7.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 November 2011, 23:44:57 UTC |
| 79eec36 | Junio C Hamano | 01 November 2011, 23:20:42 UTC | Sync with 1.7.7.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 November 2011, 23:43:50 UTC |
| 8d19b44 | Junio C Hamano | 01 November 2011, 23:16:36 UTC | Git 1.7.7.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 November 2011, 23:41:57 UTC |
| 60a31ec | Junio C Hamano | 01 November 2011, 23:41:41 UTC | Merge branch 'rs/maint-estimate-cache-size' into maint * rs/maint-estimate-cache-size: t7511: avoid use of reserved filename on Windows. | 01 November 2011, 23:41:41 UTC |
| ac7acaa | Junio C Hamano | 01 November 2011, 23:12:19 UTC | Merge branch 'md/smtp-tls-hello-again' into maint * md/smtp-tls-hello-again: send-email: Honour SMTP domain when using TLS | 01 November 2011, 23:12:19 UTC |
| 0814d6e | Junio C Hamano | 01 November 2011, 23:11:00 UTC | Merge branch 'jk/pull-rebase-with-work-tree' into maint * jk/pull-rebase-with-work-tree: pull,rebase: handle GIT_WORK_TREE better Conflicts: git-pull.sh | 01 November 2011, 23:11:00 UTC |
| eee947f | Junio C Hamano | 01 November 2011, 23:10:56 UTC | Merge branch 'jc/maint-diffstat-numstat-context' into maint * jc/maint-diffstat-numstat-context: diff: teach --stat/--numstat to honor -U$num | 01 November 2011, 23:10:56 UTC |
| dddc411 | Junio C Hamano | 01 November 2011, 23:03:35 UTC | Merge branch 'js/bisect-no-checkout' into maint * js/bisect-no-checkout: bisect: fix exiting when checkout failed in bisect_start() | 01 November 2011, 23:03:35 UTC |
| a4fdd79 | Junio C Hamano | 01 November 2011, 22:54:45 UTC | Merge branch 'bc/attr-ignore-case' into maint * bc/attr-ignore-case: attr.c: respect core.ignorecase when matching attribute patterns attr: read core.attributesfile from git_default_core_config builtin/mv.c: plug miniscule memory leak cleanup: use internal memory allocation wrapper functions everywhere attr.c: avoid inappropriate access to strbuf "buf" member Conflicts: remote.c | 01 November 2011, 22:54:46 UTC |
| ffa4c36 | Junio C Hamano | 01 November 2011, 22:51:01 UTC | Merge branch 'cn/fetch-prune' into maint * cn/fetch-prune: fetch: treat --tags like refs/tags/*:refs/tags/* when pruning fetch: honor the user-provided refspecs when pruning refs remote: separate out the remote_find_tracking logic into query_refspecs t5510: add tests for fetch --prune fetch: free all the additional refspecs | 01 November 2011, 22:51:01 UTC |
| 7fa6c90 | Junio C Hamano | 01 November 2011, 22:45:16 UTC | Merge branch 'sp/smart-http-failure' into maint * sp/smart-http-failure: remote-curl: Fix warning after HTTP failure | 01 November 2011, 22:45:16 UTC |
| 5b5d92a | Junio C Hamano | 01 November 2011, 22:42:25 UTC | Merge jn/maint-http-error-message * commit 'be22d92eac809ad2bfa2b7c83ad7cad5a15f1c43': http: avoid empty error messages for some curl errors http: remove extra newline in error message | 01 November 2011, 22:42:25 UTC |
| b1b7ced | Junio C Hamano | 01 November 2011, 22:31:12 UTC | Merge branch 'jk/name-hash-dirent' * jk/name-hash-dirent: name-hash.c: always initialize dir_next pointer | 01 November 2011, 22:31:12 UTC |
| 395c735 | Johannes Sixt | 01 November 2011, 22:21:06 UTC | name-hash.c: always initialize dir_next pointer Test t2021-checkout-overwrite.sh reveals a segfault in 'git add' on a case-insensitive file system when git is compiled with XMALLOC_POISON defined. The reason is that 2548183b (fix phantom untracked files when core.ignorecase is set) added a new member dir_next to struct cache_entry, but forgot to initialize it in all cases. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 November 2011, 22:29:18 UTC |
| b919f84 | Junio C Hamano | 01 November 2011, 22:20:28 UTC | Merge branch 'ss/blame-textconv-fake-working-tree' * ss/blame-textconv-fake-working-tree: (squash) test for previous blame.c: Properly initialize strbuf after calling, textconv_object() Conflicts: t/t8006-blame-textconv.sh | 01 November 2011, 22:20:28 UTC |
| 7406aa2 | Junio C Hamano | 01 November 2011, 22:20:22 UTC | Merge branch 'ef/mingw-upload-archive' * ef/mingw-upload-archive: mingw: poll.h is no longer in sys/ upload-archive: use start_command instead of fork compat/win32/poll.c: upgrade from upstream mingw: move poll out of sys-folder | 01 November 2011, 22:20:22 UTC |
| 84a9ea9 | Junio C Hamano | 01 November 2011, 22:20:07 UTC | Merge branch 'dm/pack-objects-update' * dm/pack-objects-update: pack-objects: don't traverse objects unnecessarily pack-objects: rewrite add_descendants_to_write_order() iteratively pack-objects: use unsigned int for counter and offset values pack-objects: mark add_to_write_order() as inline | 01 November 2011, 22:20:07 UTC |
| c17f1a9 | Junio C Hamano | 01 November 2011, 22:20:03 UTC | Merge branch 'nd/pretty-commit-log-message' * nd/pretty-commit-log-message: pretty.c: use original commit message if reencoding fails pretty.c: free get_header() return value | 01 November 2011, 22:20:03 UTC |
| 0e7e30f | Ted Percival | 31 October 2011, 22:37:12 UTC | svn: Quote repository root in regex match Fixes a problem matching repository URLs, especially those with a '+' in the URL, such as svn+ssh:// URLs. Parts of the URL were interpreted as special characters by the regex matching. Signed-off-by: Ted Percival <ted.percival@quest.com> Acked-by: Eric Wong <normalperson@yhbt.net> | 01 November 2011, 20:05:33 UTC |
| 2d52ea9 | Erik Faye-Lund | 01 November 2011, 11:56:21 UTC | mingw: poll.h is no longer in sys/ Earlier we moved this header file in the code but forgot to update the Makefile that refers to it. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 November 2011, 17:02:11 UTC |
| b323c64 | Pat Thoyts | 31 October 2011, 14:07:27 UTC | t7511: avoid use of reserved filename on Windows. PRN is a special filename on Windows to send data to the printer. As this is generated during test 3 substitute an alternate prefix to avoid this. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2011, 19:31:42 UTC |
| be3fa91 | Junio C Hamano | 31 October 2011, 02:14:24 UTC | Git 1.7.8-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2011, 02:14:24 UTC |
| 324bc2a | Junio C Hamano | 31 October 2011, 02:13:13 UTC | Merge branch 'jk/git-tricks' * jk/git-tricks: completion: match ctags symbol names in grep patterns contrib: add git-jump script contrib: add diff highlight script | 31 October 2011, 02:13:13 UTC |
| c09cd77 | Erik Faye-Lund | 24 October 2011, 16:02:11 UTC | upload-archive: use start_command instead of fork The POSIX-function fork is not supported on Windows. Use our start_command API instead. As this is the last call-site that depends on the fork-stub in compat/mingw.h, remove that as well. Add an undocumented flag to git-archive that tells it that the action originated from a remote, so features can be disabled. Thanks to Jeff King for work on this part. Remove the NOT_MINGW-prereq for t5000, as git-archive --remote now works. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2011, 01:45:21 UTC |
| f0bd664 | Erik Faye-Lund | 24 October 2011, 16:02:10 UTC | compat/win32/poll.c: upgrade from upstream poll.c is updated from revision adc3a5b in git://git.savannah.gnu.org/gnulib.git The changes are applied with --whitespace=fix to reduce noise. poll.h is not upgraded, because the most recent version now contains template-stuff that breaks compilation for us. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2011, 01:45:16 UTC |
| 0f77dea | Erik Faye-Lund | 24 October 2011, 16:02:09 UTC | mingw: move poll out of sys-folder Both XSI and upstream Gnulib versions expects to find poll.h at the root of some include path, not inside the sys-folder. This helps us when upgrading Gnulib. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2011, 01:44:28 UTC |
| 55e7c0a | Junio C Hamano | 28 October 2011, 16:36:55 UTC | (squash) test for previous Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 October 2011, 16:36:55 UTC |
| 2564aa4 | Sebastian Schuberth | 28 October 2011, 15:28:28 UTC | blame.c: Properly initialize strbuf after calling, textconv_object() For a plain string where only the length is known, strbuf.alloc needs to be initialized to the length. Otherwise strbuf.alloc is 0 and a later call to strbuf_setlen() will fail. This bug surfaced when calling git blame under Windows on a *.doc file. The *.doc file is converted to plain text by antiword via the textconv mechanism. However, the plain text returned by antiword contains DOS line endings instead of Unix line endings which triggered the strbuf_setlen() which previous to this patch failed. Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 October 2011, 15:41:56 UTC |
| e8e1c29 | Junio C Hamano | 27 October 2011, 19:06:44 UTC | Update draft release notes to 1.7.8 Getting very close to -rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 October 2011, 19:06:44 UTC |
| 4801546 | Junio C Hamano | 27 October 2011, 19:04:28 UTC | Merge branch 'sn/complete-bash-wo-process-subst' * sn/complete-bash-wo-process-subst: completion: fix issue with process substitution not working on Git for Windows | 27 October 2011, 19:04:28 UTC |
| f124fe3 | Junio C Hamano | 27 October 2011, 19:04:21 UTC | Merge branch 'rj/gitweb-clean-js' * rj/gitweb-clean-js: gitweb/Makefile: Remove static/gitweb.js in the clean target | 27 October 2011, 19:04:21 UTC |
| 220c045 | Junio C Hamano | 27 October 2011, 19:04:02 UTC | Merge branch 'js/grep-mutex' * js/grep-mutex: builtin/grep: simplify lock_and_read_sha1_file() builtin/grep: make lock/unlock into static inline functions git grep: be careful to use mutexes only when they are initialized | 27 October 2011, 19:04:02 UTC |
| 82bc9f5 | Junio C Hamano | 27 October 2011, 19:03:37 UTC | Merge branch 'maint' * maint: clone: Quote user supplied path in a single quote pair read-cache.c: fix index memory allocation | 27 October 2011, 19:03:37 UTC |
| a76a326 | Junio C Hamano | 27 October 2011, 19:03:16 UTC | Merge branch 'rs/maint-estimate-cache-size' into maint * rs/maint-estimate-cache-size: read-cache.c: fix index memory allocation | 27 October 2011, 19:03:16 UTC |
| 8debf69 | Richard Hartmann | 27 October 2011, 16:46:53 UTC | clone: Quote user supplied path in a single quote pair Without this patch, $ git clone foo . results in this: Cloning into .... done. With it: Cloning into '.'... done. Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 October 2011, 19:02:02 UTC |
| 997a194 | Junio C Hamano | 26 October 2011, 23:24:55 UTC | Merge branch 'maint' * maint: make the sample pre-commit hook script reject names with newlines, too | 26 October 2011, 23:24:55 UTC |
| 425c771 | Junio C Hamano | 26 October 2011, 23:23:26 UTC | Update draft release notes to 1.7.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 October 2011, 23:23:26 UTC |
| 0b26d1e | Junio C Hamano | 26 October 2011, 23:16:32 UTC | Merge branch 'tc/submodule-clone-name-detection' * tc/submodule-clone-name-detection: submodule::module_clone(): silence die() message from module_name() submodule: whitespace fix | 26 October 2011, 23:16:32 UTC |
| 208a1cc | Junio C Hamano | 26 October 2011, 23:16:31 UTC | Merge branch 'lh/gitweb-site-html-head' * lh/gitweb-site-html-head: gitweb: provide a way to customize html headers | 26 October 2011, 23:16:31 UTC |
| 2ef89f3 | Junio C Hamano | 26 October 2011, 23:16:31 UTC | Merge branch 'mm/mediawiki-author-fix' * mm/mediawiki-author-fix: git-remote-mediawiki: don't include HTTP login/password in author | 26 October 2011, 23:16:31 UTC |
| 3b6a5d2 | Junio C Hamano | 26 October 2011, 23:16:30 UTC | Merge branch 'jn/libperl-git-config' * jn/libperl-git-config: Add simple test for Git::config_path() in t/t9700-perl-git.sh libperl-git: refactor Git::config_* | 26 October 2011, 23:16:30 UTC |
| aface4c | Junio C Hamano | 26 October 2011, 23:16:30 UTC | Merge branch 'jm/maint-gitweb-filter-forks-fix' * jm/maint-gitweb-filter-forks-fix: gitweb: fix regression when filtering out forks | 26 October 2011, 23:16:30 UTC |
| 9c0c09f | Junio C Hamano | 26 October 2011, 23:16:29 UTC | Merge branch 'cn/fetch-prune' * cn/fetch-prune: fetch: treat --tags like refs/tags/*:refs/tags/* when pruning fetch: honor the user-provided refspecs when pruning refs remote: separate out the remote_find_tracking logic into query_refspecs t5510: add tests for fetch --prune fetch: free all the additional refspecs Conflicts: remote.c | 26 October 2011, 23:16:29 UTC |
| 25f745f | Junio C Hamano | 26 October 2011, 23:13:31 UTC | Merge branch 'jn/gitweb-highlite-sanitise' into maint * jn/gitweb-highlite-sanitise: gitweb: Strip non-printable characters from syntax highlighter output | 26 October 2011, 23:13:31 UTC |
| 60f60b4 | Junio C Hamano | 26 October 2011, 23:13:31 UTC | Merge branch 'jk/argv-array' into maint * jk/argv-array: run_hook: use argv_array API checkout: use argv_array API bisect: use argv_array API quote: provide sq_dequote_to_argv_array refactor argv_array into generic code quote.h: fix bogus comment add sha1_array API docs | 26 October 2011, 23:13:31 UTC |
| 7bb07f6 | Junio C Hamano | 26 October 2011, 23:13:31 UTC | Merge branch 'jc/run-receive-hook-cleanup' into maint * jc/run-receive-hook-cleanup: refactor run_receive_hook() | 26 October 2011, 23:13:31 UTC |
| a5ad8d1 | Junio C Hamano | 26 October 2011, 23:13:31 UTC | Merge branch 'cn/eradicate-working-copy' into maint * cn/eradicate-working-copy: Remove 'working copy' from the documentation and C code | 26 October 2011, 23:13:31 UTC |
| f0911b9 | Junio C Hamano | 26 October 2011, 23:13:27 UTC | Merge branch 'maint-1.7.6' into maint * maint-1.7.6: notes_merge_commit(): do not pass temporary buffer to other function gitweb: Fix links to lines in blobs when javascript-actions are enabled mergetool: no longer need to save standard input mergetool: Use args as pathspec to unmerged files t9159-*.sh: skip for mergeinfo test for svn <= 1.4 date.c: Support iso8601 timezone formats remote: only update remote-tracking branch if updating refspec remote rename: warn when refspec was not updated remote: "rename o foo" should not rename ref "origin/bar" remote: write correct fetch spec when renaming remote 'remote' | 26 October 2011, 23:13:27 UTC |
| 8280baf | Junio C Hamano | 26 October 2011, 23:12:48 UTC | Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6 * mh/maint-notes-merge-pathbuf-fix: notes_merge_commit(): do not pass temporary buffer to other function | 26 October 2011, 23:12:48 UTC |
| 58f75bc | Junio C Hamano | 26 October 2011, 23:12:35 UTC | Merge branch 'ps/gitweb-js-with-lineno' into maint-1.7.6 * ps/gitweb-js-with-lineno: gitweb: Fix links to lines in blobs when javascript-actions are enabled | 26 October 2011, 23:12:35 UTC |
| 87d99c6 | Junio C Hamano | 26 October 2011, 23:12:25 UTC | Merge branch 'jm/mergetool-pathspec' into maint-1.7.6 * jm/mergetool-pathspec: mergetool: no longer need to save standard input mergetool: Use args as pathspec to unmerged files | 26 October 2011, 23:12:25 UTC |
| 716b64a | Junio C Hamano | 26 October 2011, 23:12:19 UTC | Merge branch 'mz/remote-rename' into maint-1.7.6 * mz/remote-rename: remote: only update remote-tracking branch if updating refspec remote rename: warn when refspec was not updated remote: "rename o foo" should not rename ref "origin/bar" remote: write correct fetch spec when renaming remote 'remote' | 26 October 2011, 23:12:19 UTC |
| 8371e91 | Junio C Hamano | 26 October 2011, 23:12:13 UTC | Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6 * rj/maint-t9159-svn-rev-notation: t9159-*.sh: skip for mergeinfo test for svn <= 1.4 | 26 October 2011, 23:12:13 UTC |
| 1f7a2ab | Junio C Hamano | 26 October 2011, 23:11:28 UTC | Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6 * hl/iso8601-more-zone-formats: date.c: Support iso8601 timezone formats | 26 October 2011, 23:11:28 UTC |
| 411e6cf | Junio C Hamano | 26 October 2011, 23:09:28 UTC | Merge branch 'maint-1.7.6' into maint * maint-1.7.6: make the sample pre-commit hook script reject names with newlines, too git-read-tree.txt: update sparse checkout examples git-read-tree.txt: correct sparse-checkout and skip-worktree description git-read-tree.txt: language and typography fixes unpack-trees: print "Aborting" to stderr Documentation/git-update-index: refer to 'ls-files' Documentation: basic configuration of notes.rewriteRef | 26 October 2011, 23:09:28 UTC |
| 588150b | Junio C Hamano | 26 October 2011, 23:09:04 UTC | Merge branch 'tr/doc-note-rewrite' into maint-1.7.6 * tr/doc-note-rewrite: Documentation: basic configuration of notes.rewriteRef | 26 October 2011, 23:09:04 UTC |
| 139088b | Junio C Hamano | 26 October 2011, 23:09:04 UTC | Merge branch 'nd/sparse-doc' into maint-1.7.6 * nd/sparse-doc: git-read-tree.txt: update sparse checkout examples | 26 October 2011, 23:09:04 UTC |
| df9701e | Junio C Hamano | 26 October 2011, 23:09:03 UTC | Merge branch 'mg/maint-doc-sparse-checkout' into maint-1.7.6 * mg/maint-doc-sparse-checkout: git-read-tree.txt: correct sparse-checkout and skip-worktree description git-read-tree.txt: language and typography fixes unpack-trees: print "Aborting" to stderr | 26 October 2011, 23:09:03 UTC |
| a574c04 | Junio C Hamano | 26 October 2011, 23:08:19 UTC | Merge branch 'maint-1.7.5' into maint-1.7.6 * maint-1.7.5: make the sample pre-commit hook script reject names with newlines, too Reindent closing bracket using tab instead of spaces Documentation/git-update-index: refer to 'ls-files' | 26 October 2011, 23:08:19 UTC |
| 69d61da | Junio C Hamano | 26 October 2011, 23:08:14 UTC | Merge branch 'maint-1.7.4' into maint-1.7.5 * maint-1.7.4: make the sample pre-commit hook script reject names with newlines, too Reindent closing bracket using tab instead of spaces Documentation/git-update-index: refer to 'ls-files' | 26 October 2011, 23:08:14 UTC |
| ed36a48 | Junio C Hamano | 26 October 2011, 23:08:08 UTC | Merge branch 'maint-1.7.3' into maint-1.7.4 * maint-1.7.3: make the sample pre-commit hook script reject names with newlines, too Reindent closing bracket using tab instead of spaces Documentation/git-update-index: refer to 'ls-files' | 26 October 2011, 23:08:08 UTC |
| eb4e672 | Junio C Hamano | 26 October 2011, 23:08:00 UTC | Merge branch 'sn/doc-update-index-assume-unchanged' into maint-1.7.3 * sn/doc-update-index-assume-unchanged: Documentation/git-update-index: refer to 'ls-files' | 26 October 2011, 23:08:00 UTC |
| 8f41c07 | René Scharfe | 24 October 2011, 01:01:27 UTC | read-cache.c: fix index memory allocation estimate_cache_size() tries to guess how much memory is needed for the in-memory representation of an index file. It does that by using the file size, the number of entries and the difference of the sizes of the on-disk and in-memory structs -- without having to check the length of the name of each entry, which varies for each entry, but their sums are the same no matter the representation. Except there can be a difference. First of all, the size is really calculated by ce_size and ondisk_ce_size based on offsetof(..., name), not sizeof, which can be different. And entries are padded with 1 to 8 NULs at the end (after the variable name) to make their total length a multiple of eight. So in order to allocate enough memory to hold the index, change the delta calculation to be based on offsetof(..., name) and round up to the next multiple of eight. On a 32-bit Linux, this delta was used before: sizeof(struct cache_entry) == 72 sizeof(struct ondisk_cache_entry) == 64 --- 8 The actual difference for an entry with a filename length of one was, however (find the definitions are in cache.h): offsetof(struct cache_entry, name) == 72 offsetof(struct ondisk_cache_entry, name) == 62 ce_size == (72 + 1 + 8) & ~7 == 80 ondisk_ce_size == (62 + 1 + 8) & ~7 == 64 --- 16 So eight bytes less had been allocated for such entries. The new formula yields the correct delta: (72 - 62 + 7) & ~7 == 16 Reported-by: John Hsing <tsyj2007@gmail.com> Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 October 2011, 21:35:16 UTC |
| c14daa4 | Jim Meyering | 22 October 2011, 17:44:40 UTC | make the sample pre-commit hook script reject names with newlines, too The sample pre-commit hook script would fail to reject a file name like "a\nb" because of the way newlines are handled in "$(...)". Adjust the test to count filtered bytes and require there be 0. Also print all diagnostics to standard error, not stdout, so they will actually be seen. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 October 2011, 21:31:14 UTC |
| e5b8eeb | Stefan Naewe | 26 October 2011, 19:13:09 UTC | completion: fix issue with process substitution not working on Git for Windows Git for Windows comes with a bash that doesn't support process substitution. It issues the following error when using git-completion.bash with GIT_PS1_SHOWUPSTREAM set: $ export GIT_PS1_SHOWUPSTREAM=1 sh.exe": cannot make pipe for process substitution: Function not implemented sh.exe": cannot make pipe for process substitution: Function not implemented sh.exe": <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n '): ambiguous redirect Replace the process substitution with a 'here string'. Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 October 2011, 21:05:47 UTC |
| a80b263 | Ramsay Jones | 25 October 2011, 17:15:20 UTC | gitweb/Makefile: Remove static/gitweb.js in the clean target Since 9a86dd5 (gitweb: Split JavaScript for maintability, combining on build, 2011-04-28), static/gitweb.js has been a build product that should be cleaned upon "make clean". Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 October 2011, 21:03:58 UTC |
| 7641613 | Junio C Hamano | 26 October 2011, 19:15:51 UTC | builtin/grep: simplify lock_and_read_sha1_file() As read_sha1_lock/unlock have been made aware of use_threads, this caller can be made a lot simpler. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 October 2011, 20:09:23 UTC |
| 1487a12 | Junio C Hamano | 26 October 2011, 18:45:15 UTC | builtin/grep: make lock/unlock into static inline functions Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 October 2011, 20:09:04 UTC |
