1. Stefan Saasen
  2. git

Commits

Show all
Author Commit Message Date Builds
Junio C Hamano
Git 1.7.6.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.6.1
Junio C Hamano
Merge branch 'jc/maint-smart-http-race-upload-pack' into maint * jc/maint-smart-http-race-upload-pack: get_indexed_object can return NULL if nothing is in that slot; check for it
ferringb
get_indexed_object can return NULL if nothing is in that slot; check for it This fixes a segfault introduced by 051e400; via it, no longer able to trigger the http/smartserv race. Signed-off-by: Brian Harring <ferringb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Update draft release notes for 1.7.6.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jc/maint-combined-diff-work-tree' into maint * jc/maint-combined-diff-work-tree: diff -c/--cc: do not mistake "resolved as deletion" as "use working tree" Conflicts: combine-diff.c
Junio C Hamano
Merge branch 'cb/maint-exec-error-report' into maint * cb/maint-exec-error-report: notice error exit from pager error_routine: use parent's stderr if exec fails
Junio C Hamano
Merge branch 'cb/maint-quiet-push' into maint * cb/maint-quiet-push: receive-pack: do not overstep command line argument array propagate --quiet to send-pack/receive-pack Conflicts: Documentation/git-receive-pack.txt Documentation/git-send-pack.txt
Junio C Hamano
Merge branch 'jc/maint-smart-http-race-upload-pack' into maint * jc/maint-smart-http-race-upload-pack: helping smart-http/stateless-rpc fetch race
Junio C Hamano
Merge branch 'jc/no-gitweb-test-without-cgi-etc' into maint * jc/no-gitweb-test-without-cgi-etc: t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met
Heiko Voigt
add technical documentation about ref iteration Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty
Do not use C++-style comments Detected by "gcc -std=iso9899:1990 ...". This patch applies against "maint". Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy
fetch-pack: check for valid commit from server A malicious server can return ACK with non-existent SHA-1 or not a commit. lookup_commit() in this case may return NULL. Do not let fetch-pack crash by accessing NULL address in this case. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy
checkout-index: remove obsolete comment The first paragraph about flag order is no longer true and is mentioned in git-checkout-index.txt. The rest is also mentioned in git-checkout-index.txt. Remove it and keep uptodate document in one place. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Prepare for 1.7.6.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jk/tag-list-multiple-patterns' into maint * jk/tag-list-multiple-patterns: tag: accept multiple patterns for --list
Junio C Hamano
Merge branch 'jl/submodule-update-quiet' into maint * jl/submodule-update-quiet: submodule: update and add must honor --quiet flag
Junio C Hamano
Merge branch 'jl/submodule-add-relurl-wo-upstream' into maint * jl/submodule-add-relurl-wo-upstream: submodule add: clean up duplicated code submodule add: allow relative repository path even when no url is set submodule add: test failure when url is not configured in superproject Conflicts: git-submodule.sh
Junio C Hamano
Merge branch 'oa/pull-reflog' into maint * oa/pull-reflog: pull: remove extra space from reflog message
Junio C Hamano
Merge branch 'js/ls-tree-error' into maint * js/ls-tree-error: Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails. Add a test to check that git ls-tree sets non-zero exit code on error.
Junio C Hamano
Merge branch 'jk/fast-export-quote-path' into maint * jk/fast-export-quote-path: fast-export: quote paths in output
Junio C Hamano
Merge branch 'jc/checkout-reflog-fix' into maint * jc/checkout-reflog-fix: checkout: do not write bogus reflog entry out
Junio C Hamano
Merge branch 'jc/maint-reset-unmerged-path' into maint * jc/maint-reset-unmerged-path: reset [<commit>] paths...: do not mishandle unmerged paths
Junio C Hamano
Merge branch 'mz/doc-rebase-abort' into maint * mz/doc-rebase-abort: rebase: clarify "restore the original branch"
Junio C Hamano
Merge branch 'bw/log-all-ref-updates-doc' into maint * bw/log-all-ref-updates-doc: Documentation: clearly specify what refs are honored by core.logAllRefUpdates
Junio C Hamano
Merge branch 'js/maint-add-path-stat-pwd' into maint * js/maint-add-path-stat-pwd: get_pwd_cwd(): Do not trust st_dev/st_ino blindly
Junio C Hamano
Merge branch 'ms/help-unknown' into maint * ms/help-unknown: help_unknown_cmd: do not propose an "unknown" cmd
Junio C Hamano
Merge branch 'mz/doc-synopsis-verse' into maint * mz/doc-synopsis-verse: Documentation: use [verse] for SYNOPSIS sections
Junio C Hamano
Merge branch 'jn/mime-type-with-params' into maint * jn/mime-type-with-params: gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss
Junio C Hamano
Merge branch 'jc/submodule-sync-no-auto-vivify' into maint * jc/submodule-sync-no-auto-vivify: submodule add: always initialize .git/config entry submodule sync: do not auto-vivify uninteresting submodule
Junio C Hamano
Merge branch 'jc/zlib-wrap' into maint * jc/zlib-wrap: zlib: allow feeding more than 4GB in one go zlib: zlib can only process 4GB at a time zlib: wrap deflateBound() too zlib: wrap deflate side of the API zlib: wrap inflateInit2 used to accept only for gzip format zlib: wrap remaining calls to direct inflate/inflateEnd zlib wrapper: refactor error message formatter
  1. Prev
  2. Next