- 07 9月, 2011 1 次提交
-
-
由 Junio C Hamano 提交于
This reverts commit ffa69e61, reversing changes made to 4a13c4d1. Adding a new command line option to receive-pack and feed it from send-pack is not an acceptable way to add features, as there is no guarantee that your updated send-pack will be talking to updated receive-pack. New features need to be added via the capability mechanism negotiated over the protocol. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 31 8月, 2011 1 次提交
-
-
由 Thomas Rast 提交于
'git log -- <path>' does not "show commits that affect the specified paths" in a literal sense unless --full-history is given (for example, a file that only existed on a side branch will turn up no commits at all!). Reword it to specify the actual intent of the filtering, and point to the "History Simplification" section. Signed-off-by: NThomas Rast <trast@student.ethz.ch> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 26 8月, 2011 2 次提交
-
-
由 Junio C Hamano 提交于
I've deliberately excluded the borrowed code in compat/nedmalloc directory. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Pang Yan Han 提交于
Signed-off-by: NPang Yan Han <pangyanhan@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 25 8月, 2011 3 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* jc/maint-smart-http-race-upload-pack: get_indexed_object can return NULL if nothing is in that slot; check for it
-
由 Brian Harring 提交于
This fixes a segfault introduced by 051e4005; via it, no longer able to trigger the http/smartserv race. Signed-off-by: NBrian Harring <ferringb@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 24 8月, 2011 6 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* 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 提交于
* cb/maint-exec-error-report: notice error exit from pager error_routine: use parent's stderr if exec fails
-
由 Junio C Hamano 提交于
* 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 提交于
* jc/maint-smart-http-race-upload-pack: helping smart-http/stateless-rpc fetch race
-
由 Junio C Hamano 提交于
* jc/no-gitweb-test-without-cgi-etc: t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met
-
- 23 8月, 2011 2 次提交
-
-
由 Heiko Voigt 提交于
Signed-off-by: NHeiko Voigt <hvoigt@hvoigt.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Michael Haggerty 提交于
Detected by "gcc -std=iso9899:1990 ...". This patch applies against "maint". Signed-off-by: NMichael Haggerty <mhagger@alum.mit.edu> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 19 8月, 2011 1 次提交
-
-
由 Nguyễn Thái Ngọc Duy 提交于
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: NNguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 18 8月, 2011 1 次提交
-
-
由 Nguyễn Thái Ngọc Duy 提交于
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: NNguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 17 8月, 2011 23 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* jk/tag-list-multiple-patterns: tag: accept multiple patterns for --list
-
由 Junio C Hamano 提交于
* jl/submodule-update-quiet: submodule: update and add must honor --quiet flag
-
由 Junio C Hamano 提交于
* 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 提交于
* oa/pull-reflog: pull: remove extra space from reflog message
-
由 Junio C Hamano 提交于
* 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 提交于
* jk/fast-export-quote-path: fast-export: quote paths in output
-
由 Junio C Hamano 提交于
* jc/checkout-reflog-fix: checkout: do not write bogus reflog entry out
-
由 Junio C Hamano 提交于
* jc/maint-reset-unmerged-path: reset [<commit>] paths...: do not mishandle unmerged paths
-
由 Junio C Hamano 提交于
* mz/doc-rebase-abort: rebase: clarify "restore the original branch"
-
由 Junio C Hamano 提交于
* bw/log-all-ref-updates-doc: Documentation: clearly specify what refs are honored by core.logAllRefUpdates
-
由 Junio C Hamano 提交于
* js/maint-add-path-stat-pwd: get_pwd_cwd(): Do not trust st_dev/st_ino blindly
-
由 Junio C Hamano 提交于
* ms/help-unknown: help_unknown_cmd: do not propose an "unknown" cmd
-
由 Junio C Hamano 提交于
* mz/doc-synopsis-verse: Documentation: use [verse] for SYNOPSIS sections
-
由 Junio C Hamano 提交于
* 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 提交于
* jc/submodule-sync-no-auto-vivify: submodule add: always initialize .git/config entry submodule sync: do not auto-vivify uninteresting submodule
-
由 Junio C Hamano 提交于
* 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
-
由 Junio C Hamano 提交于
* fk/relink-upon-ldflags-update: Makefile: Track changes to LDFLAGS and relink when necessary
-
由 Junio C Hamano 提交于
* bc/submodule-foreach-stdin-fix-1.7.4: git-submodule.sh: preserve stdin for the command spawned by foreach t/t7407: demonstrate that the command called by 'submodule foreach' loses stdin
-
由 Junio C Hamano 提交于
* aw/rebase-i-p: rebase -i -p: include non-first-parent commits in todo list
-
由 Junio C Hamano 提交于
* jc/diff-index-quick-exit-early: diff-index --quiet: learn the "stop feeding the backend early" logic Conflicts: unpack-trees.h
-
由 Junio C Hamano 提交于
* jk/combine-diff-binary-etc: combine-diff: respect textconv attributes refactor get_textconv to not require diff_filespec combine-diff: handle binary files as binary combine-diff: calculate mode_differs earlier combine-diff: split header printing into its own function
-
由 Jeff King 提交于
If a file is unchanged but stat-dirty, we may erroneously fail to apply patches, thinking that they conflict with a dirty working tree. This patch adds a call to "update-index --refresh". It comes as late as possible, so that we don't bother with it for thinks like "git rebase --abort", or when mbox-splitting fails. However, it does come before we actually start applying patches, meaning we will only call it once when we start applying patches (or any time we return to "am" after having resolved conflicts), and not once per patch. Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-