Skip to content

Double quotes allowed in commit and amend messages #434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- WebUI workspace view now works properly for filenames with spaces (#423)
- Fixed error popups in interop editors in Studio on 2024.1 (#417)
- Reintroduced amend (#425)
- Double quotes now permissible in commit messages (#433)

## [2.4.0] - 2024-07-08

Expand Down
9 changes: 9 additions & 0 deletions git-webui/release/share/git-webui/webui/js/git-webui.js
Original file line number Diff line number Diff line change
Expand Up @@ -2551,6 +2551,9 @@ webui.NewChangedFilesView = function(workspaceView) {

self.amend = function(message, details) {
var selectedFilesAsString = selectedItems.join(" ");
message = self.doubleQuotesToSingleQuotes(message);
details = self.doubleQuotesToSingleQuotes(details);

if (self.commitMsgEmpty()) {
webui.git("add " + selectedFilesAsString);
webui.git("commit --amend --no-edit -- " + selectedFilesAsString, function(output) {
Expand All @@ -2573,8 +2576,14 @@ webui.NewChangedFilesView = function(workspaceView) {

}

self.doubleQuotesToSingleQuotes = function(string) {
return string.replace(/"/g, "'");
}

self.commit = function(message, details) {
var selectedFilesAsString = selectedItems.join(" ");
message = self.doubleQuotesToSingleQuotes(message);
details = self.doubleQuotesToSingleQuotes(details);

webui.git("add " + selectedFilesAsString);
webui.git('commit -m "' + message + '" -m "' + details + '" -- ' + selectedFilesAsString, function(output) {
Expand Down
9 changes: 9 additions & 0 deletions git-webui/src/share/git-webui/webui/js/git-webui.js
Original file line number Diff line number Diff line change
Expand Up @@ -2551,6 +2551,9 @@ webui.NewChangedFilesView = function(workspaceView) {

self.amend = function(message, details) {
var selectedFilesAsString = selectedItems.join(" ");
message = self.doubleQuotesToSingleQuotes(message);
details = self.doubleQuotesToSingleQuotes(details);

if (self.commitMsgEmpty()) {
webui.git("add " + selectedFilesAsString);
webui.git("commit --amend --no-edit -- " + selectedFilesAsString, function(output) {
Expand All @@ -2573,8 +2576,14 @@ webui.NewChangedFilesView = function(workspaceView) {

}

self.doubleQuotesToSingleQuotes = function(string) {
return string.replace(/"/g, "'");
}

self.commit = function(message, details) {
var selectedFilesAsString = selectedItems.join(" ");
message = self.doubleQuotesToSingleQuotes(message);
details = self.doubleQuotesToSingleQuotes(details);

webui.git("add " + selectedFilesAsString);
webui.git('commit -m "' + message + '" -m "' + details + '" -- ' + selectedFilesAsString, function(output) {
Expand Down
Loading