diff options
| author | Brandon Casey <casey@nrlssc.navy.mil> | 2008-11-12 11:59:05 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-12 10:28:12 -0800 |
| commit | dd718365cccfddd7d5992a40296de50e7cabdfc8 (patch) | |
| tree | dabec4bec194116aa37509b81351ac6deec52c35 | |
| parent | e96fb9b8f90f907d720ea6b71c92e30c2b071f4a (diff) | |
| download | git-dd718365cccfddd7d5992a40296de50e7cabdfc8.tar.gz git-dd718365cccfddd7d5992a40296de50e7cabdfc8.tar.xz | |
repack: don't repack local objects in packs with .keep file
If the user created a .keep file for a local pack, then it can be inferred
that the user does not want those objects repacked.
This fixes the repack bug tested by t7700.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-repack.sh | 2 | ||||
| -rwxr-xr-x | t/t7700-repack.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/git-repack.sh b/git-repack.sh index d39eb6cea..8bb22014b 100755 --- a/git-repack.sh +++ b/git-repack.sh @@ -83,7 +83,7 @@ case ",$all_into_one," in esac args="$args $local $quiet $no_reuse$extra" -names=$(git pack-objects --non-empty --all --reflog $args </dev/null "$PACKTMP") || +names=$(git pack-objects --honor-pack-keep --non-empty --all --reflog $args </dev/null "$PACKTMP") || exit 1 if [ -z "$names" ]; then if test -z "$quiet"; then diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh index 7aaff0bbe..356afe371 100755 --- a/t/t7700-repack.sh +++ b/t/t7700-repack.sh @@ -4,7 +4,7 @@ test_description='git repack works correctly' . ./test-lib.sh -test_expect_failure 'objects in packs marked .keep are not repacked' ' +test_expect_success 'objects in packs marked .keep are not repacked' ' echo content1 > file1 && echo content2 > file2 && git add . && |