mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/add-e-submodule-fix' into maint

Browse Source 
* js/add-e-submodule-fix:
  add -e: do not show difference in a submodule that is merely dirty
This commit is contained in:
Junio C Hamano
2012-02-13 11:42:18 -08:00
parent 87cb3b82a4 701825de23
commit 4daf6fc837
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/add.c
View File

@ -280,6 +280,7 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
argc = setup_revisions(argc, argv, &rev, NULL); argc = setup_revisions(argc, argv, &rev, NULL);
rev.diffopt.output_format = DIFF_FORMAT_PATCH; rev.diffopt.output_format = DIFF_FORMAT_PATCH;
DIFF_OPT_SET(&rev.diffopt, IGNORE_DIRTY_SUBMODULES);
out = open(file, O_CREAT | O_WRONLY, 0644); out = open(file, O_CREAT | O_WRONLY, 0644);
if (out < 0) if (out < 0)
die (_("Could not open '%s' for writing."), file); die (_("Could not open '%s' for writing."), file);