Skip to content

Commit 7e2494a

Browse files
committed
fix commit pruning and always show commit-deletion-GUI during commit-dragging
1 parent 36ab55b commit 7e2494a

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/core/trashBin.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ class TrashBinComponentImpl : public ComponentBase, public WindowOptions {
7171

7272
Element Render() final {
7373
// check if in deletion or stuff
74-
if (ostreetui.GetViewMode() == ViewMode::COMMIT_DRAGGING &&
75-
ostreetui.GetOstreeRepo().IsMostRecentCommitOnBranch(ostreetui.GetModeHash())) {
74+
if (ostreetui.GetViewMode() == ViewMode::COMMIT_DRAGGING) {
7675
showBin();
7776
} else {
7877
hideBin();

src/util/cpplibostree.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,9 @@ bool OSTreeRepo::RemoveCommitFromBranchAndPrune(const Commit& commit) {
347347
command += " " + commit.branch;
348348
command += " " + commit.branch + "^";
349349

350-
return runCLICommand(command);
350+
if (!runCLICommand(command)) {
351+
return false;
352+
};
351353
}
352354

353355
// prune commit

0 commit comments

Comments
 (0)