From: Kong Lucien <Lucien.Kong@ensimag.imag.fr>
To: git@vger.kernel.org
Cc: Matthieu.Moy@grenoble-inp.fr,
Kong Lucien <Lucien.Kong@ensimag.imag.fr>,
Duperray Valentin <Valentin.Duperray@ensimag.imag.fr>,
Jonas Franck <Franck.Jonas@ensimag.imag.fr>,
Nguy Thomas <Thomas.Nguy@ensimag.imag.fr>,
Nguyen Huynh Khoi Nguyen Lucien
<Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr>
Subject: [PATCHv3 2/2] t7512-status-warnings.sh: better advices for git status
Date: Mon, 28 May 2012 19:36:38 +0200 [thread overview]
Message-ID: <1338226598-16056-2-git-send-email-Lucien.Kong@ensimag.imag.fr> (raw)
In-Reply-To: <1338226598-16056-1-git-send-email-Lucien.Kong@ensimag.imag.fr>
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 progress.
The last test is about the set of the advice.statushelp config key
on false in .git/config.
Signed-off-by: Kong Lucien <Lucien.Kong@ensimag.imag.fr>
Signed-off-by: Duperray Valentin <Valentin.Duperray@ensimag.imag.fr>
Signed-off-by: Jonas Franck <Franck.Jonas@ensimag.imag.fr>
Signed-off-by: Nguy Thomas <Thomas.Nguy@ensimag.imag.fr>
Signed-off-by: Nguyen Huynh Khoi Nguyen Lucien <Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr>
---
t/t7512-status-warnings.sh | 303 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 303 insertions(+), 0 deletions(-)
create mode 100755 t/t7512-status-warnings.sh
diff --git a/t/t7512-status-warnings.sh b/t/t7512-status-warnings.sh
new file mode 100755
index 0000000..7824626
--- /dev/null
+++ b/t/t7512-status-warnings.sh
@@ -0,0 +1,303 @@
+#!/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 then commit the result.
+ #
+ # 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 am progress: 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 currently in am progress:
+ # 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 am progress: 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 currently in am progress:
+ # 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 am progress : patch corrupted/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 currently in am progress:
+ # One of the patches is empty or corrupted !
+ # 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 statushelp disabled' '
+ git init git &&
+ cd git &&
+ test_when_finished "cd ../ && rm -rf git" &&
+ git config --local advice.statushelp 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:
+ # (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_done
--
1.7.8
next prev parent reply other threads:[~2012-05-28 17:36 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-24 9:37 [PATCH/RFC] t7512-status-warnings.sh : better advices for git status Kong Lucien
2012-05-24 17:31 ` Matthieu Moy
2012-05-26 12:38 ` [PATCHv2 1/2] wt-status: " Kong Lucien
2012-05-26 12:38 ` [PATCHv2 2/2] t7512-status-warnings.sh: " Kong Lucien
2012-05-27 12:57 ` Matthieu Moy
2012-05-28 8:43 ` Matthieu Moy
2012-05-26 13:01 ` [PATCHv2 1/2] wt-status: " Nguyen Thai Ngoc Duy
2012-05-26 17:17 ` NGUY Thomas
2012-05-27 12:58 ` Matthieu Moy
2012-05-27 13:10 ` Matthieu Moy
2012-05-28 4:57 ` Junio C Hamano
2012-05-28 7:05 ` Matthieu Moy
2012-05-30 4:27 ` Junio C Hamano
2012-05-28 10:54 ` konglu
2012-05-28 17:36 ` [PATCHv3 1/2] wt-status.*: better advices for git status added Kong Lucien
2012-05-28 17:36 ` Kong Lucien [this message]
2012-05-28 20:36 ` [PATCHv3 2/2] t7512-status-warnings.sh: better advices for git status Matthieu Moy
2012-05-28 20:23 ` [PATCHv3 1/2] wt-status.*: better advices for git status added Matthieu Moy
2012-05-29 19:22 ` Junio C Hamano
2012-05-30 11:09 ` konglu
2012-05-30 17:24 ` Junio C Hamano
2012-05-31 6:47 ` Matthieu Moy
2012-05-30 13:23 ` [PATCHv4 1/3] " Kong Lucien
2012-05-30 13:23 ` [PATCHv4 2/3] t7512-status-warnings.sh: better advices for git status Kong Lucien
2012-05-30 13:23 ` [PATCHv4 3/3] Advices about 'git rm' during conflicts (unmerged paths) more relevant Kong Lucien
2012-05-30 18:44 ` Junio C Hamano
2012-05-30 21:50 ` konglu
2012-05-31 7:06 ` Matthieu Moy
2012-05-31 7:59 ` konglu
2012-05-30 18:26 ` [PATCHv4 1/3] wt-status.*: better advices for git status added Junio C Hamano
2012-05-30 19:06 ` Junio C Hamano
2012-05-31 6:42 ` Matthieu Moy
2012-05-31 6:44 ` Matthieu Moy
2012-05-31 6:29 ` Matthieu Moy
2012-05-31 6:34 ` Andrew Ardill
2012-05-31 15:15 ` [PATCHv5 " Kong Lucien
2012-05-31 15:15 ` [PATCHv5 2/3] t7512-status-help.sh: better advices for git status Kong Lucien
2012-05-31 15:15 ` [PATCHv5 3/3] status: don't suggest "git rm" or "git add" if not appropriate Kong Lucien
2012-06-01 8:55 ` Matthieu Moy
2012-06-01 12:15 ` Phil Hord
2012-06-01 14:08 ` konglu
2012-06-01 16:38 ` Junio C Hamano
2012-05-31 21:36 ` [PATCHv5 1/3] wt-status.*: better advices for git status added Junio C Hamano
2012-06-01 9:16 ` konglu
2012-06-01 9:26 ` Matthieu Moy
2012-06-01 14:50 ` Junio C Hamano
2012-06-01 16:51 ` Junio C Hamano
2012-06-01 19:39 ` konglu
2012-06-01 8:42 ` Matthieu Moy
2012-06-01 11:27 ` konglu
2012-06-01 12:40 ` Phil Hord
2012-06-01 16:57 ` Junio C Hamano
2012-06-04 18:00 ` Phil Hord
2012-06-03 18:30 ` [PATCHv6 1/4] " Kong Lucien
2012-06-03 18:30 ` [PATCHv6 2/4] t7512-status-help.sh: better advices for git status Kong Lucien
2012-06-03 21:18 ` Junio C Hamano
2012-06-04 10:04 ` konglu
2012-06-04 15:04 ` Junio C Hamano
2012-06-04 22:07 ` Junio C Hamano
2012-06-03 18:30 ` [PATCHv6 3/4] status: don't suggest "git rm" or "git add" if not appropriate Kong Lucien
2012-06-03 19:34 ` Matthieu Moy
2012-06-03 18:30 ` [PATCHv6 4/4] status: better advices when splitting a commit (during rebase -i) Kong Lucien
2012-06-03 22:00 ` Junio C Hamano
2012-06-04 15:35 ` Phil Hord
2012-06-05 9:13 ` konglu
2012-06-03 21:06 ` [PATCHv6 1/4] wt-status.*: better advices for git status added Junio C Hamano
2012-06-04 9:51 ` konglu
2012-06-04 14:54 ` Junio C Hamano
2012-06-04 17:19 ` [PATCHv7 " Kong Lucien
2012-06-04 17:19 ` [PATCHv7 2/4] t7512-status-help.sh: better advices for git status Kong Lucien
2012-06-04 21:02 ` Matthieu Moy
2012-06-04 23:12 ` Junio C Hamano
2012-06-04 17:19 ` [PATCHv7 3/4] status: don't suggest "git rm" or "git add" if not appropriate Kong Lucien
2012-06-04 17:19 ` [PATCHv7 4/4] status: better advices when splitting a commit (during rebase -i) Kong Lucien
2012-06-04 23:01 ` [PATCHv7 1/4] wt-status.*: better advices for git status added Junio C Hamano
2012-06-05 10:32 ` konglu
2012-06-05 11:33 ` Matthieu Moy
2012-06-05 20:21 ` [PATCHv8 " Lucien Kong
2012-06-05 20:21 ` [PATCHv8 2/4] t7512-status-help.sh: better advices for git status Lucien Kong
2012-06-05 20:21 ` [PATCHv8 3/4] status: don't suggest "git rm" or "git add" if not appropriate Lucien Kong
2012-06-05 20:21 ` [PATCHv8 4/4] status: better advices when splitting a commit (during rebase -i) Lucien Kong
2012-06-05 21:16 ` Junio C Hamano
2012-06-08 9:29 ` konglu
2012-06-08 15:05 ` Junio C Hamano
2012-06-07 13:17 ` [PATCHv9 1/4] wt-status.*: better advices for git status added Lucien Kong
2012-06-07 13:17 ` [PATCHv9 2/4] t7512-status-help.sh: better advices for git status Lucien Kong
2012-06-07 13:17 ` [PATCHv9 3/4] status: don't suggest "git rm" or "git add" if not appropriate Lucien Kong
2012-06-07 13:17 ` [PATCHv9 4/4] status: better advices when splitting a commit (during rebase -i) Lucien Kong
2012-06-07 18:07 ` Junio C Hamano
2012-06-07 20:42 ` Junio C Hamano
2012-06-07 21:05 ` konglu
2012-06-10 11:17 ` [PATCHv10 1/4] wt-status.*: better advices for git status added Lucien Kong
2012-06-10 11:17 ` [PATCHv10 2/4] t7512-status-help.sh: better advices for git status Lucien Kong
2012-06-10 11:17 ` [PATCHv10 3/4] status: don't suggest "git rm" or "git add" if not appropriate Lucien Kong
2012-06-10 11:17 ` [PATCHv10 4/4] status: better advices when splitting a commit (during rebase -i) Lucien Kong
2012-06-11 20:21 ` Junio C Hamano
2012-06-12 7:14 ` konglu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1338226598-16056-2-git-send-email-Lucien.Kong@ensimag.imag.fr \
--to=lucien.kong@ensimag.imag.fr \
--cc=Franck.Jonas@ensimag.imag.fr \
--cc=Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=Thomas.Nguy@ensimag.imag.fr \
--cc=Valentin.Duperray@ensimag.imag.fr \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).