diff options
| author | Martin von Zweigbergk <martinvonz@gmail.com> | 2013-01-14 21:47:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-15 09:38:07 -0800 |
| commit | 352f58a57ba3050adbdc2dcdcd3839e584f1431b (patch) | |
| tree | c5da0826a6d52c88d25b41e49bb359a5cd9543b1 /gitweb/static/js/javascript-detection.js | |
| parent | reset.c: extract function for updating {ORIG_,}HEAD (diff) | |
| download | git-352f58a57ba3050adbdc2dcdcd3839e584f1431b.tar.gz git-352f58a57ba3050adbdc2dcdcd3839e584f1431b.zip | |
reset.c: share call to die_if_unmerged_cache()
Use a single condition to guard the call to die_if_unmerged_cache for
both --soft and --keep. This avoids the small distraction of the
precondition check from the logic following it.
Also change an instance of
if (e)
err = err || f();
to the almost as short, but clearer
if (e && !err)
err = f();
(which is equivalent since we only care whether exit code is 0)
Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gitweb/static/js/javascript-detection.js')
0 files changed, 0 insertions, 0 deletions