- Sep 23, 2011
-
-
Junio C Hamano authored
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-
Junio C Hamano authored
* cb/maint-ls-files-error-report: t3005: do not assume a particular order of stdout and stderr of git-ls-files ls-files: fix pathspec display on error
-
Allan Caffee authored
When running git describe --dirty the index should be refreshed. Previously the cached index would cause describe to think that the index was dirty when, in reality, it was just stale. The issue was exposed by python setuptools which hardlinks files into another directory when building a distribution. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-
Junio C Hamano authored
* jc/maint-clone-alternates: clone: clone from a repository with relative alternates clone: allow more than one --reference
-
Junio C Hamano authored
* nd/maint-clone-gitdir: clone: allow to clone from .git file read_gitfile_gently(): rename misnamed function to read_gitfile()
-
Junio C Hamano authored
* mh/check-ref-format-print-normalize: Forbid DEL characters in reference names check-ref-format --print: Normalize refnames that start with slashes
-
Junio C Hamano authored
* mg/branch-set-upstream-previous: branch.c: use the parsed branch name
-
Junio C Hamano authored
* gb/maint-am-patch-format-error-message: am: format is in $patch_format, not parse_patch
-
- Sep 20, 2011
-
-
Jay Soffian authored
Mostly fixed already by 6b445773 (mergetool: check return value from read, 2011-07-01). Catch two uses it missed. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-
- Sep 12, 2011
-
-
Junio C Hamano authored
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-
Junio C Hamano authored
* jl/maint-fetch-submodule-check-fix: fetch: skip on-demand checking when no submodules are configured
-
Junio C Hamano authored
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-
Junio C Hamano authored
* ms/reflog-show-is-default: reflog: actually default to subcommand 'show'
-
Junio C Hamano authored
* jk/reset-reflog-message-fix: reset: give better reflog messages
-
Junio C Hamano authored
* vi/make-test-vector-less-specific: tests: cleanup binary test vector files
-
Junio C Hamano authored
* 'jk/tag-contains-ab' (early part): tag: speed up --contains calculation
-
Junio C Hamano authored
* dz/connect-error-report: Do not log unless all connect() attempts fail
-
Junio C Hamano authored
* jc/maint-mergetool-read-fix: mergetool: check return value from read
-
Junio C Hamano authored
* jk/maint-config-param: config: use strbuf_split_str instead of a temporary strbuf strbuf: allow strbuf_split to work on non-strbufs config: avoid segfault when parsing command-line config config: die on error in command-line config fix "git -c" parsing of values with equals signs strbuf_split: add a max parameter
-
Junio C Hamano authored
* jn/doc-dashdash: Documentation/i18n: quote double-dash for AsciiDoc Documentation: quote double-dash for AsciiDoc Conflicts: Documentation/git-mergetool--lib.txt
-
Junio C Hamano authored
* jk/maint-1.7.2-status-ignored: git status --ignored: tests and docs status: fix bug with missing --ignore files Conflicts: Documentation/git-status.txt t/t7508-status.sh
-
Sverre Rabbelier authored
Removing Cogito leaves just git and StGit, which is a rather incomplete list of git diff tools available. Sidestep the problem of deciding what tools to mention by not mentioning any. Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-
- Sep 09, 2011
-
-
Jens Lehmann authored
It makes no sense to do the - possibly very expensive - call to "rev-list <new-ref-sha1> --not --all" in check_for_new_submodule_commits() when there aren't any submodules configured. Leave check_for_new_submodule_commits() early when no name <-> path mappings for submodules are found in the configuration. To make that work reading the configuration had to be moved further up in cmd_fetch(), as doing that after the actual fetch of the superproject was too late. Reported-by: Martin Fick <mfick@codeaurora.org> Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-
- Sep 06, 2011
-
-
Junio C Hamano authored
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-
Junio C Hamano authored
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: Junio C Hamano <gitster@pobox.com>
-
- Aug 30, 2011
-
-
Thomas Rast authored
'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: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-
- Aug 29, 2011
-
-
Giuseppe Bilotta authored
The error message given when the patch format was not recognized was wrong, since the variable checked was $parse_patch rather than $patch_format. Fix by checking the non-emptyness of the correct variable. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-
Johannes Sixt authored
There is no guarantee that stderr is flushed before stdout when both channels are redirected to a file. Check the channels using independent files. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-
- Aug 27, 2011
-
-
Michael Haggerty authored
DEL is an ASCII control character and therefore should not be permitted in reference names. Add tests for this and other unusual characters. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-
- Aug 25, 2011
-
-
Junio C Hamano authored
I've deliberately excluded the borrowed code in compat/nedmalloc directory. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-
Pang Yan Han authored
Signed-off-by: Pang Yan Han <pangyanhan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-
Michael Haggerty authored
When asked if "refs///heads/master" is valid, check-ref-format says "Yes, it is well formed", and when asked to print canonical form, it shows "refs/heads/master". This is so that it can be tucked after "$GIT_DIR/" to form a valid pathname for a loose ref, and we normalize a pathname like "$GIT_DIR/refs///heads/master" to de-dup the slashes in it. Similarly, when asked if "/refs/heads/master" is valid, check-ref-format says "Yes, it is Ok", but the leading slash is not removed when printing, leading to "$GIT_DIR//refs/heads/master". Fix it to make sure such leading slashes are removed. Add tests that such refnames are accepted and normalized correctly. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-
- Aug 24, 2011
-
-
Junio C Hamano authored
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-
Junio C Hamano authored
* jc/maint-smart-http-race-upload-pack: get_indexed_object can return NULL if nothing is in that slot; check for it
-
Brian Harring authored
This fixes a segfault introduced by 051e4005; 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>
-
- Aug 23, 2011
-
-
Junio C Hamano authored
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-
Junio C Hamano authored
* 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 authored
* cb/maint-exec-error-report: notice error exit from pager error_routine: use parent's stderr if exec fails
-
Junio C Hamano authored
* 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 authored
* jc/maint-smart-http-race-upload-pack: helping smart-http/stateless-rpc fetch race
-