mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'js/add-e-submodule-fix' into maint
* js/add-e-submodule-fix: add -e: do not show difference in a submodule that is merely dirty
This commit is contained in:
commit
4daf6fc837
|
@ -280,6 +280,7 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
|
|||
|
||||
argc = setup_revisions(argc, argv, &rev, NULL);
|
||||
rev.diffopt.output_format = DIFF_FORMAT_PATCH;
|
||||
DIFF_OPT_SET(&rev.diffopt, IGNORE_DIRTY_SUBMODULES);
|
||||
out = open(file, O_CREAT | O_WRONLY, 0644);
|
||||
if (out < 0)
|
||||
die (_("Could not open '%s' for writing."), file);
|
||||
|
|
Loading…
Reference in a new issue