Skip to content

Commit

Permalink
Adds git response into apply error message
Browse files Browse the repository at this point in the history
  • Loading branch information
eamodio committed Dec 16, 2018
1 parent 46b510f commit 6b298b7
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/commands/stashApply.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,9 @@ export class StashApplyCommand extends Command {
return window.showInformationMessage(`Stash applied with conflicts`);
}
else {
return Messages.showGenericErrorMessage('Unable to apply stash');
return Messages.showGenericErrorMessage(
`Unable to apply stash \u2014 ${ex.message.trim().replace(/\n+?/g, '; ')}`
);
}
}
}
Expand Down

0 comments on commit 6b298b7

Please sign in to comment.