diff options
| author |  Lukas_Sandström <lukass@etek.chalmers.se> | 2005-11-10 00:16:13 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-11-11 21:19:11 -0800 |
| commit | 9bc0f32c77b755b8d77d215cc47fafff53cad6f5 (patch) | |
| tree | 71a65aecd161e0d730d3a88b0ab4a0e654a13af7 | |
| parent | Make git-repack use git-pack-intersect. (diff) | |
| download | tgif-9bc0f32c77b755b8d77d215cc47fafff53cad6f5.tar.xz | |
Rename git-pack-intersect to git-pack-redundant
This patch renames git-pack-intersect to git-pack-redundant
as suggested by Petr Baudis. The new name reflects what the
program does, rather than how it does it.
Also fix a small argument parsing bug.
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Documentation/git-pack-redundant.txt (renamed from Documentation/git-pack-intersect.txt) | 6 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | git-repack.sh | 4 | ||||
| -rw-r--r-- | pack-redundant.c (renamed from pack-intersect.c) | 10 |
5 files changed, 13 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore index 6ff25300e1..1d1aa57676 100644 --- a/.gitignore +++ b/.gitignore @@ -60,7 +60,7 @@ git-mktag git-name-rev git-mv git-octopus -git-pack-intersect +git-pack-redundant git-pack-objects git-parse-remote git-patch-id diff --git a/Documentation/git-pack-intersect.txt b/Documentation/git-pack-redundant.txt index e5d6fc7d3d..55c0d48bf1 100644 --- a/Documentation/git-pack-intersect.txt +++ b/Documentation/git-pack-redundant.txt @@ -1,14 +1,14 @@ -git-pack-intersect(1) +git-pack-redundant(1) ===================== NAME ---- -git-pack-intersect - Program used to find redundant pack files. +git-pack-redundant - Program used to find redundant pack files. SYNOPSIS -------- -'git-pack-intersect [ -v ] < -a | .pack filename ... >' +'git-pack-redundant [ -v ] < -a | .pack filename ... >' DESCRIPTION ----------- @@ -122,7 +122,7 @@ PROGRAMS = \ git-unpack-objects$X git-update-index$X git-update-server-info$X \ git-upload-pack$X git-verify-pack$X git-write-tree$X \ git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \ - git-name-rev$X git-pack-intersect$X $(SIMPLE_PROGRAMS) + git-name-rev$X git-pack-redundant$X $(SIMPLE_PROGRAMS) # Backward compatibility -- to be removed after 1.0 PROGRAMS += git-ssh-pull$X git-ssh-push$X diff --git a/git-repack.sh b/git-repack.sh index 3f28300566..4ce00225da 100755 --- a/git-repack.sh +++ b/git-repack.sh @@ -45,7 +45,7 @@ if [ -z "$name" ]; then if test "$remove_redandant" = t ; then echo "Removing redundant packs." sync - redundant=$(git-pack-intersect -a) + redundant=$(git-pack-redundant -a) if test "$redundant" != "" ; then echo $redundant | xargs rm fi @@ -63,7 +63,7 @@ exit if test "$remove_redandant" = t then sync - redundant=$(git-pack-intersect -a) + redundant=$(git-pack-redundant -a) if test "$redundant" != "" ; then echo $redundant | xargs rm fi diff --git a/pack-intersect.c b/pack-redundant.c index 2267478c36..db3dcde22a 100644 --- a/pack-intersect.c +++ b/pack-redundant.c @@ -8,8 +8,8 @@ #include "cache.h" -static const char pack_intersect_usage[] = -"git-pack-intersect [ -v ] < -a | <.pack filename> ...>"; +static const char pack_redundant_usage[] = +"git-pack-redundant [ -v ] < -a | <.pack filename> ...>"; int all = 0, verbose = 0; @@ -522,8 +522,10 @@ int main(int argc, char **argv) for (i = 1; i < argc; i++) { const char *arg = argv[i]; - if(!strcmp(arg, "--")) + if(!strcmp(arg, "--")) { + i++; break; + } if(!strcmp(arg, "-a")) { all = 1; continue; @@ -533,7 +535,7 @@ int main(int argc, char **argv) continue; } if(*arg == '-') - usage(pack_intersect_usage); + usage(pack_redundant_usage); else break; } |