freshlybakedca.ke / git
Git fork
fork atom

Merge branch 'maint'

* maint:
tests: fix "export var=val"
Skip timestamp differences for diff --no-index
Documentation/git-push: --all, --mirror, --tags can not be combined

Junio C Hamano 25487f8e 88e38808

+12 -4
unified split
+1 -1
Documentation/git-push.txt
··· 9 9 SYNOPSIS 10 10 -------- 11 11 [verse] 12 - 'git push' [--all | --mirror] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] 12 + 'git push' [--all | --mirror | --tags] [--dry-run] [--receive-pack=<git-receive-pack>] 13 13 [--repo=<repository>] [-f | --force] [-v | --verbose] 14 14 [<repository> <refspec>...] 15 15
+1
diff-no-index.c
··· 247 247 else 248 248 revs->diffopt.paths = argv + argc - 2; 249 249 revs->diffopt.nr_paths = 2; 250 + revs->diffopt.skip_stat_unmatch = 1; 250 251 251 252 DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS); 252 253 DIFF_OPT_SET(&revs->diffopt, NO_INDEX);
+5
t/t4013-diff-various.sh
··· 74 74 for i in 1 2; do echo $i; done >>dir/sub && 75 75 git update-index file0 dir/sub && 76 76 77 + mkdir dir3 && 78 + cp dir/sub dir3/sub && 79 + test-chmtime +1 dir3/sub && 80 + 77 81 git config log.showroot false && 78 82 git commit --amend && 79 83 git show-branch ··· 262 266 diff --name-status dir2 dir 263 267 diff --no-index --name-status dir2 dir 264 268 diff --no-index --name-status -- dir2 dir 269 + diff --no-index dir dir3 265 270 diff master master^ side 266 271 EOF 267 272
+2
t/t4013/diff.diff_--no-index_dir_dir3
··· 1 + $ git diff --no-index dir dir3 2 + $
+2 -2
t/t9301-fast-export.sh
··· 185 185 186 186 ' 187 187 188 - export GIT_AUTHOR_NAME='A U Thor' 189 - export GIT_COMMITTER_NAME='C O Mitter' 188 + GIT_AUTHOR_NAME='A U Thor'; export GIT_AUTHOR_NAME 189 + GIT_COMMITTER_NAME='C O Mitter'; export GIT_COMMITTER_NAME 190 190 191 191 test_expect_success 'setup copies' ' 192 192
+1 -1
t/test-lib.sh
··· 82 82 -i|--i|--im|--imm|--imme|--immed|--immedi|--immedia|--immediat|--immediate) 83 83 immediate=t; shift ;; 84 84 -l|--l|--lo|--lon|--long|--long-|--long-t|--long-te|--long-tes|--long-test|--long-tests) 85 - export GIT_TEST_LONG=t; shift ;; 85 + GIT_TEST_LONG=t; export GIT_TEST_LONG; shift ;; 86 86 -h|--h|--he|--hel|--help) 87 87 help=t; shift ;; 88 88 -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)