Commits

Author Commit Message Labels Comments Date
Jeff King
receive-pack: redirect unpack-objects stdout to /dev/null The unpack-objects command should not generally produce any output on stdout. However, if it's given extra input after the packfile, it will spew the remainder to stdout. When called by receive-pack, this means we will break protocol, since our stdout is connected to the remote send-pack. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Peter Krefting
Update Swedish translation (1967t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Junio C Hamano
Merge branch 'maint' * maint: Documentation: Document signature showing options completion: fix shell expansion of items
Junio C Hamano
Merge branch 'nd/maint-diffstat-summary' into maint * nd/maint-diffstat-summary: Revert diffstat back to English
Junio C Hamano
Merge branch 'jw/doc-commit-title' into maint * jw/doc-commit-title: Documentation: describe subject more precisely
Junio C Hamano
Merge branch 'dg/run-command-child-cleanup' into maint * dg/run-command-child-cleanup: run-command.c: fix broken list iteration in clear_child_for_cleanup
Junio C Hamano
Merge branch 'jc/mailinfo-RE' into maint * jc/mailinfo-RE: mailinfo: strip "RE: " prefix
Junio C Hamano
Merge branch 'sn/ls-remote-get-url-doc' into maint * sn/ls-remote-get-url-doc: ls-remote: document the '--get-url' option
Junio C Hamano
Merge branch 'nd/log-n-doc' into maint * nd/log-n-doc: doc: move rev-list option -<n> from git-log.txt to rev-list-options.txt
Junio C Hamano
Merge branch 'nd/maint-remote-remove' into maint * nd/maint-remote-remove: remote: prefer subcommand name 'remove' to 'rm'
Junio C Hamano
grep.c: make two symbols really file-scope static this time Adding a declaration at the beginning is not sufficient for obvious reasons. The definition has to be made static. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ralf Thielow
clone --single: limit the fetch refspec to fetched branch After running "git clone --single", the resulting repository has the usual default "+refs/heads/*:refs/remotes/origin/*" wildcard fetch refspec installed, which means that a subsequent "git fetch" will end up grabbing all the other branches. Update the fetch refspec to cover only the singly cloned ref instead to correct this. That means: If "--single" is used without "--branch" or "--mirror", th…
Jeff King
remote-curl: rename is_http variable We don't actually care whether the connection is http or not; what we care about is whether it might be smart http. Rename the variable to be more accurate, which will make it easier to later make smart-http optional. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stephen Boyd
Documentation: Document signature showing options The pretty formats for GPG signatures were introduced but never documented. Use the documentation from the commit that introduced them. Do the same for the --show-signature option added to git log and friends. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Shawn O. Pearce
Enable info/refs gzip decompression in HTTP client Some HTTP servers try to use gzip compression on the /info/refs request to save transfer bandwidth. Repositories with many tags may find the /info/refs request can be gzipped to be 50% of the original size due to the few but often repeated bytes used (hex SHA-1 and commonly digits in tag names). For most HTTP requests enable "Accept-Encoding: gzip" ensuring the /info/refs payload can use this enc…
Shawn O. Pearce
Revert "retry request without query when info/refs?query fails" This reverts commit 703e6e76a14825e5b0c960d525f34e607154b4f7. Retrying without the query parameter was added as a workaround for a single broken HTTP server at git.debian.org[1]. The server was misconfigured to route every request with a query parameter into gitweb.cgi. Admins fixed the server's configuration within 16 hours of the bug report to the Git mailing list, but we still patched Git with…
Felipe Contreras
completion: fix shell expansion of items As reported by Jeroen Meijer[1]; the current code doesn't deal properly with items (tags, branches, etc.) that have ${} in them because they get expaned by bash while using compgen. A simple solution is to quote the items so they get expanded properly (\$\{\}). In order to achieve that I took bash-completion's quote() function, which is rather simple, and renamed it to __git_quote() as per Jeff …
Joachim Schmitz
Port to HP NonStop Includes the addition of some new defines and their description for others to use. Signed-off-by: Joachim Schmitz <jojo@schmitz-digital.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Dave Borowitz
Documentation/Makefile: Allow custom XMLTO binary Signed-off-by: Dave Borowitz <dborowitz@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Sixt
rebase -i: suggest using --edit-todo to fix an unknown instruction We have now an explicit UI to edit the todo sheet and need not disclose the name of the file. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Philip Oakley
Doc branch: show -vv option and alternative Indicate that the -v option can be given twice in the short options. Without it users pass over the option. Also indicate the alternate 'git remote show' method. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Philip Oakley
Doc clean: add See Also link 'git clean' is controlled by gitignore. Provide See Also link for it. Use of core.excludesfile is implied. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Philip Oakley
Doc add: link gitignore Use a gitignore link rather than the gitrepository- layout link. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Philip Oakley
Doc: separate gitignore pattern sources Use separate bulleted paragraphs for the three different gitignore pattern sources. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Philip Oakley
Doc: shallow clone deepens _to_ new depth Clarify that 'depth=' specifies the new depth from the remote's branch tip. It does not add the depth to the existing shallow clone. (details from pack-protocol.txt). Clarify that tags are not fetched. (details from shallow.txt) Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Update draft release notes to 1.8.0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jc/maint-log-grep-all-match' Fix a long-standing bug in "git log --grep" when multiple "--grep" are used together with "--all-match" and "--author" or "--committer". * jc/maint-log-grep-all-match: t7810-grep: test --all-match with multiple --grep and --author options t7810-grep: test interaction of multiple --grep and --author options t7810-grep: test multiple --author with --all-match t7810-grep: test multiple --gre…
Junio C Hamano
Merge branch 'jc/make-static' Turn many file-scope private symbols to static to reduce the global namespace contamination. * jc/make-static: sequencer.c: mark a private file-scope symbol as static ident.c: mark private file-scope symbols as static trace.c: mark a private file-scope symbol as static wt-status.c: mark a private file-scope symbol as static read-cache.c: mark a private file-scope symbol as static strb…
Junio C Hamano
Merge branch 'pw/p4-submit-conflicts' Add '--conflict' option to git-p4 subcommand to specify what action to take when conflicts are found during 'p4 submit'. * pw/p4-submit-conflicts: git-p4: add submit --conflict option and config varaiable git p4: add submit --prepare-p4-only option git p4: add submit --dry-run option git p4: accept -v for --verbose git p4: revert deleted files after submit cancel git p4: rearrange sub…
Junio C Hamano
Merge branch 'mv/cherry-pick-s' After "git cherry-pick -s" gave control back to the user asking help to resolve conflicts, concluding "git commit" needs to be run with "-s" if the user wants to sign it off, but the command should be able to remember that. * mv/cherry-pick-s: cherry-pick: don't forget -s on failure
  1. Prev
  2. Next