From 725bbf9e455b2d21a7a27d065107ae5c1e76e488 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Wed, 4 Jul 2018 18:32:34 -0500
Subject: [PATCH] cli.git: Allow git commands from within the directory and
 from without..

---
 extra/cli/git/git.factor | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/extra/cli/git/git.factor b/extra/cli/git/git.factor
index ce9bbcc7b0..1b589a008f 100644
--- a/extra/cli/git/git.factor
+++ b/extra/cli/git/git.factor
@@ -9,24 +9,37 @@ IN: cli.git
 SYMBOL: cli-git-num-parallel
 cli-git-num-parallel [ cpus 2 * ] initialize
 
-: git-clone-as ( ssh-url path -- process )
-    [ { "git" "clone" } ] 2dip 2array append run-process ;
-
-: git-clone ( ssh-url -- process )
-    [ { "git" "clone" } ] dip suffix run-process ;
-
-: git-pull ( path -- process )
-    [ { "git" "pull" } run-process ] with-directory ;
+: git-clone-as ( uri path -- process ) [ { "git" "clone" } ] 2dip 2array append run-process ;
+: git-clone ( uri -- process ) [ { "git" "clone" } ] dip suffix run-process ;
+: git-pull* ( -- process ) { "git" "pull" } run-process ;
+: git-pull ( path -- process ) [ git-pull* ] with-directory ;
+: git-fetch-all* ( -- process ) { "git" "fetch" "--all" } run-process ;
+: git-fetch-all ( path -- process ) [ git-fetch-all* ] with-directory ;
+: git-fetch-tags* ( -- process ) { "git" "fetch" "--tags" } run-process ;
+: git-fetch-tags ( path -- process ) [ git-fetch-tags* ] with-directory ;
+: git-checkout-new-branch* ( branch -- process ) [ { "git" "checkout" "-b" } ] dip suffix run-process ;
+: git-checkout-new-branch ( path branch -- process ) '[ _ git-checkout-new-branch* ] with-directory ;
+: git-checkout-existing-branch* ( branch -- process ) [ { "git" "checkout" } ] dip suffix run-process ;
+: git-checkout-existing-branch ( path branch -- process ) '[ _ git-checkout-existing-branch* ] with-directory ;
+: git-change-remote* ( remote uri -- process ) [ { "git" "remote" "set-url" } ] 2dip 2array append run-process ;
+: git-change-remote ( path remote uri -- process ) '[ _ _ git-change-remote* ] with-directory ;
+: git-remote-add* ( remote uri -- process ) [ { "git" "remote" "add" } ] 2dip 2array append run-process ;
+: git-remote-add ( path remote uri -- process ) '[ _ _ git-remote-add* ] with-directory ;
+: git-remote-get-url* ( remote -- process ) [ { "git" "remote" "get-url" } ] dip suffix run-process ;
+: git-remote-get-url ( path remote -- process ) '[ _ git-remote-get-url* ] with-directory ;
 
 : git-repository? ( directory -- ? )
     ".git" append-path current-directory get prepend-path
     ?file-info dup [ directory? ] when ;
 
+: git-current-branch* ( -- name )
+     ! { "git" "rev-parse" "--abbrev-ref" "HEAD" }
+     { "git" "name-rev" "--name-only" "HEAD" }
+     utf8 <process-reader> stream-contents
+     [ blank? ] trim-tail ;
+
 : git-current-branch ( directory -- name )
-    [
-        { "git" "rev-parse" "--abbrev-ref" "HEAD" }
-        utf8 <process-reader> stream-contents
-    ] with-directory [ blank? ] trim-tail ;
+    [ git-current-branch* ] with-directory ;
 
 : repository-url>name ( string -- string' )
     file-name ".git" ?tail drop ;