summaryrefslogtreecommitdiff
path: root/builtin-read-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-06-05 18:10:20 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-06-05 18:10:20 -0700
commitc49b5a3c891e34f6fea9f73847322e9447db91df (patch)
tree9ecc71e83c169bf60936afc01029dce3c50bb1e6 /builtin-read-tree.c
parentFix earlier mismerges. (diff)
parentgit alias: try alias last. (diff)
downloadtgif-c49b5a3c891e34f6fea9f73847322e9447db91df.tar.xz
Merge branch 'js/alias' into next
* js/alias: git alias: try alias last. If you have a config containing something like this: builtin-push: don't pass --thin to HTTP transport pack-objects: improve path grouping heuristics. rev-list: fix process_tree() conversion. Fix typo in tutorial-2.txt Fix Documentation/everyday.txt: Junio's workflow Add example xinetd(8) configuration to Documentation/everyday.txt read-tree: fix eye-candy. gitview: Add some useful keybindings.
Diffstat (limited to 'builtin-read-tree.c')
-rw-r--r--builtin-read-tree.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 7164b49054..57bc4516a0 100644
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -377,6 +377,7 @@ static void check_updates(struct cache_entry **src, int nr)
fprintf(stderr, "%4u%% (%u/%u) done\r",
percent, cnt, total);
last_percent = percent;
+ progress_update = 0;
}
}
}