| 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 |
| 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 |
| 10b2a48 | Junio C Hamano | 24 October 2011, 04:49:14 UTC | Merge branch 'maint' * maint: Git 1.7.7.1 RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting Conflicts: GIT-VERSION-GEN | 24 October 2011, 04:49:14 UTC |
| f7d958d | Junio C Hamano | 24 October 2011, 04:48:06 UTC | Git 1.7.7.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 October 2011, 04:48:06 UTC |
| 7fe74f5 | Jonathan Nieder | 22 October 2011, 11:11:07 UTC | RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting The change was actually about "git init -s" which sets the setgid bit on SysV-style systems to allow shared access to a repository, and can provoke errors on BSD-style systems, depending on how permissive the filesystem in use wants to be. More to the point, the patch was just taking a fix that arrived for FreeBSD in v1.5.5 days and making it also apply to machines using an (obscure) GNU userland/FreeBSD kernel mixture. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 October 2011, 04:16:31 UTC |
| e454a83 | Junio C Hamano | 21 October 2011, 18:46:12 UTC | Update draft release notes to 1.7.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 October 2011, 23:05:42 UTC |
| 9ee3d37 | Junio C Hamano | 21 October 2011, 23:04:37 UTC | Merge branch 'po/insn-editor' * po/insn-editor: "rebase -i": support special-purpose editor to edit insn sheet | 21 October 2011, 23:04:37 UTC |
| 0445ba2 | Junio C Hamano | 21 October 2011, 23:04:36 UTC | Merge branch 'jc/broken-ref-dwim-fix' * jc/broken-ref-dwim-fix: resolve_ref(): report breakage to the caller without warning resolve_ref(): expose REF_ISBROKEN flag refs.c: move dwim_ref()/dwim_log() from sha1_name.c | 21 October 2011, 23:04:36 UTC |
| 2f18b46 | Junio C Hamano | 21 October 2011, 23:04:36 UTC | Merge branch 'mh/ref-api' * mh/ref-api: clear_ref_cache(): inline function write_ref_sha1(): only invalidate the loose ref cache clear_ref_cache(): extract two new functions clear_ref_cache(): rename parameter invalidate_ref_cache(): expose this function in the refs API invalidate_ref_cache(): take the submodule as parameter invalidate_ref_cache(): rename function from invalidate_cached_refs() | 21 October 2011, 23:04:36 UTC |
| 470bbbc | Junio C Hamano | 21 October 2011, 23:04:35 UTC | Merge branch 'jc/match-refs-clarify' * jc/match-refs-clarify: rename "match_refs()" to "match_push_refs()" send-pack: typofix error message | 21 October 2011, 23:04:35 UTC |
| 1020fbc | Junio C Hamano | 21 October 2011, 23:04:35 UTC | Merge branch 'jc/make-tags' * jc/make-tags: Makefile: ask "ls-files" to list source files if available | 21 October 2011, 23:04:35 UTC |
| 8d3c0cb | Junio C Hamano | 21 October 2011, 23:04:35 UTC | Merge branch 'ss/inet-ntop' * ss/inet-ntop: inet_ntop.c: Work around GCC 4.6's detection of uninitialized variables | 21 October 2011, 23:04:35 UTC |
| e335304 | Junio C Hamano | 21 October 2011, 23:04:34 UTC | Merge branch 'jc/maint-remove-renamed-ref' * jc/maint-remove-renamed-ref: branch -m/-M: remove undocumented RENAMED-REF Conflicts: refs.c | 21 October 2011, 23:04:34 UTC |
| 5a4fcc2 | Junio C Hamano | 21 October 2011, 23:04:33 UTC | Merge branch 'pw/p4-update' * pw/p4-update: git-p4: handle files with shell metacharacters git-p4: keyword flattening fixes git-p4: stop ignoring apple filetype git-p4: recognize all p4 filetypes git-p4: handle utf16 filetype properly git-p4 tests: refactor and cleanup | 21 October 2011, 23:04:33 UTC |
| abe2773 | Junio C Hamano | 21 October 2011, 23:04:33 UTC | Merge branch 'cn/doc-config-bare-subsection' * cn/doc-config-bare-subsection: Documentation: update [section.subsection] to reflect what git does | 21 October 2011, 23:04:33 UTC |
| 2070950 | Junio C Hamano | 21 October 2011, 23:04:33 UTC | Merge branch 'jk/maint-pack-objects-compete-with-delete' * jk/maint-pack-objects-compete-with-delete: downgrade "packfile cannot be accessed" errors to warnings pack-objects: protect against disappearing packs | 21 October 2011, 23:04:33 UTC |
| e75a59a | Junio C Hamano | 21 October 2011, 23:04:32 UTC | Merge branch 'jk/daemon-msgs' * jk/daemon-msgs: daemon: give friendlier error messages to clients Conflicts: daemon.c | 21 October 2011, 23:04:32 UTC |
| 1ad4b17 | Junio C Hamano | 21 October 2011, 23:04:32 UTC | Merge branch 'sc/difftool-skip' * sc/difftool-skip: t7800: avoid arithmetic expansion notation git-difftool: allow skipping file by typing 'n' at prompt | 21 October 2011, 23:04:32 UTC |
| b76c561 | Junio C Hamano | 21 October 2011, 23:04:32 UTC | Merge branch 'jc/unseekable-bundle' * jc/unseekable-bundle: bundle: add parse_bundle_header() helper function bundle: allowing to read from an unseekable fd Conflicts: transport.c | 21 October 2011, 23:04:32 UTC |
| afd6284 | Junio C Hamano | 21 October 2011, 23:04:32 UTC | Merge branch 'ph/transport-with-gitfile' * ph/transport-with-gitfile: Fix is_gitfile() for files too small or larger than PATH_MAX to be a gitfile Add test showing git-fetch groks gitfiles Teach transport about the gitfile mechanism Learn to handle gitfiles in enter_repo enter_repo: do not modify input | 21 October 2011, 23:04:32 UTC |
| 8963314 | Junio C Hamano | 21 October 2011, 18:08:10 UTC | Sync with maint | 21 October 2011, 18:24:34 UTC |
| 8742218 | Junio C Hamano | 21 October 2011, 18:01:07 UTC | Almost ready for 1.7.7.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 October 2011, 18:01:07 UTC |
| d25a265 | Junio C Hamano | 21 October 2011, 17:49:26 UTC | Merge branch 'nd/maint-autofix-tag-in-head' into maint * nd/maint-autofix-tag-in-head: Accept tags in HEAD or MERGE_HEAD merge: remove global variable head[] merge: use return value of resolve_ref() to determine if HEAD is invalid merge: keep stash[] a local variable Conflicts: builtin/merge.c | 21 October 2011, 17:49:26 UTC |
| e63f87a | Junio C Hamano | 21 October 2011, 17:49:26 UTC | Merge branch 'jc/apply-blank-at-eof-fix' into maint * jc/apply-blank-at-eof-fix: apply --whitespace=error: correctly report new blank lines at end | 21 October 2011, 17:49:26 UTC |
| 6e89b37 | Junio C Hamano | 21 October 2011, 17:49:25 UTC | Merge branch 'jn/no-g-plus-s-on-bsd' into maint * jn/no-g-plus-s-on-bsd: Makefile: do not set setgid bit on directories on GNU/kFreeBSD | 21 October 2011, 17:49:25 UTC |
| 713b85c | Junio C Hamano | 21 October 2011, 17:49:25 UTC | Merge branch 'rs/diff-cleanup-records-fix' into maint * rs/diff-cleanup-records-fix: diff: resurrect XDF_NEED_MINIMAL with --minimal Revert removal of multi-match discard heuristic in 27af01 | 21 October 2011, 17:49:25 UTC |
| 689b047 | Junio C Hamano | 21 October 2011, 17:49:25 UTC | Merge branch 'il/archive-err-signal' into maint * il/archive-err-signal: Support ERR in remote archive like in fetch/push | 21 October 2011, 17:49:25 UTC |
| c510259 | Junio C Hamano | 21 October 2011, 17:49:25 UTC | Merge branch 'js/maint-merge-one-file-osx-expr' into maint * js/maint-merge-one-file-osx-expr: merge-one-file: fix "expr: non-numeric argument" | 21 October 2011, 17:49:25 UTC |
| cec3e18 | Junio C Hamano | 21 October 2011, 17:49:24 UTC | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maint * jm/maint-apply-detects-corrupt-patch-header: fix "git apply --index ..." not to deref NULL | 21 October 2011, 17:49:24 UTC |
| df68408 | Junio C Hamano | 21 October 2011, 17:49:24 UTC | Merge branch 'jc/checkout-from-tree-keep-local-changes' into maint * jc/checkout-from-tree-keep-local-changes: checkout $tree $path: do not clobber local changes in $path not in $tree | 21 October 2011, 17:49:24 UTC |
| 634b29d | Junio C Hamano | 21 October 2011, 17:49:24 UTC | Merge branch 'mm/maint-config-explicit-bool-display' into maint * mm/maint-config-explicit-bool-display: config: display key_delim for config --bool --get-regexp | 21 October 2011, 17:49:24 UTC |
| 6cf53d7 | Jeff King | 20 October 2011, 21:58:33 UTC | tests: add missing executable bits Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 October 2011, 23:52:28 UTC |
| 5595635 | Junio C Hamano | 19 October 2011, 20:55:49 UTC | resolve_ref(): report breakage to the caller without warning 629cd3a (resolve_ref(): emit warnings for improperly-formatted references, 2011-09-15) made resolve_ref() warn against files that are found in the directories the ref dwimmery looks at. The intent may be good, but these messages come from a wrong level of the API hierarchy. Instead record the breakage in "flags" whose purpose is to explain the result of the function to the caller, who is in a much better position to make intelligent decision based on the information. This updates sha1_name.c::dwim_ref() to warn against such a broken candidate only when it does not appear directly below $GIT_DIR to restore the traditional behaviour, as we know many files directly underneath $GIT_DIR/ are not refs. Warning against "git show config --" with "$GIT_DIR/config does not look like a well-formed ref" does not make sense, and we may later tweak the dwimmery not to even consider them as candidates, but that is a longer term topic. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 October 2011, 20:58:15 UTC |
| 98ac34b | Junio C Hamano | 19 October 2011, 20:45:50 UTC | resolve_ref(): expose REF_ISBROKEN flag Instead of keeping this as an internal API, let the callers find out the reason why resolve_ref() returned NULL is not because there was no such file in $GIT_DIR but because a file was corrupt. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 October 2011, 20:58:15 UTC |
| 87009ed | Junio C Hamano | 19 October 2011, 05:03:30 UTC | Update draft release notes to 1.7.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 October 2011, 18:02:13 UTC |
| 40d6987 | Brandon Casey | 19 October 2011, 16:26:02 UTC | t/t3000-ls-files-others.sh: use $SHELL_PATH to run git-new-workdir script Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 October 2011, 17:50:18 UTC |
| 3dfbe68 | Junio C Hamano | 19 October 2011, 17:49:27 UTC | Merge branch 'js/merge-edit-option' * js/merge-edit-option: Teach merge the '[-e|--edit]' option Conflicts: builtin/merge.c | 19 October 2011, 17:49:27 UTC |
| 9b55aa0 | Junio C Hamano | 19 October 2011, 17:49:13 UTC | Merge branch 'rs/diff-whole-function' * rs/diff-whole-function: diff: add option to show whole functions as context xdiff: factor out get_func_line() | 19 October 2011, 17:49:13 UTC |
| 662384c | Junio C Hamano | 19 October 2011, 17:49:09 UTC | Merge branch 'rs/pickaxe' * rs/pickaxe: pickaxe: factor out pickaxe pickaxe: give diff_grep the same signature as has_changes pickaxe: pass diff_options to contains and has_changes pickaxe: factor out has_changes pickaxe: plug regex/kws leak pickaxe: plug regex leak pickaxe: plug diff filespec leak with empty needle | 19 October 2011, 17:49:09 UTC |
| 541b9cf | Junio C Hamano | 19 October 2011, 17:49:05 UTC | Merge branch 'js/no-cherry-pick-head-after-punted' * js/no-cherry-pick-head-after-punted: cherry-pick: do not give irrelevant advice when cherry-pick punted revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so | 19 October 2011, 17:49:05 UTC |
| 2201cc8 | Junio C Hamano | 19 October 2011, 17:48:38 UTC | Merge branch 'bk/submodule-in-recursive-merge' * bk/submodule-in-recursive-merge: submodule: Search for merges only at end of recursive merge submodule: Demonstrate known breakage during recursive merge | 19 October 2011, 17:48:38 UTC |
| c31b87d | Junio C Hamano | 19 October 2011, 17:48:29 UTC | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' * jm/maint-apply-detects-corrupt-patch-header: fix "git apply --index ..." not to deref NULL | 19 October 2011, 17:48:29 UTC |
| e283548 | Junio C Hamano | 19 October 2011, 17:47:59 UTC | Merge branch 'jk/config-test-cleanup' * jk/config-test-cleanup: t1300: attempting to remove a non-existent .git/config is not an error | 19 October 2011, 17:47:59 UTC |
| 795290e | Johannes Sixt | 19 October 2011, 07:37:06 UTC | t1300: attempting to remove a non-existent .git/config is not an error Since some tests before test number 79 ("quoting") are skipped, .git/config does not exist and 'rm .git/config' fails. Fix this particular case. While at it, move other instance of 'rm .git/config' that occur in this file inside the test function to document that the test cases want to protect themselves from remnants of earlier tests. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 October 2011, 17:11:42 UTC |
| aadf863 | Junio C Hamano | 19 October 2011, 04:59:12 UTC | Merge branch 'js/log-show-children' * js/log-show-children: log --children | 19 October 2011, 04:59:12 UTC |
| 43a3b02 | Junio C Hamano | 19 October 2011, 04:59:11 UTC | Merge branch 'cb/httpd-test-fix-port' * cb/httpd-test-fix-port: use test number as port number | 19 October 2011, 04:59:11 UTC |
| 380f26c | Junio C Hamano | 19 October 2011, 04:59:11 UTC | Merge branch 'jn/gitweb-manpages' * jn/gitweb-manpages: gitweb: Add gitweb manpages to 'gitweb' package in git.spec Documentation: Add gitweb config variables to git-config(1) Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages gitweb: Add gitweb(1) manpage for gitweb itself gitweb: Add gitweb.conf(5) manpage for gitweb configuration files | 19 October 2011, 04:59:11 UTC |
| 578183b | Junio C Hamano | 19 October 2011, 04:59:11 UTC | Merge branch 'pt/mingw-misc-fixes' * pt/mingw-misc-fixes: t9901: fix line-ending dependency on windows mingw: ensure sockets are initialized before calling gethostname mergetools: use the correct tool for Beyond Compare 3 on Windows t9300: do not run --cat-blob-fd related tests on MinGW git-svn: On MSYS, escape and quote SVN_SSH also if set by the user t9001: do not fail only due to CR/LF issues t1020: disable the pwd test on MinGW | 19 October 2011, 04:59:11 UTC |
| 54633cd | Junio C Hamano | 19 October 2011, 04:59:10 UTC | Merge branch 'md/smtp-tls-hello-again' * md/smtp-tls-hello-again: send-email: Honour SMTP domain when using TLS | 19 October 2011, 04:59:10 UTC |
| 2c4cf66 | Junio C Hamano | 19 October 2011, 04:42:41 UTC | Merge branch 'maint' * maint: strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline() | 19 October 2011, 04:42:41 UTC |
| 1844f8d | Brandon Casey | 06 October 2011, 04:21:33 UTC | strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline() This use of strbuf_grow() is a historical artifact that was once used to ensure that strbuf.buf was allocated and properly nul-terminated. This was added before the introduction of the slopbuf in b315c5c0, which guarantees that strbuf.buf always points to a usable nul-terminated string. So let's remove it. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2011, 20:28:17 UTC |
| 185528a | Sebastian Schuberth | 18 October 2011, 16:25:50 UTC | inet_ntop.c: Work around GCC 4.6's detection of uninitialized variables GCC 4.6 claims that error: 'best.len' may be used uninitialized in this function so silence that warning which is treated as an error by also initializing the "len" members of the struct. Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2011, 17:34:07 UTC |
| 3353397 | Junio C Hamano | 18 October 2011, 07:26:18 UTC | Makefile: ask "ls-files" to list source files if available The [ce]tags and cscope targets used to run "find" looking for any paths that match '*.[chS]' to feed the list of source files to downstream xargs. Use "git ls-files" if it is already available to us, and otherwise use a tighter "find" expression that does not list directories and does not go into our .git directory. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2011, 17:03:00 UTC |
| 08cfdbb | Junio C Hamano | 18 October 2011, 05:07:57 UTC | Update draft release notes to 1.7.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2011, 05:08:25 UTC |
| 9638384 | Junio C Hamano | 18 October 2011, 04:37:15 UTC | Merge branch 'jk/http-auth' * jk/http-auth: http_init: accept separate URL parameter http: use hostname in credential description http: retry authentication failures for all http requests remote-curl: don't retry auth failures with dumb protocol improve httpd auth tests url: decode buffers that are not NUL-terminated | 18 October 2011, 04:37:15 UTC |
| 7f8a938 | Junio C Hamano | 18 October 2011, 04:37:15 UTC | Merge branch 'js/check-ref-format-test-mingw' * js/check-ref-format-test-mingw: t1402-check-ref-format: skip tests of refs beginning with slash on Windows | 18 October 2011, 04:37:15 UTC |
| f2b5163 | Junio C Hamano | 18 October 2011, 04:37:14 UTC | Merge branch 'jk/pull-rebase-with-work-tree' * jk/pull-rebase-with-work-tree: pull,rebase: handle GIT_WORK_TREE better Conflicts: git-pull.sh | 18 October 2011, 04:37:14 UTC |
| 0c76270 | Junio C Hamano | 18 October 2011, 04:37:14 UTC | Merge branch 'jk/config-test-cleanup' * jk/config-test-cleanup: t1300: test mixed-case variable retrieval t1300: put git invocations inside test function | 18 October 2011, 04:37:14 UTC |
| a200dc8 | Junio C Hamano | 18 October 2011, 04:37:13 UTC | Merge branch 'bc/attr-ignore-case' * 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: transport-helper.c | 18 October 2011, 04:37:14 UTC |
| 6e97fcc | Junio C Hamano | 18 October 2011, 04:37:13 UTC | Merge branch 'sg/completion' * sg/completion: completion: unite --format and --pretty for 'log' and 'show' completion: unite --reuse-message and --reedit-message for 'notes' | 18 October 2011, 04:37:13 UTC |
| e22bb14 | Junio C Hamano | 18 October 2011, 04:37:12 UTC | Merge branch 'mm/maint-config-explicit-bool-display' * mm/maint-config-explicit-bool-display: config: display key_delim for config --bool --get-regexp | 18 October 2011, 04:37:12 UTC |
| 3f7d11c | Junio C Hamano | 18 October 2011, 04:37:12 UTC | Merge branch 'tc/fetch-leak' * tc/fetch-leak: fetch: plug two leaks on error exit in store_updated_refs Conflicts: builtin/fetch.c | 18 October 2011, 04:37:12 UTC |
| 6f55f02 | Junio C Hamano | 18 October 2011, 04:37:11 UTC | Merge branch 'jk/name-hash-dirent' * jk/name-hash-dirent: fix phantom untracked files when core.ignorecase is set | 18 October 2011, 04:37:11 UTC |
| d2843da | Junio C Hamano | 18 October 2011, 04:37:11 UTC | Merge branch 'ef/mingw-syslog' * ef/mingw-syslog: mingw: avoid using strbuf in syslog | 18 October 2011, 04:37:11 UTC |
| 33ce7c1 | Junio C Hamano | 18 October 2011, 04:37:11 UTC | Merge branch 'tm/completion-push-set-upstream' * tm/completion-push-set-upstream: completion: push --set-upstream | 18 October 2011, 04:37:11 UTC |
| c795df7 | Junio C Hamano | 18 October 2011, 04:37:10 UTC | Merge branch 'tm/completion-commit-fixup-squash' * tm/completion-commit-fixup-squash: completion: commit --fixup and --squash completion: unite --reuse-message and --reedit-message handling | 18 October 2011, 04:37:10 UTC |
| cdc2b2f | Junio C Hamano | 18 October 2011, 04:37:10 UTC | Merge branch 'ph/push-to-delete-nothing' * ph/push-to-delete-nothing: receive-pack: don't pass non-existent refs to post-{receive,update} hooks Conflicts: builtin/receive-pack.c | 18 October 2011, 04:37:10 UTC |
| 66d2c22 | Junio C Hamano | 18 October 2011, 04:37:09 UTC | Merge branch 'jc/checkout-from-tree-keep-local-changes' * jc/checkout-from-tree-keep-local-changes: checkout $tree $path: do not clobber local changes in $path not in $tree | 18 October 2011, 04:37:09 UTC |
| a9af6c4 | Junio C Hamano | 18 October 2011, 04:37:09 UTC | Merge branch 'js/bisect-no-checkout' * js/bisect-no-checkout: bisect: fix exiting when checkout failed in bisect_start() | 18 October 2011, 04:37:09 UTC |
| 6de040d | Luke Diamand | 16 October 2011, 14:47:52 UTC | git-p4: handle files with shell metacharacters git-p4 used to simply pass strings into system() and popen(), and relied on the shell doing the necessary expansion. This though meant that shell metacharacters in file names would be corrupted - for example files with $ or space in them. Switch to using subprocess.Popen() and friends, and pass in explicit arrays in the places where it matters. This then avoids needing shell expansion. Add trivial helper functions for some common perforce operations. Add test case. [pw: test cleanup] Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2011, 03:46:49 UTC |
| cb585a9 | Pete Wyckoff | 16 October 2011, 14:46:52 UTC | git-p4: keyword flattening fixes Join the text before looking for keywords. There is nothing to prevent the p4 output marshaller from splitting in the middle of a keyword, although it has never been known to happen. Also remove the (?i) regexp modifier; perforce keywords are documented as case-sensitive. Remove the "\n" end-character match. I don't know why that is in there, and every keyword in a fairly large production p4 repository always ends with a $. Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2011, 03:46:49 UTC |
| 97a21ca | Pete Wyckoff | 16 October 2011, 14:45:49 UTC | git-p4: stop ignoring apple filetype Currently "apple" filetype is ignored explicitly, and the file is not even included in the git repository. This seems wrong. Remove this, letting it be treated like a "binary" filetype. Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2011, 03:46:49 UTC |
| 9cffb8c | Pete Wyckoff | 16 October 2011, 14:45:01 UTC | git-p4: recognize all p4 filetypes The previous code was approximate in the filetypes it recognized. Put in the canonical list and be more careful about matching elements of the file type. This might change behavior in some cases, hopefully for the better. Windows newline mangling will now happen on all text files. Previously some like "text+ko" were oddly exempt. Files with multiple combinations of modifiers, like "text+klx", are now recognized for keyword expansion. I expect these to be seen only rarely. Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2011, 03:46:49 UTC |
| 55aa571 | Pete Wyckoff | 17 September 2011, 23:16:14 UTC | git-p4: handle utf16 filetype properly One of the filetypes that p4 supports is utf16. Its behavior is odd in this case. The data delivered through "p4 -G print" is not encoded in utf16, although "p4 print -o" will produce the proper utf16-encoded file. When dealing with this filetype, discard the data from -G, and instead read the contents directly. An alternate approach would be to try to encode the data in python. That worked for true utf16 files, but for other files marked as utf16, p4 delivers mangled text in no recognizable encoding. Add a test case to check utf16 handling, and +k and +ko handling. Reported-by: Chris Li <git@chrisli.org> Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2011, 03:45:28 UTC |
| fc00233 | Pete Wyckoff | 23 August 2011, 02:20:33 UTC | git-p4 tests: refactor and cleanup Introduce a library for functions that are common to multiple git-p4 test files. Be a bit more clever about starting and stopping p4d. Specify a unique port number for each test, so that tests can run in parallel. Start p4d not in daemon mode, and save the pid, to be able to kill it cleanly later. Never kill p4d at startup; always shutdown cleanly. Handle directory changes better. Always chdir inside a subshell, and remove any post-test directory changes. Clean up whitespace, and use test_cmp and test_must_fail more consistently. Separate the tests related to detecting p4 branches into their own file, and add a few more. Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2011, 03:42:59 UTC |
| 821881d | Peter Oberndorfer | 17 October 2011, 20:26:23 UTC | "rebase -i": support special-purpose editor to edit insn sheet The insn sheet used by "rebase -i" is designed to be easily editable by any text editor, but an editor that is specifically meant for it (but is otherwise unsuitable for editing regular text files) could be useful by allowing drag & drop reordering in a GUI environment, for example. The GIT_SEQUENCE_EDITOR environment variable and/or the sequence.editor configuration variable can be used to specify such an editor, while allowing the usual editor to be used to edit commit log messages. As usual, the environment variable takes precedence over the configuration variable. It is envisioned that other "sequencer" based tools will use the same mechanism. Signed-off-by: Peter Oberndorfer <kumbayo84@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 October 2011, 21:40:07 UTC |
| 55bc3dc | Clemens Buchacher | 17 October 2011, 19:55:47 UTC | use test number as port number Test 5550 was apparently using the default port number by mistake. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 October 2011, 21:00:10 UTC |
| e5fa45c | Junio C Hamano | 17 October 2011, 18:43:30 UTC | resolve_gitlink_packed_ref(): fix mismerge 2c5c66b (Merge branch 'jp/get-ref-dir-unsorted', 2011-10-10) merged a topic that forked from the mainline before a new helper function get_packed_refs() refactored code to read packed-refs file. The merge made the call to the helper function with an incorrect argument. The parameter to the function has to be a path to the submodule. Fix the mismerge. Helped-by: Mark Levedahl <mlevedahl@gmail.com> Helped-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 October 2011, 18:44:18 UTC |
| c5f29ab | Michael Haggerty | 17 October 2011, 02:38:11 UTC | clear_ref_cache(): inline function clear_ref_cache() was only called from one place, so inline it there. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 October 2011, 04:12:22 UTC |
| 8bf90dc | Michael Haggerty | 17 October 2011, 02:38:10 UTC | write_ref_sha1(): only invalidate the loose ref cache Since write_ref_sha1() can only write loose refs and cannot write symbolic refs, there is no need for it to invalidate the packed ref cache. Suggested by: Martin Fick <mfick@codeaurora.org> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 October 2011, 04:12:04 UTC |
| 760c451 | Michael Haggerty | 17 October 2011, 02:38:09 UTC | clear_ref_cache(): extract two new functions Extract two new functions from clear_cached_refs(): clear_loose_ref_cache() and clear_packed_ref_cache(). Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 October 2011, 04:11:33 UTC |
| 1b7edaf | Michael Haggerty | 17 October 2011, 02:38:08 UTC | clear_ref_cache(): rename parameter ...for consistency with the rest of this module. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 October 2011, 04:11:03 UTC |
| 8be8bde | Michael Haggerty | 17 October 2011, 02:38:07 UTC | invalidate_ref_cache(): expose this function in the refs API Make invalidate_ref_cache() an official part of the refs API. It is currently a fact of life that code outside of refs.c mucks about with references. This change gives such code a way of informing the refs module that it should no longer trust its cache. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 October 2011, 04:10:49 UTC |
| 3870a0d | Michael Haggerty | 17 October 2011, 02:38:06 UTC | invalidate_ref_cache(): take the submodule as parameter Instead of invalidating the ref cache on an all-or-nothing basis, invalidate the cache for a specific submodule. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 October 2011, 04:09:50 UTC |
| 79c7ca5 | Michael Haggerty | 17 October 2011, 02:38:05 UTC | invalidate_ref_cache(): rename function from invalidate_cached_refs() It is the cache that is being invalidated, not the references, and the new name makes this unambiguous. Rename other items analogously: * struct cached_refs -> struct ref_cache * cached_refs (the variable) -> ref_cache * clear_cached_refs() -> clear_ref_cache() * create_cached_refs() -> create_ref_cache() * get_cached_refs() -> get_ref_cache() Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 October 2011, 04:08:23 UTC |
| 55752fa | Jakub Narebski | 16 October 2011, 11:07:35 UTC | gitweb: Add gitweb manpages to 'gitweb' package in git.spec Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 October 2011, 18:09:35 UTC |
| cd82323 | Jakub Narebski | 16 October 2011, 11:07:34 UTC | Documentation: Add gitweb config variables to git-config(1) Add a list of gitweb config variables to git-config(1) manpage, just linking to gitweb(1) or gitweb.conf(5). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 October 2011, 18:09:35 UTC |
| 86ce2d5 | Jakub Narebski | 16 October 2011, 11:07:33 UTC | Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages Add link to gitweb(1) in "SEE ALSO" section of git-instaweb(1) manpage, and "Ancillary Commands" section of git(1) manpage (the latter by the way of command-list.txt file). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 October 2011, 18:09:35 UTC |
| 07ea4df | Jakub Narebski | 16 October 2011, 11:07:32 UTC | gitweb: Add gitweb(1) manpage for gitweb itself Most of what is in gitweb.txt it has been pulled directly from the README and INSTALL files of gitweb. Current version is somewhat based on structure of SVN::Web manpage (one of web interfaces for Subversion). gitweb.conf(5) i.e. gitweb configuration manpage now refers to appropriate sections in gitweb(1). gitweb/README now refers to gitweb/INSTALL and gitweb(1) manpage. gitweb/INSTALL now refers to gitweb.conf(5) and gitweb(1). Inspired-by: Drew Northup <drew.northup@maine.edu> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 October 2011, 18:09:34 UTC |
| 6d3902b | Drew Northup | 16 October 2011, 11:07:31 UTC | gitweb: Add gitweb.conf(5) manpage for gitweb configuration files Much of what is in gitweb.conf.txt has been pulled directly from the README file of gitweb. The manpage was supplemented with description of missing gitweb config variables, and with description of gitweb's %features. There remains a bit of redundancy, which should be reduced if possible... but I think some of duplication of information is inevitable. [jn: Improved, extended, removed duplicate info from README] Signed-off-by: Drew Northup <drew.northup@maine.edu> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 October 2011, 18:09:34 UTC |
| 05f6edc | Junio C Hamano | 16 October 2011, 17:58:35 UTC | Update draft release notes to 1.7.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 October 2011, 17:58:35 UTC |
| 47d45a5 | Junio C Hamano | 16 October 2011, 10:01:44 UTC | Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui: incremental goto line in blame view git-gui: clear the goto line input when hiding git-gui: only accept numbers in the goto-line input git-gui: search and linenumber input are mutual exclusive in the blame view git-gui: deal with unknown files when pressing the "Stage Changed" button git-gui: drop the 'n' and 'Shift-n' bindings from the last patch. git-gui: Add keyboard shortcuts for search and goto commands in blame view. git-gui: Enable jumping to a specific line number in blame view. Fix tooltip display with multiple monitors on windows. Fix typo: existant->existent git-gui: updated translator README for current procedures. git-gui: warn when trying to commit on a detached head git-gui: Corrected a typo in the Swedish translation of 'Continue' | 16 October 2011, 10:01:44 UTC |
| cdb51a1 | Michael Olson | 10 October 2011, 23:27:37 UTC | git-svn: Allow certain refs to be ignored Implement a new --ignore-refs option which specifies a regex of refs to ignore while importing svn history. This is a useful supplement to the --ignore-paths option, as that option only operates on the contents of branches and tags, not the branches and tags themselves. Signed-off-by: Michael Olson <mwolson@gnu.org> Acked-by: Eric Wong <normalperson@yhbt.net> | 16 October 2011, 08:22:27 UTC |
| afd7f1e | Frédéric Heitzmann | 16 September 2011, 21:02:01 UTC | git svn dcommit: new option --interactive. Allow the user to check the patch set before it is commited to SVN. It is then possible to accept/discard one patch, accept all, or quit. This interactive mode is similar with 'git send email' behaviour. However, 'git svn dcommit' returns as soon as one patch is discarded. Part of the code was taken from git-send-email.perl (see 'ask' function) Tests several combinations of potential answers to 'git svn dcommit --interactive'. For each of them, test whether patches were commited to SVN or not. Thanks-to Eric Wong <normalperson@yhbt.net> for the initial idea. Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Frédéric Heitzmann <frederic.heitzmann@gmail.com> | 16 October 2011, 08:12:26 UTC |
| f737632 | Carlos Martín Nieto | 12 October 2011, 15:52:06 UTC | Documentation: update [section.subsection] to reflect what git does Using the [section.subsection] syntax, the subsection is transformed to lower-case and is matched case sensitively. Say so in the documentation and mention that you shouldn't be using it anyway. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 October 2011, 07:22:31 UTC |
| deba493 | Jeff King | 14 October 2011, 07:40:40 UTC | http_init: accept separate URL parameter The http_init function takes a "struct remote". Part of its initialization procedure is to look at the remote's url and grab some auth-related parameters. However, using the url included in the remote is: - wrong; the remote-curl helper may have a separate, unrelated URL (e.g., from remote.*.pushurl). Looking at the remote's configured url is incorrect. - incomplete; http-fetch doesn't have a remote, so passes NULL. So http_init never gets to see the URL we are actually going to use. - cumbersome; http-push has a similar problem to http-fetch, but actually builds a fake remote just to pass in the URL. Instead, let's just add a separate URL parameter to http_init, and all three callsites can pass in the appropriate information. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 October 2011, 04:18:36 UTC |
| 070b4dd | Michael J Gruber | 14 October 2011, 07:40:39 UTC | http: use hostname in credential description Until now, a request for an http password looked like: Username: Password: Now it will look like: Username for 'example.com': Password for 'example.com': Picked-from: Jeff King <peff@peff.net> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 October 2011, 04:18:20 UTC |
| d5570f4 | Jeff King | 14 October 2011, 21:19:21 UTC | daemon: give friendlier error messages to clients When the git-daemon is asked about an inaccessible repository, it simply hangs up the connection without saying anything further. This makes it hard to distinguish between a repository we cannot access (e.g., due to typo), and a service or network outage. Instead, let's print an "ERR" line, which git clients understand since v1.6.1 (2008-12-24). Because there is a risk of leaking information about non-exported repositories, by default all errors simply say "access denied or repository not exported". Sites which don't have hidden repositories, or don't care, can pass a flag to turn on more specific messages. Signed-off-by: Jeff King <peff@peff.net> Helped-by: Sitaram Chamarty <sitaramc@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 October 2011, 04:15:06 UTC |
