summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/regexec-buf' into maintJunio C Hamano2017-03-282-2/+10
|\
| * pickaxe: fix segfault with '-S<...> --pickaxe-regex'SZEDER Gábor2017-03-182-2/+10
* | Merge branch 'jk/execv-dashed-external' into maintJunio C Hamano2017-03-281-1/+1
|\ \
| * | run-command: fix segfault when cleaning forked async processJeff King2017-03-181-1/+1
* | | Merge branch 'ew/http-alternates-as-redirects-warning' into maintJunio C Hamano2017-03-281-3/+7
|\ \ \
| * | | http: release strbuf on disabled alternatesEric Wong2017-03-061-0/+2
| * | | http: inform about alternates-as-redirects behaviorEric Wong2017-03-061-3/+5
* | | | Merge branch 'dp/filter-branch-prune-empty' into maintJunio C Hamano2017-03-284-8/+50
|\ \ \ \
| * | | | p7000: add test for filter-branch with --prune-emptyDevin J. Pohly2017-03-031-0/+5
| * | | | filter-branch: fix --prune-empty on parentless commitsDevin J. Pohly2017-03-033-10/+10
| * | | | t7003: ensure --prune-empty removes entire branch when applicableDevin J. Pohly2017-03-031-0/+7
| * | | | t7003: ensure --prune-empty can prune root commitDevin J. Pohly2017-03-031-0/+30
* | | | | Merge branch 'mm/fetch-show-error-message-on-unadvertised-object' into maintJunio C Hamano2017-03-287-30/+66
|\ \ \ \ \
| * | | | | fetch-pack: add specific error for fetching an unadvertised objectMatt McCutchen2017-03-023-18/+35
| * | | | | fetch_refs_via_pack: call report_unmatched_refsMatt McCutchen2017-03-022-6/+11
| * | | | | fetch-pack: move code to report unmatched refs to a functionMatt McCutchen2017-03-024-9/+23
| |/ / / /
* | | | | Merge branch 'jk/interpret-branch-name' into maintJunio C Hamano2017-03-2810-51/+249
|\ \ \ \ \
| * | | | | checkout: restrict @-expansions when finding branchJeff King2017-03-022-1/+11
| * | | | | strbuf_check_ref_format(): expand only local branchesJeff King2017-03-022-3/+3
| * | | | | branch: restrict @-expansions when deletingJeff King2017-03-022-4/+7
| * | | | | t3204: test git-branch @-expansion corner casesJeff King2017-03-021-0/+123
| * | | | | interpret_branch_name: allow callers to restrict expansionsJeff King2017-03-028-28/+69
| * | | | | strbuf_branchname: add docstringJeff King2017-03-021-0/+15
| * | | | | strbuf_branchname: drop return valueJeff King2017-03-022-5/+2
| * | | | | interpret_branch_name: move docstring to header fileJeff King2017-03-022-21/+21
| * | | | | interpret_branch_name(): handle auto-namelen for @{-1}Jeff King2017-03-022-1/+10
| |/ / / /
* | | | | Merge branch 'ab/cond-skip-tests' into maintJunio C Hamano2017-03-283-1/+16
|\ \ \ \ \
| * | | | | gitweb tests: skip tests when we don't have Time::HiResÆvar Arnfjörð Bjarmason2017-03-011-0/+5
| * | | | | gitweb tests: change confusing "skip_all" phrasingÆvar Arnfjörð Bjarmason2017-03-011-1/+1
| * | | | | cvs tests: skip tests that call "cvs commit" when running as rootÆvar Arnfjörð Bjarmason2017-02-272-0/+10
| |/ / / /
* | | | | Merge branch 'jk/ident-empty' into maintJunio C Hamano2017-03-282-19/+66
|\ \ \ \ \
| * | | | | ident: do not ignore empty config name/emailJeff King2017-02-232-2/+13
| * | | | | ident: reject all-crud ident nameJeff King2017-02-232-0/+16
| * | | | | ident: handle NULL email when complaining of empty nameJeff King2017-02-232-13/+33
| * | | | | ident: mark error messages for translationJeff King2017-02-231-6/+6
| |/ / / /
* | | | | Merge branch 'jk/delta-chain-limit' into maintJunio C Hamano2017-03-283-23/+207
|\ \ \ \ \
| * | | | | pack-objects: convert recursion to iteration in break_delta_chain()Jeff King2017-01-281-30/+99
| * | | | | pack-objects: enforce --depth limit in reused deltasJeff King2017-01-283-0/+115
* | | | | | Merge branch 'sg/test-with-stdin' into maintJunio C Hamano2017-03-282-8/+4
|\ \ \ \ \ \
| * | | | | | tests: make the 'test_pause' helper work in non-verbose modeSZEDER Gábor2017-03-181-7/+2
| * | | | | | tests: create an interactive gdb session with the 'debug' helperSZEDER Gábor2017-03-182-1/+2
* | | | | | | Merge branch 'jk/interop-test' into maintJunio C Hamano2017-03-288-1/+270
|\ \ \ \ \ \ \
| * | | | | | | t/interop: add test of old clients against modern git-daemonJeff King2017-03-102-1/+43
| * | | | | | | t: add an interoperability test harnessJeff King2017-03-106-0/+227
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jt/perf-updates' into maintJunio C Hamano2017-03-283-3/+7
|\ \ \ \ \ \ \
| * | | | | | | t/perf: add fallback for pre-bin-wrappers versions of gitJeff King2017-03-031-0/+3
| * | | | | | | t/perf: use $MODERN_GIT for all repo-copying stepsJeff King2017-03-031-2/+2
| * | | | | | | t/perf: export variable used in other blocksJonathan Tan2017-03-031-1/+2
| |/ / / / / /
* | | | | | | Merge branch 'rs/strbuf-add-real-path' into maintJunio C Hamano2017-03-286-2/+49
|\ \ \ \ \ \ \
| * | | | | | | strbuf: add strbuf_add_real_path()René Scharfe2017-02-274-1/+32