Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reaplce chdir impl with git -C #61

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −10
Open

Reaplce chdir impl with git -C #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
git-fastclone (1.4.3)
git-fastclone (1.5.0)
colorize

GEM
Expand Down
20 changes: 12 additions & 8 deletions lib/git-fastclone.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,8 @@ def clone(url, rev, src_dir, config)

# Only checkout if we're changing branches to a non-default branch
if rev
fail_on_error('git', 'checkout', '--quiet', rev.to_s, quiet: !verbose,
print_on_failure: print_git_errors,
chdir: File.join(abs_clone_path, src_dir))
fail_on_error('git', '-C', File.join(abs_clone_path, src_dir), 'checkout', '--quiet', rev.to_s, quiet: !verbose,
print_on_failure: print_git_errors)
end

update_submodules(src_dir, url)
Expand All @@ -249,9 +248,15 @@ def update_submodules(pwd, url)

threads = []
submodule_url_list = []
<<<<<<< Updated upstream
output = fail_on_error('git', 'submodule', 'init', quiet: !verbose,
print_on_failure: print_git_errors,
chdir: File.join(abs_clone_path, pwd))
=======
output = ''
output = fail_on_error('git', '-C', File.join(abs_clone_path, pwd), 'submodule', 'init', quiet: !verbose,
print_on_failure: print_git_errors)
>>>>>>> Stashed changes

output.split("\n").each do |line|
submodule_path, submodule_url = parse_update_info(line)
Expand All @@ -267,10 +272,9 @@ def update_submodules(pwd, url)
def thread_update_submodule(submodule_url, submodule_path, threads, pwd)
threads << Thread.new do
with_git_mirror(submodule_url) do |mirror, _|
cmd = ['git', 'submodule',
cmd = ['git', '-C', File.join(abs_clone_path, pwd), 'submodule',
verbose ? nil : '--quiet', 'update', '--reference', mirror.to_s, submodule_path.to_s].compact
fail_on_error(*cmd, quiet: !verbose, print_on_failure: print_git_errors,
chdir: File.join(abs_clone_path, pwd))
fail_on_error(*cmd, quiet: !verbose, print_on_failure: print_git_errors)
end

update_submodules(File.join(pwd, submodule_path), submodule_url)
Expand Down Expand Up @@ -346,8 +350,8 @@ def store_updated_repo(url, mirror, repo_name, fail_hard)
quiet: !verbose, print_on_failure: print_git_errors)
end

cmd = ['git', 'remote', verbose ? '--verbose' : nil, 'update', '--prune'].compact
fail_on_error(*cmd, quiet: !verbose, print_on_failure: print_git_errors, chdir: mirror)
cmd = ['git', '-C', mirror, 'remote', verbose ? '--verbose' : nil, 'update', '--prune'].compact
fail_on_error(*cmd, quiet: !verbose, print_on_failure: print_git_errors)

reference_updated[repo_name] = true
rescue RunnerExecutionRuntimeError => e
Expand Down
2 changes: 1 addition & 1 deletion lib/git-fastclone/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

# Version string for git-fastclone
module GitFastCloneVersion
VERSION = '1.4.3'
VERSION = '1.5.0'
end