Re: [PATCH] reset: trivial refactoring

2013-06-13 Thread Junio C Hamano
Martin von Zweigbergk writes: > ...the line after this one reads > >err = reset_index(sha1, MIXED, quiet); > > ? I don't know what the consequence of not calling prime_cache_tree() > would be, though. It does not affect correctness, but makes the subsequent "git status", the part that intern

Re: [PATCH] reset: trivial refactoring

2013-06-13 Thread Felipe Contreras
On Thu, Jun 13, 2013 at 4:13 PM, Martin von Zweigbergk wrote: > On Thu, Jun 13, 2013 at 11:15 AM, Felipe Contreras > wrote: >> @@ -82,7 +82,7 @@ static int reset_index(const unsigned char *sha1, int >> reset_type, int quiet) >> if (unpack_trees(nr, desc, &opts)) >> return

Re: [PATCH] reset: trivial refactoring

2013-06-13 Thread Martin von Zweigbergk
On Thu, Jun 13, 2013 at 11:15 AM, Felipe Contreras wrote: > @@ -82,7 +82,7 @@ static int reset_index(const unsigned char *sha1, int > reset_type, int quiet) > if (unpack_trees(nr, desc, &opts)) > return -1; > > - if (reset_type == MIXED || reset_type == HARD) { > +

[PATCH] reset: trivial refactoring

2013-06-13 Thread Felipe Contreras
After commit 3fde386 (reset [--mixed]: use diff-based reset whether or not pathspec was given), some code can't be reached, and other code can be moved to the 'reset_type == MIXED' check. Let's remove the check that can't be reached, and move the code is specific to MIXED. Signed-off-by: Felipe C