1. Brodie Rao
  2. git

Commits

Show all
Author Commit Message Date Builds
Brodie Rao
archive: fix archive generation for empty trees Prior to this change, git-archive would try to verify path arguments - even if none were provided. It used get_pathspec("", pathspec), which would return a pathspec of "" instead of NULL. Then it would try to verify if the tree contained any paths matching "". This is fine in the normal case where the tree contains anything (every entry would match), but for an empty tree, it wouldn't match, and …
Branches
maint
Thomas Rast
t5704: fix nonportable sed/grep usages OS X's sed and grep would complain with (respectively) sed: 1: "/^-/{p;q}": extra characters at the end of q command grep: Regular expression too big For sed, use an explicit ; to terminate the q command. For grep, spell the "40 hex digits" explicitly in the regex, which should be safe as other tests already use this and we haven't got breakage reports on OS X about them. Signed-off-by: Th…
Branches
maint
Junio C Hamano
Merge branch 'maint-1.7.8' into maint By Thomas Rast * maint-1.7.8: Document the --histogram diff option
Branches
maint
Junio C Hamano
Merge branch 'maint-1.7.7' into maint-1.7.8 By Thomas Rast * maint-1.7.7: Document the --histogram diff option
Branches
maint
Thomas Rast
Document the --histogram diff option Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Branches
maint
Junio C Hamano
Git 1.7.9.3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Branches
maint
Junio C Hamano
Merge branch 'jc/doc-merge-options' into maint * jc/doc-merge-options: Documentation/merge-options.txt: group "ff" related options together
Branches
maint
Junio C Hamano
Merge branch 'cn/maint-rev-list-doc' into maint * cn/maint-rev-list-doc: Documentation: use {asterisk} in rev-list-options.txt when needed
Branches
maint
Thomas Rast
fast-import: zero all of 'struct tag' to silence valgrind When running t9300, valgrind (correctly) complains about an uninitialized value in write_crash_report: ==2971== Use of uninitialised value of size 8 ==2971== at 0x4164F4: sha1_to_hex (hex.c:70) ==2971== by 0x4073E4: die_nicely (fast-import.c:468) ==2971== by 0x43284C: die (usage.c:86) ==2971== by 0x40420D: main (fast-import.c:2731) ==2971== Uninitialised value was created…
Branches
maint
Junio C Hamano
Update draft release notes to 1.7.9.3 for the last time Signed-off-by: Junio C Hamano <gitster@pobox.com>
Branches
maint
Junio C Hamano
Merge branch 'cn/maint-branch-with-bad' into maint * cn/maint-branch-with-bad: branch: don't assume the merge filter ref exists Conflicts: t/t3200-branch.sh
Branches
maint
Junio C Hamano
Merge branch 'jn/maint-gitweb-invalid-regexp' into maint * jn/maint-gitweb-invalid-regexp: gitweb: Handle invalid regexp in regexp search
Branches
maint
Junio C Hamano
Merge branch 'nd/maint-verify-objects' into maint * nd/maint-verify-objects: rev-list: fix --verify-objects --quiet becoming --objects rev-list: remove BISECT_SHOW_TRIED flag
Branches
maint
Junio C Hamano
Merge branch 'jk/maint-avoid-streaming-filtered-contents' into maint * jk/maint-avoid-streaming-filtered-contents: do not stream large files to pack when filters are in use teach dry-run convert_to_git not to require a src buffer teach convert_to_git a "dry run" mode
Branches
maint
Junio C Hamano
Merge branch 'jb/filter-ignore-sigpipe' into maint * jb/filter-ignore-sigpipe: Ignore SIGPIPE when running a filter driver
Branches
maint
Junio C Hamano
Merge branch 'sp/smart-http-failure-to-push' into maint * sp/smart-http-failure-to-push: : Mask SIGPIPE on the command channel going to a transport helper disconnect from remote helpers more gently Conflicts: transport-helper.c
Branches
maint
Junio C Hamano
Merge branch 'tr/maint-bundle-long-subject' into maint * tr/maint-bundle-long-subject: t5704: match tests to modern style strbuf: improve strbuf_get*line documentation bundle: use a strbuf to scan the log for boundary commits bundle: put strbuf_readline_fd in strbuf.c with adjustments
Branches
maint
Clemens Buchacher
http.proxy: also mention https_proxy and all_proxy The current wording of the http.proxy documentation suggests that http_proxy is somehow equivalent to http.proxy. However, while http.proxy (by the means of curl's CURLOPT_PROXY option) overrides the proxy for both HTTP and HTTPS protocols, the http_proxy environment variable is used only for HTTP. But since the docs mention only http_proxy, a user might expect it to apply to all HTTP-like protoco…
Branches
maint
Michael J Gruber
t0300: work around bug in dash 0.5.6 The construct 'while IFS== read' makes dash 0.5.6 execute read without changing IFS, which results in test breakages all over the place in t0300. Neither dash 0.5.5.1 and older nor dash 0.5.7 and newer are affected: The problem was introduded resp. fixed by the commits 55c46b7 ([BUILTIN] Honor tab as IFS whitespace when splitting fields in readcmd, 2009-08-11) 1d806ac ([VAR] Do n…
Branches
maint
Tom Grennan
t5512 (ls-remote): modernize style Prepare expected output inside test_expect_success that uses it. Also remove excess blank lines. Signed-off-by: Tom Grennan <tmgrennan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Branches
maint
Stefano Lattarini
tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/sh If any test script is run directly with Solaris 10 /usr/xpg4/bin/sh or /bin/ksh, it fails spuriously with a message like: t0000-basic.sh[31]: unset: bad argument count This happens because those shells bail out when encountering a call to "unset" with no arguments, and such unset call could take place in 'test-lib.sh'. Fix that issue, and add a proper comment to ensure we don't regress in thi…
Branches
maint
Junio C Hamano
Documentation: do not assume that n > 1 in <rev>~$n We explained <rev>~<n> as <n>th generation grand-parent, but a reader got confused by the "grand-" part when <n> is 1. Reword it with "ancestor"; with the "generation" and "following only the first parents" around there, what we try to describe should be clear enough now. Noticed-by: Luke Diamand <luke@diamand.org> Helped-by: Thomas Rast <trast@inf.ethz.ch> Helped-by: Andreas Ericsson <ae@op5.se…
Branches
maint
Libor Pechacek
Documentation fixes in git-config Variable names must start with an alphabetic character, regexp config key matching has its limits, sentence grammar. Signed-off-by: Libor Pechacek <lpechacek@suse.cz> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Branches
maint
Carlos Martín Nieto
Documentation: use {asterisk} in rev-list-options.txt when needed Text between two '*' is emphasized in AsciiDoc and makes explanations in rev-list-options.txt on glob-related options very confusing, as the rendered text would be missing two asterisks and the text between them would be emphasized instead. Use '{asterisk}' where needed to make them show up as asterisks in the rendered text. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Acked-by: Jeff King <…
Branches
maint
Jakub Narębski
gitweb: Handle invalid regexp in regexp search When using regexp search ('sr' parameter / $search_use_regexp variable is true), check first that regexp is valid. Without this patch we would get an error from Perl during search (if searching is performed by gitweb), or highlighting matches substring (if applicable), if user provided invalid regexp... which means broken HTML, with error page (including HTTP headers) generated after gitweb alrea…
Branches
maint
Nguyễn Thái Ngọc Duy
rev-list: fix --verify-objects --quiet becoming --objects When --quiet is specified, finish_object() is called instead of show_object(). The latter is in charge of --verify-objects and will be skipped if --quiet is specified. Move the code up to finish_object(). Also pass the quiet flag along and make it always call show_* functions to avoid similar problems in future. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hama…
Branches
maint
Nguyễn Thái Ngọc Duy
rev-list: remove BISECT_SHOW_TRIED flag Since c99f069 (bisect--helper: remove "--next-vars" option as it is now useless - 2009-04-21), this flag has always been off. Remove the flag and all related code. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Branches
maint
Junio C Hamano
Update draft release notes to 1.7.9.3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Branches
maint
Junio C Hamano
Merge branch 'pj/remote-set-branches-usage-fix' into maint * pj/remote-set-branches-usage-fix: remote: fix set-branches usage and documentation Conflicts: builtin/remote.c
Branches
maint
Junio C Hamano
Merge branch 'jn/gitweb-unborn-head' into maint * jn/gitweb-unborn-head: gitweb: Fix "heads" view when there is no current branch
Branches
maint
  1. Prev
  2. Next