mj / zsh-config

Download as
Browse Code ยป

Commit 532a56441b5231ac0965d4a4f208c75e98b80200

Authored by Shrikant Sharat
1 parent 3201f76b9b

Fix mild output format changes in git. 

Travis is now using git version 1.8.* to run the tests and there is a slight
difference in output formatting of the git commands. This is causing mis-leading
test failures.

Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff

tests/revert-update.t
Diff comments   View file @ 532a564
... ... @@ -39,11 +39,11 @@ Run antigen's update.
39 39 ???????..??????? master -> origin/master (glob)
40 40 Updating ???????..??????? (glob)
41 41 Fast-forward
42   - aliases.zsh | 2 +-
  42 + aliases.zsh |\s+2 \+- (re)
43 43 1 file changed, 1 insertion(+), 1 deletion(-)
44 44 Updated from ??????? to ???????. (glob)
45 45 ??????? Updated message (glob)
46   - aliases.zsh | 2 +-
  46 + aliases.zsh |\s+2 +- (re)
47 47 1 file changed, 1 insertion(+), 1 deletion(-)
48 48  
49 49  
... ... @@ -23,11 +23,11 @@ Run antigen's update.
23 23 ???????..??????? master -> origin/master (glob)
24 24 Updating ???????..??????? (glob)
25 25 Fast-forward
26   - aliases.zsh | 2 +-
  26 + aliases.zsh |\s+2 \+- (re)
27 27 1 file changed, 1 insertion(+), 1 deletion(-)
28 28 Updated from ??????? to ???????. (glob)
29 29 ??????? Updated message (glob)
30   - aliases.zsh | 2 +-
  30 + aliases.zsh |\s+2 \+- (re)
31 31 1 file changed, 1 insertion(+), 1 deletion(-)
32 32  
33 33