From 706aad3d94ee4d9ff93c8c21398f0bb471a438da Mon Sep 17 00:00:00 2001
From: glenda <glenda@9front.local>
Date: Sat, 5 Jun 2021 18:50:20 +0000
Subject: git/branch: merge correct set of files

we were switching branches before we got the full list
of modified files, which could garble what we were trying
to merge.
---
 sys/src/cmd/git/add    | 0
 sys/src/cmd/git/branch | 6 ++++--
 sys/src/cmd/git/commit | 0
 sys/src/cmd/git/diff   | 0
 sys/src/cmd/git/rebase | 0
 5 files changed, 4 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 sys/src/cmd/git/add
 mode change 100755 => 100644 sys/src/cmd/git/commit
 mode change 100755 => 100644 sys/src/cmd/git/diff
 mode change 100755 => 100644 sys/src/cmd/git/rebase

(limited to 'sys/src/cmd/git')

diff --git a/sys/src/cmd/git/add b/sys/src/cmd/git/add
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
diff --git a/sys/src/cmd/git/diff b/sys/src/cmd/git/diff
old mode 100755
new mode 100644
diff --git a/sys/src/cmd/git/rebase b/sys/src/cmd/git/rebase
old mode 100755
new mode 100644
-- 
cgit v1.2.3