From 5412b5b22574032b5ba436babb2d872f36b14be0 Mon Sep 17 00:00:00 2001 From: xfnw Date: Wed, 30 Sep 2020 22:13:45 +0000 Subject: [PATCH] fix pull merging --- nboard | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nboard b/nboard index 1c3962d..83bbf0b 100755 --- a/nboard +++ b/nboard @@ -143,9 +143,9 @@ please report any bugs to ~xfnw on IRC, anywhere you can find him, or on the tildegit page, https://tildegit.org/xfnw/nboard """) elif len(sys.argv) > 1 and sys.argv[1] == 'pull': - branches=subprocess.run(['git','--dir-dir='+os.path.expanduser('~')+'/.nboard','for-each-ref','refs/remotes','--format','%(rename)'], capture_output=True).stdout.decode().splitlines() - subprocess.run(['git','--git-dir='+os.path.expanduser('~')+'/.nboard','pull','--all']) - subprocess.run(['git','--git-dir='+os.path.expanduser('~')+'/.nboard','merge']+branches) + branches=subprocess.run(['git','--git-dir='+os.path.expanduser('~')+'/.nboard/.git','for-each-ref','refs/remotes','--format','%(refname)'], capture_output=True).stdout.decode().splitlines() + subprocess.run(['git','--git-dir='+os.path.expanduser('~')+'/.nboard/.git','fetch','--all']) + subprocess.run(['git','--git-dir='+os.path.expanduser('~')+'/.nboard/.git','merge']+branches) print("pulled all remotes!") else: try: