- 24 8月, 2011 4 次提交
-
-
由 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>
-
- 09 8月, 2011 5 次提交
-
-
由 Junio C Hamano 提交于
A request to fetch from a client over smart HTTP protocol is served in multiple steps. In the first round, the server side shows the set of refs it has and their values, and the client picks from them and sends "I want to fetch the history leading to these commits". When the server tries to respond to this second request, its refs may have progressed by a push from elsewhere. By design, we do not allow fetching objects that are not at the tip of an advertised ref, and the server rejects such a request. The client needs to try again, which is not ideal especially for a busy server. Teach upload-pack (which is the workhorse driven by git-daemon and smart http server interface) that it is OK for a smart-http client to ask for commits that are not at the tip of any advertised ref, as long as they are reachable from advertised refs. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Previous commit added one element to the command line, without making sure the result fits there. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Michael Witten 提交于
According to `git help filter-branch': --commit-filter <command> ... You can use the _map_ convenience function in this filter, and other convenience functions, too... ... However, it turns out that `map' hasn't been usable because it depends on the variable `workdir', which is not propogated to the environment of the shell that runs the commit-filter <command> because the shell is created via a simple-command rather than a compound-command subshell: @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \ $(git write-tree) $parentstr < ../message > ../map/$commit || die "could not write rewritten commit" One solution is simply to export `workdir'. However, it seems rather heavy-handed to export `workdir' to the environments of all commands, so instead this commit exports `workdir' for only the duration of the shell command in question: workdir=$workdir @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \ $(git write-tree) $parentstr < ../message > ../map/$commit || die "could not write rewritten commit" Signed-off-by: NMichael Witten <mfwitten@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Emilio G. Cota 提交于
user-manual.pdf is not removed by `make clean'; fix it. Signed-off-by: NEmilio G. Cota <cota@braap.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Emilio G. Cota 提交于
user-manual.pdf is generated by the build and therefore should be ignored by git. Signed-off-by: NEmilio G. Cota <cota@braap.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 06 8月, 2011 1 次提交
-
-
由 Jeff King 提交于
Many pathnames in a fast-import stream need to be quoted. In particular: 1. Pathnames at the end of an "M" or "D" line need quoting if they contain a LF or start with double-quote. 2. Pathnames on a "C" or "R" line need quoting as above, but also if they contain spaces. For (1), we weren't quoting at all. For (2), we put double-quotes around the paths to handle spaces, but ignored the possibility that they would need further quoting. This patch checks whether each pathname needs c-style quoting, and uses it. This is slightly overkill for (1), which doesn't actually need to quote many characters that vanilla c-style quoting does. However, it shouldn't hurt, as any implementation needs to be ready to handle quoted strings anyway. In addition to adding a test, we have to tweak a test which blindly assumed that case (2) would always use double-quotes, whether it needed to or not. Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 04 8月, 2011 3 次提交
-
-
由 Heiko Voigt 提交于
If the author forgets the gitignore entry the built result will show up as new file in the git working directory. Signed-off-by: NHeiko Voigt <hvoigt@hvoigt.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Michael Haggerty 提交于
The new wording makes it clearer that such a beast is an attribute in addition to being a macro (as opposed to being only a macro that is used for attributes). Signed-off-by: NMichael Haggerty <mhagger@alum.mit.edu> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Michael Haggerty 提交于
In particular, make it clear that attribute macros are themselves recorded as attributes in addition to setting other attributes. Signed-off-by: NMichael Haggerty <mhagger@alum.mit.edu> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-