Skip to content

Commit 2f4fe2d

Browse files
authored
Merge pull request #287 from isc-pbarton/stash-untracked
Stash in web UI includes untracked files
2 parents 3b9ccc4 + 449c1e1 commit 2f4fe2d

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Added
1111
- Web UI includes a "Push Branch" button for local branches that are ahead of upstream
12+
- Stash option in the Web UI now includes untracked files
1213
- Added "Status" menu item to editor menu (#285)
1314

1415
### Fixed

git-webui/release/share/git-webui/webui/js/git-webui.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ webui.git = function(cmd, arg1, arg2, arg3, arg4) {
176176
location.reload();
177177
return false;
178178
}
179-
// here
180179
webui.showError(displayMessage);
181180
}
182181
} else {
@@ -2379,7 +2378,7 @@ webui.ChangedFilesView = function(workspaceView, type, label) {
23792378
var combinedFiles = files.concat(rmFiles);
23802379

23812380
if(combinedFiles.length != 0){
2382-
webui.git("stash push -- " + combinedFiles, function(output){
2381+
webui.git("stash push --include-untracked -- " + combinedFiles, function(output){
23832382
webui.showSuccess(output);
23842383
workspaceView.update("stash");
23852384
});

git-webui/src/share/git-webui/webui/js/git-webui.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2378,7 +2378,7 @@ webui.ChangedFilesView = function(workspaceView, type, label) {
23782378
var combinedFiles = files.concat(rmFiles);
23792379

23802380
if(combinedFiles.length != 0){
2381-
webui.git("stash push -- " + combinedFiles, function(output){
2381+
webui.git("stash push --include-untracked -- " + combinedFiles, function(output){
23822382
webui.showSuccess(output);
23832383
workspaceView.update("stash");
23842384
});

0 commit comments

Comments
 (0)