Skip to content

Commit 9515583

Browse files
committed
fixup! stash: convert apply to builtin
Pointed out by our cocci job. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 6581cff commit 9515583

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

builtin/stash.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -407,8 +407,8 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
407407
return error(_("cannot apply a stash in the middle of a merge"));
408408

409409
if (index) {
410-
if (!oidcmp(&info->b_tree, &info->i_tree) ||
411-
!oidcmp(&c_tree, &info->i_tree)) {
410+
if (oideq(&info->b_tree, &info->i_tree) ||
411+
oideq(&c_tree, &info->i_tree)) {
412412
has_index = 0;
413413
} else {
414414
struct strbuf out = STRBUF_INIT;
@@ -442,7 +442,7 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
442442
o.branch1 = "Updated upstream";
443443
o.branch2 = "Stashed changes";
444444

445-
if (!oidcmp(&info->b_tree, &c_tree))
445+
if (oideq(&info->b_tree, &c_tree))
446446
o.branch1 = "Version stash was based on";
447447

448448
if (quiet)

0 commit comments

Comments
 (0)