Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | tests: sanitize more git environment variables | Jeff King | 2011-01-27 | 1 | -0/+3 |
* | Merge branch 'jn/fast-import-empty-tree-removal' into maint | Junio C Hamano | 2011-01-27 | 1 | -0/+42 |
|\ | |||||
| * | fast-import: treat filemodify with empty tree as delete | Jonathan Nieder | 2011-01-27 | 1 | -0/+42 |
* | | Merge branch 'tr/submodule-relative-scp-url' into maint | Junio C Hamano | 2011-01-19 | 1 | -0/+38 |
|\ \ | |||||
| * | | submodule: fix relative url parsing for scp-style origin | Thomas Rast | 2011-01-10 | 1 | -0/+38 |
* | | | Merge branch 'rj/maint-test-fixes' into maint | Junio C Hamano | 2011-01-19 | 4 | -23/+35 |
|\ \ \ | |||||
| * | | | t9501-*.sh: Fix a test failure on Cygwin | Ramsay Jones | 2010-12-14 | 1 | -1/+1 |
| * | | | lib-git-svn.sh: Add check for mis-configured web server variables | Ramsay Jones | 2010-12-14 | 1 | -0/+10 |
| * | | | lib-git-svn.sh: Avoid setting web server variables unnecessarily | Ramsay Jones | 2010-12-14 | 1 | -22/+25 |
| * | | | t9142: Move call to start_httpd into the setup test | Ramsay Jones | 2010-12-14 | 1 | -3/+2 |
| * | | | t3600-rm.sh: Don't pass a non-existent prereq to test #15 | Ramsay Jones | 2010-12-14 | 1 | -1/+1 |
* | | | | Merge branch 'jn/submodule-b-current' into maint | Junio C Hamano | 2011-01-19 | 1 | -5/+23 |
|\ \ \ \ | |||||
| * | | | | git submodule: Remove now obsolete tests before cloning a repo | Jens Lehmann | 2010-12-06 | 1 | -5/+23 |
* | | | | | Merge branch 'jc/maint-svn-info-test-fix' into maint | Junio C Hamano | 2011-01-19 | 1 | -72/+34 |
|\ \ \ \ \ | |||||
| * | | | | | t9119: do not compare "Text Last Updated" line from "svn info" | Junio C Hamano | 2010-12-06 | 1 | -72/+34 |
| |/ / / / | |||||
* | | | | | t9001: Fix test prerequisites | Robin H. Johnson | 2010-12-29 | 1 | -2/+2 |
* | | | | | Merge branch 'jk/commit-die-on-bogus-ident' into maint | Junio C Hamano | 2010-12-28 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | ident: die on bogus date format | Jeff King | 2010-12-20 | 1 | -0/+4 |
* | | | | | | Merge branch 'ks/blame-worktree-textconv-cached' into maint | Junio C Hamano | 2010-12-28 | 1 | -0/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fill_textconv(): Don't get/put cache if sha1 is not valid | Kirill Smelkov | 2010-12-19 | 1 | -2/+1 |
| * | | | | | | t/t8006: Demonstrate blame is broken when cachetextconv is on | Kirill Smelkov | 2010-12-19 | 1 | -0/+22 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jc/maint-rebase-rewrite-last-skip' into maint | Junio C Hamano | 2010-12-28 | 1 | -1/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rebase --skip: correctly wrap-up when skipping the last patch | Junio C Hamano | 2010-12-22 | 1 | -1/+17 |
* | | | | | | | Merge branch 'jc/maint-am-abort-safely' into maint | Junio C Hamano | 2010-12-28 | 1 | -0/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | am --abort: keep unrelated commits since the last failure and warn | Junio C Hamano | 2010-12-21 | 1 | -0/+9 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Fix false positives in t3404 due to SHELL=/bin/false | Robin H. Johnson | 2010-12-28 | 1 | -1/+2 |
* | | | | | | | test-lib.sh/test_decode_color(): use octal not hex in awk script | Brandon Casey | 2010-12-22 | 1 | -1/+1 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | t0050: fix printf format strings for portability | Jonathan Nieder | 2010-12-21 | 1 | -2/+2 |
* | | | | | | t3419-*.sh: Fix arithmetic expansion syntax error | Ramsay Jones | 2010-12-21 | 1 | -2/+2 |
|/ / / / / | |||||
* | | | | | use persistent memory for rejected paths | Clemens Buchacher | 2010-12-14 | 2 | -11/+24 |
* | | | | | do not overwrite files in leading path | Clemens Buchacher | 2010-12-14 | 1 | -1/+1 |
* | | | | | t7607: add leading-path tests | Clemens Buchacher | 2010-12-14 | 1 | -0/+51 |
* | | | | | t7607: use test-lib functions and check MERGE_HEAD | Clemens Buchacher | 2010-12-14 | 1 | -23/+15 |
* | | | | | Merge branch 'tc/http-urls-ends-with-slash' into maint | Junio C Hamano | 2010-12-14 | 1 | -2/+14 |
|\ \ \ \ \ | |||||
| * | | | | | t5550-http-fetch: add test for http-fetch | Tay Ray Chuan | 2010-11-26 | 1 | -1/+13 |
| * | | | | | t5550-http-fetch: add missing '&&' | Tay Ray Chuan | 2010-11-26 | 1 | -1/+1 |
* | | | | | | Merge branch 'jk/maint-reflog-bottom' into maint | Junio C Hamano | 2010-12-14 | 1 | -0/+34 |
|\ \ \ \ \ \ | |||||
| * | | | | | | reflogs: clear flags properly in corner case | Jeff King | 2010-11-23 | 1 | -0/+34 |
* | | | | | | | Merge branch 'mz/rebase-abort-reflog-fix' into maint | Junio C Hamano | 2010-12-14 | 1 | -0/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rebase --abort: do not update branch ref | Martin von Zweigbergk | 2010-11-23 | 1 | -0/+12 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'gc/http-with-non-ascii-username-url' into maint | Junio C Hamano | 2010-12-14 | 4 | -0/+40 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Fix username and password extraction from HTTP URLs | Gabriel Corona | 2010-11-17 | 1 | -1/+1 |
| * | | | | | | t5550: test HTTP authentication and userinfo decoding | Gabriel Corona | 2010-11-17 | 4 | -0/+40 |
* | | | | | | | Merge branch 'jk/maint-decorate-01-bool' into maint | Junio C Hamano | 2010-12-10 | 1 | -0/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | log.decorate: accept 0/1 bool values | Jeff King | 2010-11-17 | 1 | -0/+9 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'mg/maint-tag-rfc1991' into maint | Junio C Hamano | 2010-12-10 | 1 | -0/+66 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | tag: recognize rfc1991 signatures | Michael J Gruber | 2010-11-10 | 1 | -6/+6 |
| * | | | | | | | t/t7004-tag: test handling of rfc1991 signatures | Michael J Gruber | 2010-11-10 | 1 | -0/+66 |
* | | | | | | | | Merge branch 'jn/cherry-pick-refresh-index' into maint | Junio C Hamano | 2010-12-09 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | cherry-pick/revert: transparently refresh index | Jonathan Nieder | 2010-11-10 | 1 | -0/+10 |
| |/ / / / / / / |