mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  tests: fix "export var=val"
  Skip timestamp differences for diff --no-index
  Documentation/git-push: --all, --mirror, --tags can not be combined
This commit is contained in:
Junio C Hamano
2009-02-18 11:31:52 -08:00
parent 88e38808cd 91e80b984e
commit 25487f8e2a
6 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-push.txt
View File

@ -9,7 +9,7 @@ git-push - Update remote refs along with associated objects
SYNOPSIS SYNOPSIS
-------- --------
[verse] [verse]
'git push' [--all | --mirror] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] 'git push' [--all | --mirror | --tags] [--dry-run] [--receive-pack=<git-receive-pack>]
[--repo=<repository>] [-f | --force] [-v | --verbose] [--repo=<repository>] [-f | --force] [-v | --verbose]
[<repository> <refspec>...] [<repository> <refspec>...]

1
diff-no-index.c
View File

@ -247,6 +247,7 @@ void diff_no_index(struct rev_info *revs,
else else
revs->diffopt.paths = argv + argc - 2; revs->diffopt.paths = argv + argc - 2;
revs->diffopt.nr_paths = 2; revs->diffopt.nr_paths = 2;
revs->diffopt.skip_stat_unmatch = 1;
DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS); DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
DIFF_OPT_SET(&revs->diffopt, NO_INDEX); DIFF_OPT_SET(&revs->diffopt, NO_INDEX);

5
t/t4013-diff-various.sh
View File

@ -74,6 +74,10 @@ test_expect_success setup '
for i in 1 2; do echo $i; done >>dir/sub && for i in 1 2; do echo $i; done >>dir/sub &&
git update-index file0 dir/sub && git update-index file0 dir/sub &&
mkdir dir3 &&
cp dir/sub dir3/sub &&
test-chmtime +1 dir3/sub &&
git config log.showroot false && git config log.showroot false &&
git commit --amend && git commit --amend &&
git show-branch git show-branch
@ -262,6 +266,7 @@ diff --patch-with-raw -r initial..side
diff --name-status dir2 dir diff --name-status dir2 dir
diff --no-index --name-status dir2 dir diff --no-index --name-status dir2 dir
diff --no-index --name-status -- dir2 dir diff --no-index --name-status -- dir2 dir
diff --no-index dir dir3
diff master master^ side diff master master^ side
EOF EOF

2
t/t4013/diff.diff_--no-index_dir_dir3 Normal file
View File

@ -0,0 +1,2 @@
$ git diff --no-index dir dir3
$

4
t/t9301-fast-export.sh
View File

@ -185,8 +185,8 @@ test_expect_success 'submodule fast-export | fast-import' '
' '
export GIT_AUTHOR_NAME='A U Thor' GIT_AUTHOR_NAME='A U Thor'; export GIT_AUTHOR_NAME
export GIT_COMMITTER_NAME='C O Mitter' GIT_COMMITTER_NAME='C O Mitter'; export GIT_COMMITTER_NAME
test_expect_success 'setup copies' ' test_expect_success 'setup copies' '

2
t/test-lib.sh
View File

@ -82,7 +82,7 @@ do
-i|--i|--im|--imm|--imme|--immed|--immedi|--immedia|--immediat|--immediate) -i|--i|--im|--imm|--imme|--immed|--immedi|--immedia|--immediat|--immediate)
immediate=t; shift ;; immediate=t; shift ;;
-l|--l|--lo|--lon|--long|--long-|--long-t|--long-te|--long-tes|--long-test|--long-tests) -l|--l|--lo|--lon|--long|--long-|--long-t|--long-te|--long-tes|--long-test|--long-tests)
export GIT_TEST_LONG=t; shift ;; GIT_TEST_LONG=t; export GIT_TEST_LONG; shift ;;
-h|--h|--he|--hel|--help) -h|--h|--he|--hel|--help)
help=t; shift ;; help=t; shift ;;
-v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose) -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)