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>
This commit is contained in:
parent
b4ad3552de
commit
9bc0f32c77
2
.gitignore
vendored
2
.gitignore
vendored
@ -60,7 +60,7 @@ git-mktag
|
|||||||
git-name-rev
|
git-name-rev
|
||||||
git-mv
|
git-mv
|
||||||
git-octopus
|
git-octopus
|
||||||
git-pack-intersect
|
git-pack-redundant
|
||||||
git-pack-objects
|
git-pack-objects
|
||||||
git-parse-remote
|
git-parse-remote
|
||||||
git-patch-id
|
git-patch-id
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
git-pack-intersect(1)
|
git-pack-redundant(1)
|
||||||
=====================
|
=====================
|
||||||
|
|
||||||
NAME
|
NAME
|
||||||
----
|
----
|
||||||
git-pack-intersect - Program used to find redundant pack files.
|
git-pack-redundant - Program used to find redundant pack files.
|
||||||
|
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
'git-pack-intersect [ -v ] < -a | .pack filename ... >'
|
'git-pack-redundant [ -v ] < -a | .pack filename ... >'
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
-----------
|
-----------
|
2
Makefile
2
Makefile
@ -122,7 +122,7 @@ PROGRAMS = \
|
|||||||
git-unpack-objects$X git-update-index$X git-update-server-info$X \
|
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-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-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
|
# Backward compatibility -- to be removed after 1.0
|
||||||
PROGRAMS += git-ssh-pull$X git-ssh-push$X
|
PROGRAMS += git-ssh-pull$X git-ssh-push$X
|
||||||
|
@ -45,7 +45,7 @@ if [ -z "$name" ]; then
|
|||||||
if test "$remove_redandant" = t ; then
|
if test "$remove_redandant" = t ; then
|
||||||
echo "Removing redundant packs."
|
echo "Removing redundant packs."
|
||||||
sync
|
sync
|
||||||
redundant=$(git-pack-intersect -a)
|
redundant=$(git-pack-redundant -a)
|
||||||
if test "$redundant" != "" ; then
|
if test "$redundant" != "" ; then
|
||||||
echo $redundant | xargs rm
|
echo $redundant | xargs rm
|
||||||
fi
|
fi
|
||||||
@ -63,7 +63,7 @@ exit
|
|||||||
if test "$remove_redandant" = t
|
if test "$remove_redandant" = t
|
||||||
then
|
then
|
||||||
sync
|
sync
|
||||||
redundant=$(git-pack-intersect -a)
|
redundant=$(git-pack-redundant -a)
|
||||||
if test "$redundant" != "" ; then
|
if test "$redundant" != "" ; then
|
||||||
echo $redundant | xargs rm
|
echo $redundant | xargs rm
|
||||||
fi
|
fi
|
||||||
|
@ -8,8 +8,8 @@
|
|||||||
|
|
||||||
#include "cache.h"
|
#include "cache.h"
|
||||||
|
|
||||||
static const char pack_intersect_usage[] =
|
static const char pack_redundant_usage[] =
|
||||||
"git-pack-intersect [ -v ] < -a | <.pack filename> ...>";
|
"git-pack-redundant [ -v ] < -a | <.pack filename> ...>";
|
||||||
|
|
||||||
int all = 0, verbose = 0;
|
int all = 0, verbose = 0;
|
||||||
|
|
||||||
@ -522,8 +522,10 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
for (i = 1; i < argc; i++) {
|
for (i = 1; i < argc; i++) {
|
||||||
const char *arg = argv[i];
|
const char *arg = argv[i];
|
||||||
if(!strcmp(arg, "--"))
|
if(!strcmp(arg, "--")) {
|
||||||
|
i++;
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
if(!strcmp(arg, "-a")) {
|
if(!strcmp(arg, "-a")) {
|
||||||
all = 1;
|
all = 1;
|
||||||
continue;
|
continue;
|
||||||
@ -533,7 +535,7 @@ int main(int argc, char **argv)
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if(*arg == '-')
|
if(*arg == '-')
|
||||||
usage(pack_intersect_usage);
|
usage(pack_redundant_usage);
|
||||||
else
|
else
|
||||||
break;
|
break;
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user