diff options
author | Michael Haggerty <mhagger@alum.mit.edu> | 2013-04-22 21:52:32 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-05-01 15:33:11 -0700 |
commit | 32d462cea80cd52b2c3fa0d538aba7fcf079ba77 (patch) | |
tree | 564a901875d829862f6c823b676871225a8c535e /builtin | |
parent | 0c0c0bd25e4bea1fb1f48e8bca3ce9b68d69ee93 (diff) | |
download | git-32d462cea80cd52b2c3fa0d538aba7fcf079ba77.tar.gz |
pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}
pack-refs.c doesn't contain much code, and the code it does contain is
closely related to reference handling. Moreover, there is some
duplication between pack_refs() and repack_without_ref(). Therefore,
merge pack-refs.c into refs.c and pack-refs.h into refs.h.
The code duplication will be addressed in future commits.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/clone.c | 1 | ||||
-rw-r--r-- | builtin/pack-refs.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index 36ec99db3f..a0f5bb9f45 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -18,7 +18,6 @@ #include "transport.h" #include "strbuf.h" #include "dir.h" -#include "pack-refs.h" #include "sigchain.h" #include "branch.h" #include "remote.h" diff --git a/builtin/pack-refs.c b/builtin/pack-refs.c index b5a0f88eb8..b20b1ec4c1 100644 --- a/builtin/pack-refs.c +++ b/builtin/pack-refs.c @@ -1,6 +1,6 @@ #include "builtin.h" #include "parse-options.h" -#include "pack-refs.h" +#include "refs.h" static char const * const pack_refs_usage[] = { N_("git pack-refs [options]"), |