code: plan9front

Info  •  Files  •  Log

git/import: remove removed files from index after commit

Otherwise, they stick around in the index even though they aren't
present in the checkout or the commit. This causes various git tools
to bail out since they think the tree is dirty.

--- a/sys/src/cmd/git/import

+++ b/sys/src/cmd/git/import

@@ -96,8 +96,10 @@

 		}

 		git/walk -fRMA $files

 		if(~ $#nocommit 0){

-			if(hash=`{git/save -n $aname -e $amail -N $name -E $email -m $msg -d $date $parents $files})

+			if(hash=`{git/save -n $aname -e $amail -N $name -E $email -m $msg -d $date $parents $files}){

 				echo $hash > $refpath

+				rm -f .git/index9/removed/$files

+			}

 		}

 		status=''''

 	'