Merge pull request #6 from sytone/master

Changed references to colrm to allow usage on windows
nvie · Nov 29, 2018 · 4f240b2 · 4f240b2
2 parents 4ea5c29 + 543b72c
commit 4f240b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/git-assume b/git-assume
@@ -22,7 +22,7 @@ done
 shift $(($OPTIND - 1))
 
 locally_modified_files () {
-    git status --porcelain --untracked-files=no | colrm 1 1 | grep -Ee '^[MD]' | colrm 1 2
+    git status --porcelain --untracked-files=no | cut -c 2- | grep -Ee '^[MD]' | cut -c 3-
 }
 
 if [ $all -eq 1 ]; then

diff --git a/git-modified b/git-modified
@@ -81,15 +81,15 @@ make_relative () {
 }
 
 modified_in_index () {
-    status | colrm 1 3 | fix_rename_notation | make_relative
+    status | cut -c 4- | fix_rename_notation | make_relative
 }
 
 modified_unmerged () {
-    status | grep -Ee '^(U.|.U)' | colrm 1 3 | fix_rename_notation | make_relative
+    status | grep -Ee '^(U.|.U)' | cut -c 4- | fix_rename_notation | make_relative
 }
 
 modified_locally () {
-    status | colrm 1 1 | grep -vEe '^[ ]' | colrm 1 2 | fix_rename_notation | make_relative
+    status | cut -c 2- | grep -vEe '^[ ]' | cut -c 3- | fix_rename_notation | make_relative
 }
 
 fail_if_empty () {