Skip to content

Commit

Permalink
fixup! stash/rebase: default to the non-builtin versions
Browse files Browse the repository at this point in the history
In Git for Windows v2.20.0, we will want to default to the built-in
versions.

Signed-off-by: Johannes Schindelin <[email protected]>
  • Loading branch information
dscho committed Nov 16, 2018
1 parent 598c370 commit a2b43c9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion builtin/rebase.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ static int use_builtin_rebase(void)
cp.git_cmd = 1;
if (capture_command(&cp, &out, 6)) {
strbuf_release(&out);
return 0;
return 1;
}

strbuf_trim(&out);
Expand Down
2 changes: 1 addition & 1 deletion builtin/stash.c
Original file line number Diff line number Diff line change
Expand Up @@ -1529,7 +1529,7 @@ static int use_builtin_stash(void)
cp.git_cmd = 1;
if (capture_command(&cp, &out, 6)) {
strbuf_release(&out);
return 0;
return 1;
}

strbuf_trim(&out);
Expand Down

0 comments on commit a2b43c9

Please sign in to comment.