diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-17 11:42:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-17 11:42:34 -0700 |
| commit | c8ccfc9cdf3381525cce718c846bc62fd86767f7 (patch) | |
| tree | 6dc22b521f3af03855ee0e13f8599694aaee6e2e /builtin/add.c | |
| parent | 984ac91e72578aa271daf79b6c44d34da2a8dc5d (diff) | |
| parent | b07f7296080b20f5cc2069ce2761cacdd79b3432 (diff) | |
| download | git-c8ccfc9cdf3381525cce718c846bc62fd86767f7.tar.gz | |
Merge branch 'fc/trivial'
* fc/trivial:
pull: use $curr_branch_short more
add: trivial style cleanup
reset: trivial style cleanup
branch: trivial style fix
reset: trivial refactoring
Diffstat (limited to 'builtin/add.c')
| -rw-r--r-- | builtin/add.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/builtin/add.c b/builtin/add.c index 31ddabd994..226f758869 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -296,7 +296,7 @@ static int edit_patch(int argc, const char **argv, const char *prefix) git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ if (read_cache() < 0) - die (_("Could not read the index")); + die(_("Could not read the index")); init_revisions(&rev, prefix); rev.diffopt.context = 7; @@ -307,11 +307,11 @@ static int edit_patch(int argc, const char **argv, const char *prefix) DIFF_OPT_SET(&rev.diffopt, IGNORE_DIRTY_SUBMODULES); out = open(file, O_CREAT | O_WRONLY, 0666); 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.close_file = 1; if (run_diff_files(&rev, 0)) - die (_("Could not write patch")); + die(_("Could not write patch")); launch_editor(file, NULL, NULL); @@ -324,7 +324,7 @@ static int edit_patch(int argc, const char **argv, const char *prefix) child.git_cmd = 1; child.argv = apply_argv; if (run_command(&child)) - die (_("Could not apply '%s'"), file); + die(_("Could not apply '%s'"), file); unlink(file); free(file); @@ -582,7 +582,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) unplug_bulk_checkin(); - finish: +finish: if (active_cache_changed) { if (write_cache(newfd, active_cache, active_nr) || commit_locked_index(&lock_file)) |