search

ome / scc

OME tools for managing the Git(Hub) workflow
https://pypi.org/project/scc/
GNU General Public License v2.0
0 stars 15 forks source link

Fixes for submodule builds (WIP) #236

Open joshmoore opened 6 years ago

joshmoore commented 6 years ago

Trying to handle:

Traceback (most recent call last):
  File "/home/starfish/.conda/envs/scc/lib/python2.7/site-packages/scc/main.py", line 80, in entry_point
    (UpdateSubmodules.NAME, UpdateSubmodules),
  File "/home/starfish/.conda/envs/scc/lib/python2.7/site-packages/yaclifw/framework.py", line 188, in main
    ns.func(ns)
  File "/home/starfish/.conda/envs/scc/lib/python2.7/site-packages/scc/git.py", line 3161, in __call__
    self.merge(args, self.main_repo)
  File "/home/starfish/.conda/envs/scc/lib/python2.7/site-packages/scc/git.py", line 3192, in merge
    set_commit_status=args.set_commit_status)
  File "/home/starfish/.conda/envs/scc/lib/python2.7/site-packages/scc/git.py", line 1814, in rmerge
    allow_empty=allow_empty, is_submodule=True)
  File "/home/starfish/.conda/envs/scc/lib/python2.7/site-packages/scc/git.py", line 1820, in rmerge
    update_gitmodules=update_gitmodules, allow_empty=allow_empty)
  File "/home/starfish/.conda/envs/scc/lib/python2.7/site-packages/scc/git.py", line 1865, in summary_commit
    self.communicate("git", "commit", "-a", "-n", "-m", commit_message)
  File "/home/starfish/.conda/envs/scc/lib/python2.7/site-packages/scc/git.py", line 1101, in communicate
    raise Exception(msg)
Exception: Failed to run 'git commit -a -n -m merge master -Dall -Snone

Repository: spacetx/slicedimage
Already up-to-date.

'
    rc:     1
    stdout: HEAD detached at f4087ce
nothing to commit, working tree clean

    stderr:
joshmoore commented 6 years ago

https://github.com/openmicroscopy/snoopycrimecop/pull/236/commits/0625c134ae7254449f9001ce26d9d1f891d09aea (now released as 0.10.0) was the ultimate fix. The rest of this consists of logging improvements and (slightly) saner chdir semantics. Both of which are probably worth having, but are not a must.