<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11757">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gits: remove code dup: ask_reset_hard()<br><br>The diff may look a bit weird, but this really just moves a bit of code that<br>existed twice into a local function.<br><br>Change-Id: I741aa6ca29370f26a724f5b4b9c6e7f8ac3f282a<br>---<br>M src/gits<br>1 file changed, 11 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/57/11757/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gits b/src/gits</span><br><span>index 681082d..bd3e3f2 100755</span><br><span>--- a/src/gits</span><br><span>+++ b/src/gits</span><br><span>@@ -269,12 +269,8 @@</span><br><span> print('There still are local modifications')</span><br><span> raise SkipThisRepo()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Missing upstream branch</span><br><span style="color: hsl(0, 100%, 40%);">- if not upstream_branch:</span><br><span style="color: hsl(0, 100%, 40%);">- print('there is no upstream branch for %r' % orig_branch)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Diverged</span><br><span style="color: hsl(0, 100%, 40%);">- elif ahead and behind:</span><br><span style="color: hsl(120, 100%, 40%);">+ def ask_reset_hard():</span><br><span> do_reset = ask(git_dir, 'Diverged.',</span><br><span> '%s: git reset --hard %s?' % (</span><br><span> orig_branch, upstream_branch),</span><br><span>@@ -285,6 +281,15 @@</span><br><span> if do_reset == 'OK':</span><br><span> git(git_dir, 'reset', '--hard', upstream_branch)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Missing upstream branch</span><br><span style="color: hsl(120, 100%, 40%);">+ if not upstream_branch:</span><br><span style="color: hsl(120, 100%, 40%);">+ print('there is no upstream branch for %r' % orig_branch)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Diverged</span><br><span style="color: hsl(120, 100%, 40%);">+ elif ahead and behind:</span><br><span style="color: hsl(120, 100%, 40%);">+ ask_reset_hard()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Behind</span><br><span> elif behind:</span><br><span> if git_can_fast_forward(git_dir, orig_branch, upstream_branch):</span><br><span>@@ -311,13 +316,7 @@</span><br><span> git(git_dir, 'commit', '-am', 'wip', may_fail=True)</span><br><span> git(git_dir, 'checkout', orig_branch)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- do_reset = ask(git_dir, '%s: git reset --hard %s?' % (orig_branch, upstream_branch),</span><br><span style="color: hsl(0, 100%, 40%);">- '<empty> no',</span><br><span style="color: hsl(0, 100%, 40%);">- 'OK yes (write OK in caps!)',</span><br><span style="color: hsl(0, 100%, 40%);">- valid_answers=('', 'OK'))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if do_reset == 'OK':</span><br><span style="color: hsl(0, 100%, 40%);">- git(git_dir, 'reset', '--hard', upstream_branch)</span><br><span style="color: hsl(120, 100%, 40%);">+ ask_reset_hard()</span><br><span> </span><br><span> return orig_branch</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11757">change 11757</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11757"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-dev </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I741aa6ca29370f26a724f5b4b9c6e7f8ac3f282a </div>
<div style="display:none"> Gerrit-Change-Number: 11757 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>