diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-18 17:39:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-18 17:39:25 -0700 |
| commit | 89df580d0a2e97b0c7c072d87e5e815534deed56 (patch) | |
| tree | a83d7ebc208890d26cb9343a361b8e671d471bde /t | |
| parent | d28840461d9cebd79f1ec30a4117661b41e2c9a3 (diff) | |
| parent | 8ae674952c8f301034e8ae9dceff38dda740623b (diff) | |
| download | git-89df580d0a2e97b0c7c072d87e5e815534deed56.tar.gz git-89df580d0a2e97b0c7c072d87e5e815534deed56.tar.xz | |
Merge branch 'maint'
* maint:
Fixed update-hook example allow-users format.
Documentation/git-svn: updated design philosophy notes
t/t4014: test "am -3" with mode-only change.
Fix lapsus in builtin-apply.c
git-push: documentation and tests for pushing only branches
git-svnimport: Use separate arguments in the pipe for git-rev-parse
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4014-format-patch.sh | 7 | ||||
| -rwxr-xr-x | t/t5400-send-pack.sh | 10 |
2 files changed, 15 insertions, 2 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index df969bb69..0a6fe5337 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -10,12 +10,15 @@ test_description='Format-patch skipping already incorporated patches' test_expect_success setup ' for i in 1 2 3 4 5 6 7 8 9 10; do echo "$i"; done >file && - git add file && + cat file >elif && + git add file elif && git commit -m Initial && git checkout -b side && for i in 1 2 5 6 A B C 7 8 9 10; do echo "$i"; done >file && - git update-index file && + chmod +x elif && + git update-index file elif && + git update-index --chmod=+x elif && git commit -m "Side changes #1" && for i in D E F; do echo "$i"; done >>file && diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh index 6c8767e1d..57c6397be 100755 --- a/t/t5400-send-pack.sh +++ b/t/t5400-send-pack.sh @@ -113,4 +113,14 @@ test_expect_success \ ! git diff .git/refs/heads/master victim/.git/refs/heads/master ' +test_expect_success \ + 'pushing does not include non-head refs' ' + mkdir parent && cd parent && + git-init && touch file && git-add file && git-commit -m add && + cd .. && + git-clone parent child && cd child && git-push --all && + cd ../parent && + git-branch -a >branches && ! grep -q origin/master branches +' + test_done |