Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Merge branch 'maint-1.7.7' into maint * 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
Junio C Hamano
Merge branch 'maint-1.7.6' into maint-1.7.7 * maint-1.7.6: Documentation: read-tree --prefix works with existing subtrees Add MYMETA.json to perl/.gitignore
Jens Lehmann
docs: describe behavior of relative submodule URLs 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>
ferringb
fix hang in git fetch if pointed at a 0 length bundle 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>
Clemens Buchacher
Documentation: read-tree --prefix works with existing subtrees 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>
Jonathon Mah
stash: Don't fail if work dir contains file named 'HEAD' When performing a plain "git stash" (without --patch), git-diff would fail with "fatal: ambiguous argument 'HEAD': both revision and filename". The output was piped into git-update-index, masking the failed exit status. The output is now sent to a temporary file (which is cleaned up by existing code), and the exit status is checked. The "HEAD" arg to the git-diff invocation has been disambiguated …
jacknagel
Add MYMETA.json to perl/.gitignore 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>
Junio C Hamano
Update draft release notes to 1.7.9 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Sync with 1.7.8.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.7.8.2 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>
Tags
v1.7.8.2
Junio C Hamano
Merge branch 'jv/maint-config-set' into maint * jv/maint-config-set: Fix an incorrect reference to --set-all.
Junio C Hamano
Merge branch 'jk/follow-rename-score' into maint * jk/follow-rename-score: use custom rename score during --follow
Junio C Hamano
Merge branch 'jc/checkout-m-twoway' into maint * 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
Junio C Hamano
Merge branch 'tr/doc-sh-setup' into maint * tr/doc-sh-setup: git-sh-setup: make require_clean_work_tree part of the interface
Junio C Hamano
Merge branch 'jk/maint-strbuf-missing-init' into maint * jk/maint-strbuf-missing-init: commit, merge: initialize static strbuf
Junio C Hamano
Merge branch 'jk/maint-push-v-is-verbose' into maint * jk/maint-push-v-is-verbose: make "git push -v" actually verbose
Junio C Hamano
Merge branch 'jk/http-push-to-empty' into maint * jk/http-push-to-empty: remote-curl: don't pass back fake refs Conflicts: remote-curl.c
Junio C Hamano
Merge branch 'jk/doc-fsck' into maint * jk/doc-fsck: docs: brush up obsolete bits of git-fsck manpage
Junio C Hamano
Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint * jc/maint-lf-to-crlf-keep-crlf: lf_to_crlf_filter(): resurrect CRLF->CRLF hack
Junio C Hamano
Merge branch 'ef/setenv-putenv' into maint * ef/setenv-putenv: compat/setenv.c: error if name contains '=' compat/setenv.c: update errno when erroring out
Junio C Hamano
Merge branch 'jc/advice-doc' into maint * jc/advice-doc: advice: Document that they all default to true
Junio C Hamano
Merge branch 'jn/maint-sequencer-fixes' into maint * 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…
Junio C Hamano
Merge branch 'jk/maint-snprintf-va-copy' into maint * jk/maint-snprintf-va-copy: compat/snprintf: don't look at va_list twice
Junio C Hamano
Merge branch 'jk/maint-push-over-dav' into maint * jk/maint-push-over-dav: http-push: enable "proactive auth" t5540: test DAV push with authentication
Junio C Hamano
Merge branch 'jk/maint-mv' into maint * 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"
Junio C Hamano
Merge branch 'jk/fetch-no-tail-match-refs' into maint * 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
Junio C Hamano
Merge branch 'ew/keepalive' into maint * ew/keepalive: enable SO_KEEPALIVE for connected TCP sockets
Junio C Hamano
Merge branch 'ci/stripspace-docs' into maint * ci/stripspace-docs: Update documentation for stripspace
Junio C Hamano
Merge branch 'jh/fast-import-notes' into maint * 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
Junio C Hamano
Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maint * aw/rebase-i-stop-on-failure-to-amend: rebase -i: interrupt rebase when "commit --amend" failed during "reword"
  1. Prev
  2. Next