diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-01-21 01:40:48 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-01-21 01:40:48 +0300 |
commit | 533e8af50ed6e89eabc421478c9021c4da5f404d (patch) | |
tree | 3eb2af3a9800ee068363e3e267dd2347b884c2bd /t | |
parent | 0877510ad4e8b951b08f9cbb25cfc0d994468979 (diff) | |
parent | e9fcd1e2121100d43d2d212eb6c6f1fc82aade1d (diff) |
Merge branch 'il/push-set-upstream'
* il/push-set-upstream:
Add push --set-upstream
Conflicts:
transport.c
Diffstat (limited to 't')
-rwxr-xr-x | t/t5523-push-upstream.sh | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh new file mode 100755 index 0000000000..00da70763b --- /dev/null +++ b/t/t5523-push-upstream.sh @@ -0,0 +1,69 @@ +#!/bin/sh + +test_description='push with --set-upstream' +. ./test-lib.sh + +test_expect_success 'setup bare parent' ' + git init --bare parent && + git remote add upstream parent +' + +test_expect_success 'setup local commit' ' + echo content >file && + git add file && + git commit -m one +' + +check_config() { + (echo $2; echo $3) >expect.$1 + (git config branch.$1.remote + git config branch.$1.merge) >actual.$1 + test_cmp expect.$1 actual.$1 +} + +test_expect_success 'push -u master:master' ' + git push -u upstream master:master && + check_config master upstream refs/heads/master +' + +test_expect_success 'push -u master:other' ' + git push -u upstream master:other && + check_config master upstream refs/heads/other +' + +test_expect_success 'push -u --dry-run master:otherX' ' + git push -u --dry-run upstream master:otherX && + check_config master upstream refs/heads/other +' + +test_expect_success 'push -u master2:master2' ' + git branch master2 && + git push -u upstream master2:master2 && + check_config master2 upstream refs/heads/master2 +' + +test_expect_success 'push -u master2:other2' ' + git push -u upstream master2:other2 && + check_config master2 upstream refs/heads/other2 +' + +test_expect_success 'push -u :master2' ' + git push -u upstream :master2 && + check_config master2 upstream refs/heads/other2 +' + +test_expect_success 'push -u --all' ' + git branch all1 && + git branch all2 && + git push -u --all && + check_config all1 upstream refs/heads/all1 && + check_config all2 upstream refs/heads/all2 +' + +test_expect_success 'push -u HEAD' ' + git checkout -b headbranch && + git push -u upstream HEAD && + check_config headbranch upstream refs/heads/headbranch +' + +test_done |