From: Junio C Hamano <gitster@pobox.com>
To: Nicolas Pitre <nico@cam.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Nix <nix@esperi.org.uk>, Steven Grimm <koreth@midwinter.com>,
Git Mailing List <git@vger.kernel.org>
Subject: [PATCH] make sha1_file.c::matches_pack_name() available to others
Date: Sat, 08 Sep 2007 02:50:06 -0700 [thread overview]
Message-ID: <7v4pi51o6p.fsf_-_@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <7vwsv36q6p.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Thu, 06 Sep 2007 21:43:26 -0700")
Even though our convention is "zero return means good", it goes a
bit too far for matches_pack_name() to return 0 when it found
the pack is what the name refers to. This fixes that silly and
obvious interface bug.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Junio C Hamano <gitster@pobox.com> writes:
> Nicolas Pitre <nico@cam.org> writes:
> ...
>> In fact, since we want to _also_ perform a repack of loose objects in
>> the context of automatic repacking, I wonder why we wouldn't use that
>> --unpacked= argument to also repack smallish packs at the same time in
>> only one pack-objects pass. Or maybe I'm missing something?
>
> I think this is a much better idea. You obviously need some
> twist to the pack-objects, and being lazy that was the reason I
> did not want to do this that way.
So what follows is two-patch series, which still is a rough
sketch, as I am feeling a bit too tired to do tests and
documentation (help is always welcomed, hint hint).
This message contains the first one, which is more or less
independent, that exposes matches_pack_name() function from
sha1_file.c, while fixing a silly and obvious interface bug.
cache.h | 1 +
sha1_file.c | 14 +++++++-------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/cache.h b/cache.h
index 70abbd5..3fa5b8e 100644
--- a/cache.h
+++ b/cache.h
@@ -529,6 +529,7 @@ extern void *unpack_entry(struct packed_git *, off_t, enum object_type *, unsign
extern unsigned long unpack_object_header_gently(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep);
extern unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t);
extern const char *packed_object_info_detail(struct packed_git *, off_t, unsigned long *, unsigned long *, unsigned int *, unsigned char *);
+extern int matches_pack_name(struct packed_git *p, const char *name);
/* Dumb servers support */
extern int update_server_info(int);
diff --git a/sha1_file.c b/sha1_file.c
index 9978a58..5801c3e 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1684,22 +1684,22 @@ off_t find_pack_entry_one(const unsigned char *sha1,
return 0;
}
-static int matches_pack_name(struct packed_git *p, const char *ig)
+int matches_pack_name(struct packed_git *p, const char *name)
{
const char *last_c, *c;
- if (!strcmp(p->pack_name, ig))
- return 0;
+ if (!strcmp(p->pack_name, name))
+ return 1;
for (c = p->pack_name, last_c = c; *c;)
if (*c == '/')
last_c = ++c;
else
++c;
- if (!strcmp(last_c, ig))
- return 0;
+ if (!strcmp(last_c, name))
+ return 1;
- return 1;
+ return 0;
}
static int find_pack_entry(const unsigned char *sha1, struct pack_entry *e, const char **ignore_packed)
@@ -1717,7 +1717,7 @@ static int find_pack_entry(const unsigned char *sha1, struct pack_entry *e, cons
if (ignore_packed) {
const char **ig;
for (ig = ignore_packed; *ig; ig++)
- if (!matches_pack_name(p, *ig))
+ if (matches_pack_name(p, *ig))
break;
if (*ig)
goto next;
next prev parent reply other threads:[~2007-09-08 9:50 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-05 7:09 People unaware of the importance of "git gc"? Linus Torvalds
2007-09-05 7:21 ` Martin Langhoff
2007-09-05 7:37 ` Karl Hasselström
2007-09-05 7:30 ` Junio C Hamano
2007-09-05 7:26 ` Tomash Brechko
2007-09-05 8:13 ` Johan Herland
2007-09-05 8:39 ` Matthieu Moy
2007-09-05 8:41 ` Johan Herland
2007-09-05 8:47 ` David Kastrup
2007-09-05 8:51 ` Pierre Habouzit
2007-09-05 9:02 ` David Kastrup
2007-09-05 9:04 ` Matthieu Moy
2007-09-05 8:51 ` Wincent Colaiuta
2007-09-05 7:42 ` Pierre Habouzit
2007-09-05 8:16 ` Junio C Hamano
2007-09-05 8:50 ` Steven Grimm
[not found] ` <86ps0xcwxo.fsf@lola.quinscape.zz>
2007-09-05 9:07 ` Steven Grimm
2007-09-05 9:13 ` David Kastrup
2007-09-05 9:07 ` Junio C Hamano
2007-09-05 9:27 ` Martin Langhoff
2007-09-05 9:33 ` Matthieu Moy
2007-09-05 14:17 ` Johan De Messemaeker
2007-09-05 17:31 ` Matthieu Moy
2007-09-05 23:56 ` Jeff King
2007-09-05 9:13 ` David Kastrup
2007-09-05 9:14 ` Pierre Habouzit
2007-09-05 17:51 ` Nix
2007-09-05 18:14 ` Steven Grimm
2007-09-05 18:22 ` Nix
2007-09-05 18:54 ` Nicolas Pitre
2007-09-05 20:01 ` Junio C Hamano
2007-09-05 20:35 ` Nicolas Pitre
2007-09-05 21:14 ` Nix
2007-09-05 21:46 ` Junio C Hamano
2007-09-05 23:04 ` Nicolas Pitre
2007-09-05 23:42 ` Junio C Hamano
2007-09-06 0:27 ` Carlos Rica
2007-09-06 5:55 ` David Kastrup
2007-09-05 21:49 ` Junio C Hamano
2007-09-05 21:59 ` Invoke "git gc --auto" from commit, merge, am and rebase Junio C Hamano
2007-09-06 2:39 ` Shawn O. Pearce
2007-09-05 20:37 ` [PATCH] Invoke "git gc --auto" from "git add" and "git fetch" Junio C Hamano
[not found] ` <69b0c0350709051357ifa547aarfe3e0b36cf9be98f@mail.gmail.com>
2007-09-05 20:59 ` Fwd: " Govind Salinas
2007-09-06 12:02 ` Johannes Schindelin
2007-09-05 21:18 ` People unaware of the importance of "git gc"? Alex Riesen
2007-09-06 2:44 ` Russ Dill
2007-09-06 2:52 ` Shawn O. Pearce
2007-09-06 9:28 ` Andreas Ericsson
2007-09-06 2:45 ` Shawn O. Pearce
2007-09-06 2:49 ` Steven Grimm
2007-09-06 2:56 ` Shawn O. Pearce
2007-09-06 15:54 ` Johannes Schindelin
2007-09-06 17:49 ` Junio C Hamano
2007-09-06 18:15 ` Linus Torvalds
2007-09-06 18:29 ` Steven Grimm
2007-09-06 23:12 ` Subject: [PATCH] git-merge-pack Junio C Hamano
2007-09-06 23:35 ` Linus Torvalds
2007-09-07 0:51 ` Nicolas Pitre
2007-09-07 1:58 ` Junio C Hamano
2007-09-07 2:32 ` Nicolas Pitre
2007-09-07 4:07 ` Shawn O. Pearce
2007-09-07 4:43 ` Junio C Hamano
2007-09-08 9:50 ` Junio C Hamano [this message]
2007-09-08 10:01 ` [PATCH] pack-objects --repack-unpacked Junio C Hamano
2007-09-07 7:11 ` Subject: [PATCH] git-merge-pack Johannes Sixt
2007-09-07 7:34 ` Junio C Hamano
2007-09-07 7:24 ` Andy Parkins
2007-09-07 4:48 ` People unaware of the importance of "git gc"? Shawn O. Pearce
2007-09-07 10:12 ` Johannes Schindelin
2018-10-07 18:28 ` What's so special about objects/17/ ? Ævar Arnfjörð Bjarmason
2018-10-07 18:35 ` Johannes Sixt
2018-10-07 19:06 ` Ævar Arnfjörð Bjarmason
2018-10-07 22:39 ` Johannes Sixt
2018-10-08 0:54 ` Junio C Hamano
2018-10-07 19:46 ` Junio C Hamano
2018-10-07 20:07 ` Junio C Hamano
2018-10-08 19:17 ` Stefan Beller
2018-10-09 1:03 ` Junio C Hamano
2018-10-09 17:37 ` Stefan Beller
2018-10-10 1:10 ` Junio C Hamano
2018-10-10 19:08 ` Stefan Beller
2018-10-08 10:36 ` Ævar Arnfjörð Bjarmason
2018-10-09 1:07 ` Junio C Hamano
2018-10-09 17:40 ` Stefan Beller
2007-09-05 8:16 ` People unaware of the importance of "git gc"? David Kastrup
2007-09-05 16:47 ` Govind Salinas
2007-09-05 17:19 ` Carl Worth
2007-09-05 17:55 ` Jing Xue
2007-09-05 17:35 ` Steven Grimm
2007-09-05 18:28 ` Nix
2007-09-05 17:44 ` J. Bruce Fields
2007-09-05 18:46 ` Brandon Casey
2007-09-05 19:09 ` David Kastrup
2007-09-05 19:13 ` J. Bruce Fields
2007-09-05 19:43 ` David Kastrup
2007-09-05 19:20 ` Mike Hommey
2007-09-05 21:07 ` Alex Riesen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v4pi51o6p.fsf_-_@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=koreth@midwinter.com \
--cc=nico@cam.org \
--cc=nix@esperi.org.uk \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).