undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add: trivial style cleanup

Browse Source 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras 2013-08-30 16:56:49 -05:00 committed by Junio C Hamano
parent 4e83ab3e8d
commit d521abf890
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/add.c
View File

@ -336,7 +336,7 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
if (read_cache() < 0) if (read_cache() < 0)
die (_("Could not read the index")); die(_("Could not read the index"));
init_revisions(&rev, prefix); init_revisions(&rev, prefix);
rev.diffopt.context = 7; rev.diffopt.context = 7;
@ -347,11 +347,11 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
DIFF_OPT_SET(&rev.diffopt, IGNORE_DIRTY_SUBMODULES); DIFF_OPT_SET(&rev.diffopt, IGNORE_DIRTY_SUBMODULES);
out = open(file, O_CREAT | O_WRONLY, 0666); out = open(file, O_CREAT | O_WRONLY, 0666);
if (out < 0) if (out < 0)
die (_("Could not open '%s' for writing."), file); die(_("Could not open '%s' for writing."), file);
rev.diffopt.file = xfdopen(out, "w"); rev.diffopt.file = xfdopen(out, "w");
rev.diffopt.close_file = 1; rev.diffopt.close_file = 1;
if (run_diff_files(&rev, 0)) if (run_diff_files(&rev, 0))
die (_("Could not write patch")); die(_("Could not write patch"));
launch_editor(file, NULL, NULL); launch_editor(file, NULL, NULL);
@ -364,7 +364,7 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
child.git_cmd = 1; child.git_cmd = 1;
child.argv = apply_argv; child.argv = apply_argv;
if (run_command(&child)) if (run_command(&child))
die (_("Could not apply '%s'"), file); die(_("Could not apply '%s'"), file);
unlink(file); unlink(file);
free(file); free(file);
@ -598,7 +598,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
unplug_bulk_checkin(); unplug_bulk_checkin();
finish: finish:
if (active_cache_changed) { if (active_cache_changed) {
if (write_cache(newfd, active_cache, active_nr) || if (write_cache(newfd, active_cache, active_nr) ||
commit_locked_index(&lock_file)) commit_locked_index(&lock_file))