reset: trivial refactoring
After commit 3fde386 (reset [--mixed]: use diff-based reset whether or not pathspec was given), some code can be moved to the 'reset_type == MIXED' check. Let's move the code that is specific to MIXED. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
Aug 30, 2013 at 16:56 UTC
f38798f48dc8ed53fe001cc5a0d422f5c56b9d81
1 file changed
+3
-6
builtin/reset.c
+3
-6
@@ -326,8 +326,11 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
326
struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
327
int newfd = hold_locked_index(lock, 1);
328
if (reset_type == MIXED) {
329
+ int flags = quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN;
330
if (read_from_tree(pathspec, sha1))
331
return 1;
332
+ refresh_index(&the_index, flags, NULL, NULL,
333
+ _("Unstaged changes after reset:"));
334
} else {
335
int err = reset_index(sha1, reset_type, quiet);
336
if (reset_type == KEEP && !err)
@@ -336,12 +339,6 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
339
die(_("Could not reset index file to revision '%s'."), rev);
340
}
341
339
- if (reset_type == MIXED) { /* Report what has not been updated. */
340
- int flags = quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN;
341
- refresh_index(&the_index, flags, NULL, NULL,
342
- _("Unstaged changes after reset:"));
343
- }
344
-
342
if (write_cache(newfd, active_cache, active_nr) ||
343
commit_locked_index(lock))
344
die(_("Could not write new index file."));