diff options
| author | Michael Allen <michael@michaelallen.io> | 2015-08-02 17:33:17 +0100 |
|---|---|---|
| committer | Michael Allen <michael@michaelallen.io> | 2015-08-02 17:33:17 +0100 |
| commit | 9baa0e175577c2a445792eb32ee2aa4423bac3aa (patch) | |
| tree | 937105faffab44557be5a1ca7f2d0ffaacf8b30d /test-status.sh | |
| parent | 5e1372b1ee6b52e002c15d7b5a2575cebd7bceae (diff) | |
| download | git-sonar-9baa0e175577c2a445792eb32ee2aa4423bac3aa.tar.gz git-sonar-9baa0e175577c2a445792eb32ee2aa4423bac3aa.zip | |
Fixed missing staged and unstaged modifications case
Diffstat (limited to 'test-status.sh')
| -rwxr-xr-x | test-status.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test-status.sh b/test-status.sh index a831151..2977361 100755 --- a/test-status.sh +++ b/test-status.sh @@ -11,6 +11,7 @@ A staged-added D staged-deleted C staged-copied R staged-renamed +MM staged-and-unstaged-modified UD deleted-them-conflicted AU added-us-conflicted UU modified-both-conflicted @@ -20,10 +21,10 @@ UU modified-both-conflicted prefix="_" suffix="-" - assertEquals "line:${LINENO}" "1_D-1_M-"\ + assertEquals "line:${LINENO}" "1_D-2_M-"\ "$(unstaged_status "$status" "$prefix" "$suffix")" - assertEquals "line:${LINENO}" "1_A-1_D-1_M-1_R-1_C-"\ + assertEquals "line:${LINENO}" "1_A-1_D-2_M-1_R-1_C-"\ "$(staged_status "$status" "$prefix" "$suffix")" assertEquals "line:${LINENO}" "1_U-1_T-1_B-"\ |