diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-20 14:29:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-20 14:29:49 -0700 |
| commit | 0f64f874317a67d4d32bc10d85cf19e27ff0e43b (patch) | |
| tree | 772cfd2b104ea3a9fb55f2265bfc7073746757f7 /t | |
| parent | 72c2de5c416baaaad16ab36a88b518d1aacf2a87 (diff) | |
| parent | 72f600832f75db626fd9290a21d02d49c92ca9ca (diff) | |
| download | git-0f64f874317a67d4d32bc10d85cf19e27ff0e43b.tar.gz git-0f64f874317a67d4d32bc10d85cf19e27ff0e43b.tar.xz | |
Merge branch 'jc/clone-branch-rebase'
* jc/clone-branch-rebase:
Improve "git branch --tracking" output
Make git-clone respect branch.autosetuprebase
Conflicts:
builtin-clone.c
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5601-clone.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh index 44793f2ee..2335d8bc8 100755 --- a/t/t5601-clone.sh +++ b/t/t5601-clone.sh @@ -159,4 +159,19 @@ test_expect_success 'clone a void' ' test_cmp target-6/.git/config target-7/.git/config ' +test_expect_success 'clone respects global branch.autosetuprebase' ' + ( + HOME=$(pwd) && + export HOME && + test_config="$HOME/.gitconfig" && + unset GIT_CONFIG_NOGLOBAL && + git config -f "$test_config" branch.autosetuprebase remote && + rm -fr dst && + git clone src dst && + cd dst && + actual="z$(git config branch.master.rebase)" && + test ztrue = $actual + ) +' + test_done |