diff options
| -rw-r--r-- | sys/lib/git/common.rc | 7 | ||||
| -rw-r--r--[-rwxr-xr-x] | sys/src/cmd/git/add | 0 | ||||
| -rwxr-xr-x | sys/src/cmd/git/branch | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | sys/src/cmd/git/commit | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | sys/src/cmd/git/diff | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | sys/src/cmd/git/rebase | 0 |
6 files changed, 7 insertions, 6 deletions
diff --git a/sys/lib/git/common.rc b/sys/lib/git/common.rc index edb95f7d1..b98987d75 100644 --- a/sys/lib/git/common.rc +++ b/sys/lib/git/common.rc @@ -44,9 +44,9 @@ fn merge1 {@{ rfork e n=$pid out=$1 - theirs=$2 + ours=$2 base=$3 - ours=$4 + theirs=$4 tmp=$out.tmp while(test -f $tmp){ tmp=$tmp.$n @@ -70,8 +70,7 @@ fn merge1 {@{ rm -f $tmp $out git/rm $out } - } -} +}} fn gitup{ gitroot=`{git/conf -r >[2]/dev/null} diff --git a/sys/src/cmd/git/add b/sys/src/cmd/git/add index a51e154ee..a51e154ee 100755..100644 --- a/sys/src/cmd/git/add +++ b/sys/src/cmd/git/add diff --git a/sys/src/cmd/git/branch b/sys/src/cmd/git/branch index f2b785a5d..f1b46717f 100755 --- a/sys/src/cmd/git/branch +++ b/sys/src/cmd/git/branch @@ -60,9 +60,10 @@ if(~ $#newbr 0){ commit=`{git/query $base} || die 'branch does not exist:' $base if(~ $new */*) mkdir -p .git/`{basename -d $new} -echo $commit > .git/$new -if(! ~ $#stay 0) +if(! ~ $#stay 0){ + echo $commit > .git/$new exit +} basedir=`{git/query -p $base} dirtypaths=() cleanpaths=($modified $deleted) @@ -79,6 +80,7 @@ if(! ~ $#cleandirs 0){ mkdir -p $cleandirs mkdir -p .git/index9/tracked/$cleandirs } +echo $commit > .git/$new for(m in $cleanpaths){ # Modifications can turn a file into # a directory, or vice versa, so we diff --git a/sys/src/cmd/git/commit b/sys/src/cmd/git/commit index 5b23f7706..5b23f7706 100755..100644 --- a/sys/src/cmd/git/commit +++ b/sys/src/cmd/git/commit diff --git a/sys/src/cmd/git/diff b/sys/src/cmd/git/diff index 075ea3ee9..075ea3ee9 100755..100644 --- a/sys/src/cmd/git/diff +++ b/sys/src/cmd/git/diff diff --git a/sys/src/cmd/git/rebase b/sys/src/cmd/git/rebase index 395f3e693..395f3e693 100755..100644 --- a/sys/src/cmd/git/rebase +++ b/sys/src/cmd/git/rebase |