From: Luis R. Rodriguez Date: Thu, 6 Nov 2014 22:48:14 +0000 (-0800) Subject: backports: avoid git tree reinitialization X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4e2be7f0612bc70552f67d8a98942a823498ef9e;p=openwrt%2Fstaging%2Fblogic.git backports: avoid git tree reinitialization When using backports against for packaging with --gitdebug you either have to use --clean or assume the directory is empty already. In either case you start fresh. With integration this will be a bit different, you could end up with a project directory where the git tree was present but only the target directory was empty. Calling git init on an already existing git directory will reinitialize your git tree, that can reset some config stuff, let's avoid that. Signed-off-by: Luis R. Rodriguez --- diff --git a/gentree.py b/gentree.py index 04e8f5ee374b..68efce9fce57 100755 --- a/gentree.py +++ b/gentree.py @@ -288,7 +288,10 @@ def git_debug_init(args): """ if not args.gitdebug: return - git.init(tree=args.bpid.project_dir) + # Git supports re-initialization, although not well documented it can + # reset config stuff, lets avoid that if the tree already exists. + if not os.path.exists(os.path.join(args.bpid.project_dir, '.git')): + git.init(tree=args.bpid.project_dir) git.commit_all("Copied backport", tree=args.bpid.project_dir)