The following tests include several cases in which the user needs to run 'git status' to know his current situation, whether there're conflicts or he's in rebase/bisect/am/ cherry-pick progress. One of the test is about the set of the advice.statushints config key to 'false' in .git/config. Signed-off-by: Kong Lucien <Lucien.Kong@xxxxxxxxxxxxxxx> Signed-off-by: Duperray Valentin <Valentin.Duperray@xxxxxxxxxxxxxxx> Signed-off-by: Jonas Franck <Franck.Jonas@xxxxxxxxxxxxxxx> Signed-off-by: Nguy Thomas <Thomas.Nguy@xxxxxxxxxxxxxxx> Signed-off-by: Nguyen Huynh Khoi Nguyen <Huynh-Khoi-Nguyen.Nguyen@xxxxxxxxxxxxxxx> --- t/t7512-status-help.sh | 347 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 347 insertions(+), 0 deletions(-) create mode 100755 t/t7512-status-help.sh diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh new file mode 100755 index 0000000..af1d130 --- /dev/null +++ b/t/t7512-status-help.sh @@ -0,0 +1,347 @@ +#!/bin/sh +# +# Copyright (c) 2012 Valentin Duperray, Lucien Kong, Franck Jonas, +# Thomas Nguy, Khoi Nguyen +# Grenoble INP Ensimag +# + +test_description='git status advices' + +. ./test-lib.sh + +. "$TEST_DIRECTORY"/lib-rebase.sh + +set_fake_editor + +test_expect_success 'status when conflicts unresolved' ' + git init git && + cd git && + test_commit init main.txt init && + git branch second_branch && + test_commit on_master main.txt on_master && + git checkout second_branch && + test_commit on_second_branch main.txt on_second_branch && + test_must_fail git merge master && + cat >expect <<-\EOF && + # On branch second_branch + # You have unmerged paths; fix conflicts and run "git commit". + # + # Unmerged paths: + # (use "git add/rm <file>..." as appropriate to mark resolution) + # + # both modified: main.txt + # + # Untracked files: + # (use "git add <file>..." to include in what will be committed) + # + # expect + # output + no changes added to commit (use "git add" and/or "git commit -a") + EOF + git status >output && + test_cmp expect output +' + + +test_expect_success 'status when conflicts resolved before commit' ' + echo one >main.txt && + git add main.txt && + cat >expect <<-\EOF && + # On branch second_branch + # You are still merging, run "git commit" to conclude merge. + # + # Changes to be committed: + # + # modified: main.txt + # + # Untracked files: + # (use "git add <file>..." to include in what will be committed) + # + # expect + # output + EOF + git status >output && + test_cmp expect output +' + + +test_expect_success 'status when rebase in progress before resolving conflicts' ' + git commit -m "one" && + test_commit two main.txt two && + test_commit three main.txt three && + test_must_fail git rebase HEAD^ --onto HEAD^^ && + cat >expect <<-\EOF && + # Not currently on any branch. + # You are currently rebasing: fix conflicts and then run "git rebase --continue". + # If you would prefer to skip this patch, instead run "git rebase --skip". + # To check out the original branch and stop rebasing run "git rebase --abort". + # + # Unmerged paths: + # (use "git reset HEAD <file>..." to unstage) + # (use "git add/rm <file>..." as appropriate to mark resolution) + # + # both modified: main.txt + # + # Untracked files: + # (use "git add <file>..." to include in what will be committed) + # + # expect + # output + no changes added to commit (use "git add" and/or "git commit -a") + EOF + git status >output && + test_cmp expect output +' + + +test_expect_success 'status when rebase in progress before rebase --continue' ' + test_when_finished "cd ../ && rm -rf git" && + echo three >main.txt && + git add main.txt && + cat >expect <<-\EOF && + # Not currently on any branch. + # You are currently rebasing: all conflicts fixed: run "git rebase --continue". + # + # Changes to be committed: + # (use "git reset HEAD <file>..." to unstage) + # + # modified: main.txt + # + # Untracked files: + # (use "git add <file>..." to include in what will be committed) + # + # expect + # output + EOF + git status >output && + test_cmp expect output +' + + +test_expect_success 'status when rebasing -i in edit mode' ' + git init git && + cd git && + test_when_finished "cd ../ && rm -rf git fake-editor.sh" && + test_commit one main.txt one && + test_commit two main.txt two && + test_commit three main.txt three && + FAKE_LINES="1 edit 2" && + export FAKE_LINES && + git rebase -i HEAD~2 && + cat >expect <<-\EOF && + # Not currently on any branch. + # You are currently editing a commit during a rebase. + # You can amend the commit with + # git commit --amend + # Once you are satisfied with your changes, run + # git rebase --continue + # + # Untracked files: + # (use "git add <file>..." to include in what will be committed) + # + # expect + # output + nothing added to commit but untracked files present (use "git add" to track) + EOF + git status >output && + test_cmp expect output && + git rebase --abort +' + + +test_expect_success 'status in an am session: file already exists' ' + git init git && + cd git && + test_when_finished "cd ../ && rm -rf git" && + test_commit one main.txt "one " && + git format-patch -1 -oMaildir && + test_must_fail git am Maildir/*.patch && + cat >expect <<-\EOF && + # On branch master + # You are in the middle of an am session: + # When you have resolved this problem run "git am --resolved". + # If you would prefer to skip this patch, instead run "git am --skip". + # To restore the original branch and stop patching run "git am --abort". + # + # Untracked files: + # (use "git add <file>..." to include in what will be committed) + # + # Maildir/ + # expect + # output + nothing added to commit but untracked files present (use "git add" to track) + EOF + git status >output && + test_cmp expect output +' + + +test_expect_success 'status in an am session: file does not exist' ' + git init git && + cd git && + test_when_finished "cd ../ && rm -rf git" && + test_commit one main.txt "one" && + git rm main.txt && + git commit -m "delete main.txt" && + git format-patch -1 -oMaildir && + test_must_fail git am Maildir/*.patch && + cat >expect <<-\EOF && + # On branch master + # You are in the middle of an am session: + # When you have resolved this problem run "git am --resolved". + # If you would prefer to skip this patch, instead run "git am --skip". + # To restore the original branch and stop patching run "git am --abort". + # + # Untracked files: + # (use "git add <file>..." to include in what will be committed) + # + # Maildir/ + # expect + # output + nothing added to commit but untracked files present (use "git add" to track) + EOF + git status >output && + test_cmp expect output +' + + +test_expect_success 'status in an am session: wrong format' ' + git init git && + cd git && + test_when_finished "cd ../ && rm -rf git" && + test_commit one one.txt "one" && + test_commit two two.txt "two" && + test_commit three three.txt "three" && + git format-patch -3 -oMaildir && + git rm one.txt two.txt three.txt && + git commit -m "delete all" && + echo error >Maildir/0002-two.patch && + test_must_fail git am Maildir/*.patch && + cat >expect <<-\EOF && + # On branch master + # You are in the middle of an am session: + # The current patch is empty! + # When you have resolved this problem run "git am --resolved". + # If you would prefer to skip this patch, instead run "git am --skip". + # To restore the original branch and stop patching run "git am --abort". + # + # Untracked files: + # (use "git add <file>..." to include in what will be committed) + # + # Maildir/ + # expect + # output + nothing added to commit but untracked files present (use "git add" to track) + EOF + git status >output && + test_cmp expect output +' + + +test_expect_success 'status when bisecting' ' + git init git && + cd git && + test_when_finished "cd ../ && rm -rf git" && + test_commit one main.txt one && + test_commit two main.txt two && + test_commit three main.txt three && + git bisect start && + git bisect bad && + git bisect good one && + cat >expect <<-\EOF && + # Not currently on any branch. + # You are currently bisecting. + # To get back to the original branch run "git bisect reset" + # + # Untracked files: + # (use "git add <file>..." to include in what will be committed) + # + # expect + # output + nothing added to commit but untracked files present (use "git add" to track) + EOF + git status >output && + test_cmp expect output +' + + +test_expect_success 'status when rebase conflicts with statushints disabled' ' + git init git && + cd git && + test_when_finished "cd ../ && rm -rf git" && + git config --local advice.statushints false && + test_commit one main.txt one && + test_commit two main.txt two && + test_commit three main.txt three && + test_must_fail git rebase HEAD^ --onto HEAD^^ && + cat >expect <<-\EOF && + # Not currently on any branch. + # You are currently rebasing. + # + # Unmerged paths: + # both modified: main.txt + # + # Untracked files: + # expect + # output + no changes added to commit + EOF + git status >output && + test_cmp expect output +' + + +test_expect_success 'status when cherry-picking before resolving conflicts' ' + git init git && + cd git && + test_commit init main.txt init && + git checkout -b second_branch && + test_commit one main.txt one && + test_commit two main.txt two && + test_commit three main.txt three && + git checkout master && + test_must_fail git cherry-pick two && + cat >expect <<-\EOF && + # On branch master + # You are currently cherry-picking: fix conflicts and run "git commit". + # + # Unmerged paths: + # (use "git add/rm <file>..." as appropriate to mark resolution) + # + # both modified: main.txt + # + # Untracked files: + # (use "git add <file>..." to include in what will be committed) + # + # expect + # output + no changes added to commit (use "git add" and/or "git commit -a") + EOF + git status >output && + test_cmp expect output +' + +test_expect_success 'status when cherry-picking after resolving conflicts' ' + test_when_finished "cd ../ && rm -rf git" + echo end >main.txt && + git add main.txt && + cat >expect <<-\EOF && + # On branch master + # You are currently cherry-picking: all conflicts fixed: run "git commit". + # + # Changes to be committed: + # + # modified: main.txt + # + # Untracked files: + # (use "git add <file>..." to include in what will be committed) + # + # expect + # output + EOF + git status >output && + test_cmp expect output +' + + +test_done -- 1.7.8 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html