summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-01-03Merge branch 'maint'Libravatar Junio C Hamano5-8/+19
* maint: docs: describe behavior of relative submodule URLs fix hang in git fetch if pointed at a 0 length bundle Documentation: read-tree --prefix works with existing subtrees Add MYMETA.json to perl/.gitignore
2012-01-03Merge branch 'maint-1.7.7' into maintLibravatar Junio C Hamano3-6/+11
* maint-1.7.7: docs: describe behavior of relative submodule URLs Documentation: read-tree --prefix works with existing subtrees Add MYMETA.json to perl/.gitignore
2012-01-03Merge branch 'maint-1.7.6' into maint-1.7.7Libravatar Junio C Hamano2-5/+5
* maint-1.7.6: Documentation: read-tree --prefix works with existing subtrees Add MYMETA.json to perl/.gitignore
2012-01-03docs: describe behavior of relative submodule URLsLibravatar Jens Lehmann1-1/+6
Since the relative submodule URLs have been introduced in f31a522a2d, they do not conform to the rules for resolving relative URIs but rather to those of relative directories. Document that behavior. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-01-03fix hang in git fetch if pointed at a 0 length bundleLibravatar Brian Harring2-2/+8
git-repo if interupted at the exact wrong time will generate zero length bundles- literal empty files. git-repo is wrong here, but git fetch shouldn't effectively spin loop if pointed at a zero length bundle. Signed-off-by: Brian Harring <ferringb@chromium.org> Helped-by: Johannes Sixt Helped-by: Nguyen Thai Ngoc Duy Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-01-01Documentation: read-tree --prefix works with existing subtreesLibravatar Clemens Buchacher1-5/+4
Since 34110cd4 (Make 'unpack_trees()' have a separate source and destination index) it is no longer true that a subdirectory with the same prefix must not exist. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-29Add MYMETA.json to perl/.gitignoreLibravatar Jack Nagel1-0/+1
ExtUtils::MakeMaker generates MYMETA.json in addition to MYMETA.yml since version 6.57_07. As it suggests, it is just meta information about the build and is cleaned up with 'make clean', so it should be ignored. Signed-off-by: Jack Nagel <jacknagel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-28Update draft release notes to 1.7.9Libravatar Junio C Hamano1-72/+4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-28Sync with 1.7.8.2Libravatar Junio C Hamano2-1/+72
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-28Git 1.7.8.2Libravatar Junio C Hamano3-2/+73
Contains accumulated fixes since 1.7.8 that have been merged to the 'master' branch in preparation for the 1.7.9 release. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-28Merge branch 'jv/maint-config-set' into maintLibravatar Junio C Hamano1-1/+1
* jv/maint-config-set: Fix an incorrect reference to --set-all.
2011-12-28Merge branch 'jk/follow-rename-score' into maintLibravatar Junio C Hamano1-0/+1
* jk/follow-rename-score: use custom rename score during --follow
2011-12-28Merge branch 'jc/checkout-m-twoway' into maintLibravatar Junio C Hamano2-24/+85
* jc/checkout-m-twoway: t/t2023-checkout-m.sh: fix use of test_must_fail checkout_merged(): squelch false warning from some gcc Test 'checkout -m -- path' checkout -m: no need to insist on having all 3 stages
2011-12-28Merge branch 'tr/doc-sh-setup' into maintLibravatar Junio C Hamano1-0/+10
* tr/doc-sh-setup: git-sh-setup: make require_clean_work_tree part of the interface
2011-12-28Merge branch 'jk/maint-strbuf-missing-init' into maintLibravatar Junio C Hamano2-2/+2
* jk/maint-strbuf-missing-init: commit, merge: initialize static strbuf
2011-12-28Merge branch 'jk/maint-push-v-is-verbose' into maintLibravatar Junio C Hamano1-5/+5
* jk/maint-push-v-is-verbose: make "git push -v" actually verbose
2011-12-28Merge branch 'jk/http-push-to-empty' into maintLibravatar Junio C Hamano2-3/+36
* jk/http-push-to-empty: remote-curl: don't pass back fake refs Conflicts: remote-curl.c
2011-12-28Merge branch 'jk/doc-fsck' into maintLibravatar Junio C Hamano1-18/+8
* jk/doc-fsck: docs: brush up obsolete bits of git-fsck manpage
2011-12-28Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maintLibravatar Junio C Hamano1-10/+50
* jc/maint-lf-to-crlf-keep-crlf: lf_to_crlf_filter(): resurrect CRLF->CRLF hack
2011-12-28Merge branch 'ef/setenv-putenv' into maintLibravatar Junio C Hamano1-2/+8
* ef/setenv-putenv: compat/setenv.c: error if name contains '=' compat/setenv.c: update errno when erroring out
2011-12-28Merge branch 'jc/advice-doc' into maintLibravatar Junio C Hamano1-11/+8
* jc/advice-doc: advice: Document that they all default to true
2011-12-28Merge branch 'jn/maint-sequencer-fixes' into maintLibravatar Junio C Hamano6-126/+252
* jn/maint-sequencer-fixes: revert: stop creating and removing sequencer-old directory Revert "reset: Make reset remove the sequencer state" revert: do not remove state until sequence is finished revert: allow single-pick in the middle of cherry-pick sequence revert: pass around rev-list args in already-parsed form revert: allow cherry-pick --continue to commit before resuming revert: give --continue handling its own function
2011-12-28Merge branch 'jk/maint-snprintf-va-copy' into maintLibravatar Junio C Hamano1-2/+7
* jk/maint-snprintf-va-copy: compat/snprintf: don't look at va_list twice
2011-12-28Merge branch 'jk/maint-push-over-dav' into maintLibravatar Junio C Hamano7-5/+49
* jk/maint-push-over-dav: http-push: enable "proactive auth" t5540: test DAV push with authentication
2011-12-28Merge branch 'jk/maint-mv' into maintLibravatar Junio C Hamano2-4/+10
* jk/maint-mv: mv: be quiet about overwriting mv: improve overwrite warning mv: make non-directory destination error more clear mv: honor --verbose flag docs: mention "-k" for both forms of "git mv"
2011-12-28Merge branch 'jk/fetch-no-tail-match-refs' into maintLibravatar Junio C Hamano8-41/+48
* jk/fetch-no-tail-match-refs: connect.c: drop path_match function fetch-pack: match refs exactly t5500: give fully-qualified refs to fetch-pack drop "match" parameter from get_remote_heads
2011-12-28Merge branch 'ew/keepalive' into maintLibravatar Junio C Hamano1-0/+13
* ew/keepalive: enable SO_KEEPALIVE for connected TCP sockets
2011-12-28Merge branch 'ci/stripspace-docs' into maintLibravatar Junio C Hamano2-7/+64
* ci/stripspace-docs: Update documentation for stripspace
2011-12-28Merge branch 'jh/fast-import-notes' into maintLibravatar Junio C Hamano2-8/+83
* jh/fast-import-notes: fast-import: Fix incorrect fanout level when modifying existing notes refs t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling t9301: Fix testcase covering up a bug in fast-import's notes fanout handling
2011-12-28Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maintLibravatar Junio C Hamano1-13/+23
* aw/rebase-i-stop-on-failure-to-amend: rebase -i: interrupt rebase when "commit --amend" failed during "reword"
2011-12-28Merge branch 'tj/maint-imap-send-remove-unused' into maintLibravatar Junio C Hamano1-1/+0
* tj/maint-imap-send-remove-unused: imap-send: Remove unused 'use_namespace' variable
2011-12-28Merge branch 'jn/branch-move-to-self' into maintLibravatar Junio C Hamano6-13/+47
* jn/branch-move-to-self: Allow checkout -B <current-branch> to update the current branch branch: allow a no-op "branch -M <current-branch> HEAD"
2011-12-28Merge branch 'na/strtoimax' into maintLibravatar Junio C Hamano4-13/+46
* na/strtoimax: Support sizes >=2G in various config options accepting 'g' sizes. Compatibility: declare strtoimax() under NO_STRTOUMAX Add strtoimax() compatibility function.
2011-12-28Merge branch 'jk/refresh-porcelain-output' into maintLibravatar Junio C Hamano1-10/+32
* jk/refresh-porcelain-output: refresh_index: make porcelain output more specific refresh_index: rename format variables read-cache: let refresh_cache_ent pass up changed flags
2011-12-27Fix an incorrect reference to --set-all.Libravatar Jelmer Vernooij1-1/+1
Signed-off-by: Jelmer Vernooij <jelmer@samba.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-22Update draft release notes in preparation for 1.7.9-rc0Libravatar Junio C Hamano1-1/+9
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-22Merge branch 'tr/bash-read-unescaped'Libravatar Junio C Hamano1-6/+6
* tr/bash-read-unescaped: bash completion: use read -r everywhere
2011-12-22Merge branch 'ab/sun-studio-portability'Libravatar Junio C Hamano8-22/+22
* ab/sun-studio-portability: Appease Sun Studio by renaming "tmpfile" Fix a bitwise negation assignment issue spotted by Sun Studio Fix an enum assignment issue spotted by Sun Studio
2011-12-22Merge branch 'tr/doc-sh-setup'Libravatar Junio C Hamano1-0/+10
* tr/doc-sh-setup: git-sh-setup: make require_clean_work_tree part of the interface
2011-12-22Merge branch 'rr/revert-cherry-pick'Libravatar Junio C Hamano3-49/+90
* rr/revert-cherry-pick: t3502, t3510: clarify cherry-pick -m failure t3510 (cherry-pick-sequencer): use exit status revert: simplify getting commit subject in format_todo() revert: tolerate extra spaces, tabs in insn sheet revert: make commit subjects in insn sheet optional revert: free msg in format_todo()
2011-12-22Merge branch 'tr/pty-all'Libravatar Junio C Hamano1-0/+4
* tr/pty-all: test-terminal: set output terminals to raw mode
2011-12-22Merge branch 'jn/maint-gitweb-utf8-fix'Libravatar Junio C Hamano1-4/+8
* jn/maint-gitweb-utf8-fix: gitweb: Fix fallback mode of to_utf8 subroutine gitweb: Output valid utf8 in git_blame_common('data') gitweb: esc_html() site name for title in OPML gitweb: Call to_utf8() on input string in chop_and_escape_str()
2011-12-22Update draft release notes to 1.7.9Libravatar Junio C Hamano1-27/+39
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-22Merge branch 'jk/maint-strbuf-missing-init'Libravatar Junio C Hamano2-2/+2
* jk/maint-strbuf-missing-init: commit, merge: initialize static strbuf Conflicts: builtin/merge.c
2011-12-22Merge branch 'jc/maint-lf-to-crlf-keep-crlf'Libravatar Junio C Hamano1-10/+50
* jc/maint-lf-to-crlf-keep-crlf: lf_to_crlf_filter(): resurrect CRLF->CRLF hack
2011-12-22Merge branch 'rs/diff-tree-combined-clean-up'Libravatar Junio C Hamano5-50/+29
* rs/diff-tree-combined-clean-up: submodule: use diff_tree_combined_merge() instead of diff_tree_combined() pass struct commit to diff_tree_combined_merge() use struct sha1_array in diff_tree_combined()
2011-12-22Merge branch 'jk/maint-push-v-is-verbose'Libravatar Junio C Hamano1-5/+5
* jk/maint-push-v-is-verbose: make "git push -v" actually verbose
2011-12-22Merge branch 'tr/grep-threading'Libravatar Junio C Hamano4-43/+88
* tr/grep-threading: grep: disable threading in non-worktree case grep: enable threading with -p and -W using lazy attribute lookup grep: load funcname patterns for -W
2011-12-22Merge branch 'jk/pretty-reglog-ent'Libravatar Junio C Hamano5-0/+48
* jk/pretty-reglog-ent: pretty: give placeholders to reflog identity
2011-12-22Merge branch 'jk/follow-rename-score'Libravatar Junio C Hamano1-0/+1
* jk/follow-rename-score: use custom rename score during --follow
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-05 13:27:17 +0000