Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-06 10:09:05 +0400
committerJunio C Hamano <junkio@cox.net>2006-05-06 10:11:29 +0400
commit22293b9c41778bb60f3b07355e1b8e421a503702 (patch)
treebe961d45c75997188212d0f383b0859fef5f2442 /update-index.c
parent83e77a25dc194933c0fb7908ab6d9fb84a5045e2 (diff)
update-index --again: take optional pathspecs
When pathspecs are given, update-index --again further limits the set of paths to be updated to those that match them. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'update-index.c')
-rw-r--r--update-index.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/update-index.c b/update-index.c
index 5496d68ae9..184b2526da 100644
--- a/update-index.c
+++ b/update-index.c
@@ -610,6 +610,7 @@ static int do_reupdate(int ac, const char **av,
*/
int pos;
int has_head = 1;
+ char **pathspec = get_pathspec(prefix, av + 1);
if (read_ref(git_path("HEAD"), head_sha1))
/* If there is no HEAD, that means it is an initial
@@ -621,7 +622,8 @@ static int do_reupdate(int ac, const char **av,
struct cache_entry *ce = active_cache[pos];
struct cache_entry *old = NULL;
int save_nr;
- if (ce_stage(ce))
+
+ if (ce_stage(ce) || !ce_path_match(ce, pathspec))
continue;
if (has_head)
old = read_one_ent(NULL, head_sha1,