<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11758">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gits: when asking for reset --hard, also offer push -f<br><br>Change-Id: Iab38229ee7deaec91c342fa114028e222e652b60<br>---<br>M src/gits<br>1 file changed, 8 insertions(+), 5 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/58/11758/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 bd3e3f2..2c25129 100755</span><br><span>--- a/src/gits</span><br><span>+++ b/src/gits</span><br><span>@@ -270,16 +270,19 @@</span><br><span> raise SkipThisRepo()</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def ask_reset_hard():</span><br><span style="color: hsl(120, 100%, 40%);">+ def ask_reset_hard_or_push_f():</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> '<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(120, 100%, 40%);">+ 'OK yes, reset to upstream (write OK in caps!)',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'P `push -f` to overwrite upstream (P in caps!)',</span><br><span style="color: hsl(120, 100%, 40%);">+ valid_answers=('', 'OK', 'P'))</span><br><span> </span><br><span> if do_reset == 'OK':</span><br><span> git(git_dir, 'reset', '--hard', upstream_branch)</span><br><span style="color: hsl(120, 100%, 40%);">+ elif do_reset == 'P':</span><br><span style="color: hsl(120, 100%, 40%);">+ git(git_dir, 'push', '-f')</span><br><span> </span><br><span> </span><br><span> # Missing upstream branch</span><br><span>@@ -288,7 +291,7 @@</span><br><span> </span><br><span> # Diverged</span><br><span> elif ahead and behind:</span><br><span style="color: hsl(0, 100%, 40%);">- ask_reset_hard()</span><br><span style="color: hsl(120, 100%, 40%);">+ ask_reset_hard_or_push_f()</span><br><span> </span><br><span> # Behind</span><br><span> elif behind:</span><br><span>@@ -316,7 +319,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%);">- ask_reset_hard()</span><br><span style="color: hsl(120, 100%, 40%);">+ ask_reset_hard_or_push_f()</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/11758">change 11758</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/11758"/><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: Iab38229ee7deaec91c342fa114028e222e652b60 </div>
<div style="display:none"> Gerrit-Change-Number: 11758 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>