development/gitg
development/gitg
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gitg synced 2024-11-04 23:34:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reuse previous filemode when staging patches

Browse source 
Fixes #190
This commit is contained in:
Marc Häfner 2021-05-09 19:15:24 +02:00 committed by Alberto Fanjul
parent ae878604ad
commit abd884ffe3
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libgitg/gitg-stage.vala
View file

@ -855,6 +855,7 @@ public class Stage : Object
} }
private void apply_patch(Ggit.Index index, private void apply_patch(Ggit.Index index,
uint filemode,
InputStream old_stream, InputStream old_stream,
InputStream new_stream, InputStream new_stream,
PatchSet patch) throws Error PatchSet patch) throws Error
@ -868,6 +869,7 @@ public class Stage : Object
var new_entry = d_repository.create_index_entry_for_path(patch.filename, var new_entry = d_repository.create_index_entry_for_path(patch.filename,
new_id); new_id);
new_entry.set_mode(filemode);
index.add(new_entry); index.add(new_entry);
index.write(); index.write();
@ -944,7 +946,7 @@ public class Stage : Object
var old_stream = new MemoryInputStream.from_bytes(new Bytes(old_content)); var old_stream = new MemoryInputStream.from_bytes(new Bytes(old_content));
apply_patch(index, old_stream, new_stream, patch); apply_patch(index, entry.get_mode(), old_stream, new_stream, patch);
new_stream.close(); new_stream.close();
old_stream.close(); old_stream.close();
@ -1022,7 +1024,6 @@ public class Stage : Object
entry = entries.get_by_path(file, 0); entry = entries.get_by_path(file, 0);
} }
uchar[] head_content = new uchar[0]; uchar[] head_content = new uchar[0];
try { try {
var head_entry = tree.get_by_path(patch.filename); var head_entry = tree.get_by_path(patch.filename);
@ -1040,7 +1041,7 @@ public class Stage : Object
var reversed = patch.reversed(); var reversed = patch.reversed();
try { try {
apply_patch(index, index_stream, head_stream, reversed); apply_patch(index, entry.get_mode(), index_stream, head_stream, reversed);
} catch(Error e) { } catch(Error e) {
var stage = d_repository.stage; var stage = d_repository.stage;
stage.delete_path.begin(file.get_path(), (obj, res) => { stage.delete_path.begin(file.get_path(), (obj, res) => {