From 696f07fa679aa62b48478d6e46206f4290c92cf7 Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Tue, 6 Aug 2019 17:02:21 -0400
Subject: [PATCH] copy-files: use a more robust check for git repos in
 vim/package_repos

---
 copy-files        | 7 ++++++-
 vim/package_repos | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/copy-files b/copy-files
index fcbd5fc..9635dad 100755
--- a/copy-files
+++ b/copy-files
@@ -33,7 +33,12 @@ tree -dL 3 ~/.vim/pack > vim/packages
 
 for repo in ~/.vim/pack/*/*/*
 	pushd $repo
-	echo (basename $PWD) "<"(git config --get remote.origin.url)">"
+	echo -n (basename $PWD)" "
+	if test -d .git
+		echo "<"(git config --get remote.(git rev-parse --abbrev-ref "master@{upstream}" | sed 's/\(.*\)\/.*/\1/').url)">"
+	else
+		echo "<no url>"
+	end
 	popd
 end | sort > vim/package_repos
 
diff --git a/vim/package_repos b/vim/package_repos
index 5c6ccc0..a6c76c2 100644
--- a/vim/package_repos
+++ b/vim/package_repos
@@ -10,14 +10,14 @@ plastic.vim <https://github.com/flrnprz/plastic.vim>
 quantum.vim <https://github.com/kjssad/quantum.vim>
 rainbow <https://github.com/luochen1990/rainbow>
 ranger.vim <https://github.com/francoiscabrol/ranger.vim>
-setcolors
+setcolors <no url>
 tabular <https://github.com/godlygeek/tabular>
 tagbar <https://github.com/majutsushi/tagbar>
 twitvim <https://github.com/twitvim/twitvim.git>
 vim-abolish <https://github.com/tpope/vim-abolish.git>
 vim-airline <https://github.com/vim-airline/vim-airline>
 vim-airline-themes <https://github.com/vim-airline/vim-airline-themes>
-vim-asm_ca65 <https://github.com/maxbane/vim-asm_ca65>
+vim-asm_ca65 <git@git.greyserv.net:marrub/vim-asm_ca65_p816.git>
 vim-aurora <https://github.com/rafalbromirski/vim-aurora>
 vim-buftabline <https://github.com/ap/vim-buftabline>
 vim-buftabline <https://github.com/ap/vim-buftabline>