From: Johannes Schindelin <Johannes.Schindelin@gmx.de> To: Emily Shaffer <emilyshaffer@google.com> Cc: git@vger.kernel.org Subject: Re: [PATCH v3 9/9] bugreport: print contents of alternates file Date: Mon, 28 Oct 2019 16:57:01 +0100 (CET) Message-ID: <nycvar.QRO.7.76.6.1910281655420.46@tvgsbejvaqbjf.bet> (raw) In-Reply-To: <20191025025129.250049-10-emilyshaffer@google.com> Hi Emily, On Thu, 24 Oct 2019, Emily Shaffer wrote: > In some cases, it could be that the user is having a problem with an > object which isn't present in their normal object directory. We can get > a hint that that might be the case by examining the list of alternates > where their object may be stored instead. Doesn't this open the possibility of leaking project's (possibly NDA'ed) names? I could imagine that we might rather want to count the alternates, and maybe separate into those alternates that actually exist and alternates that do not exist (which would produce a warning that the user might have trained themselves to ignore). Ciao, Dscho > > Signed-off-by: Emily Shaffer <emilyshaffer@google.com> > --- > bugreport.c | 14 ++++++++++++++ > bugreport.h | 6 ++++++ > builtin/bugreport.c | 4 ++++ > 3 files changed, 24 insertions(+) > > diff --git a/bugreport.c b/bugreport.c > index ce15904fec..a7bdc72b7f 100644 > --- a/bugreport.c > +++ b/bugreport.c > @@ -298,3 +298,17 @@ void get_object_info_summary(struct strbuf *obj_info) > strbuf_complete_line(obj_info); > } > } > + > +void get_alternates_file(struct strbuf *alternates_info) > +{ > + struct strbuf alternates_path = STRBUF_INIT; > + > + strbuf_addstr(&alternates_path, get_object_directory()); > + strbuf_complete(&alternates_path, '/'); > + strbuf_addstr(&alternates_path, "info/alternates"); > + > + strbuf_reset(alternates_info); > + strbuf_addbuf(alternates_info, &alternates_path); > + strbuf_complete_line(alternates_info); > + strbuf_read_file(alternates_info, alternates_path.buf, 0); > +} > diff --git a/bugreport.h b/bugreport.h > index 4f5e2d1b9a..74d1f79960 100644 > --- a/bugreport.h > +++ b/bugreport.h > @@ -36,3 +36,9 @@ void get_packed_object_summary(struct strbuf *obj_info); > * previous contents of hook_info will be discarded. > */ > void get_object_info_summary(struct strbuf *obj_info); > + > +/** > + * Adds the contents of '.git/info/alternates'. The previous contents of > + * alternates_info will be discarded. > + */ > +void get_alternates_file(struct strbuf *alt_info); > diff --git a/builtin/bugreport.c b/builtin/bugreport.c > index 8aad33a9b0..0784bdc42a 100644 > --- a/builtin/bugreport.c > +++ b/builtin/bugreport.c > @@ -76,6 +76,10 @@ int cmd_bugreport(int argc, const char **argv, const char *prefix) > get_object_info_summary(&buffer); > strbuf_write(&buffer, report); > > + add_header(report, "Alternates File"); > + get_alternates_file(&buffer); > + strbuf_write(&buffer, report); > + > // Close file > // open file in editor > launch_editor(report_path, NULL, NULL); > -- > 2.24.0.rc0.303.g954a862665-goog > >
next prev parent reply index Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-17 0:39 [PATCH v2 0/2] add git-bugreport tool Emily Shaffer 2019-08-17 0:39 ` [PATCH v2 1/2] bugreport: add tool to generate debugging info Emily Shaffer 2019-10-25 2:51 ` [PATCH v3 0/9] add git-bugreport tool Emily Shaffer 2019-10-25 2:51 ` [PATCH v3 1/9] bugreport: add tool to generate debugging info Emily Shaffer 2019-10-29 20:29 ` Josh Steadmon 2019-11-16 3:11 ` Junio C Hamano 2019-11-19 20:25 ` Emily Shaffer 2019-11-19 23:24 ` Johannes Schindelin 2019-11-20 0:37 ` Junio C Hamano 2019-11-20 10:51 ` Johannes Schindelin 2019-11-19 23:31 ` Johannes Schindelin 2019-11-20 0:39 ` Junio C Hamano 2019-11-20 2:09 ` Emily Shaffer 2019-11-20 0:32 ` Junio C Hamano 2019-10-25 2:51 ` [PATCH v3 2/9] bugreport: generate config whitelist based on docs Emily Shaffer 2019-10-28 13:27 ` Johannes Schindelin 2019-10-25 2:51 ` [PATCH v3 3/9] bugreport: add version and system information Emily Shaffer 2019-10-28 13:49 ` Johannes Schindelin 2019-11-08 21:48 ` Emily Shaffer 2019-11-11 13:48 ` Johannes Schindelin 2019-11-14 21:42 ` Emily Shaffer 2019-10-29 20:43 ` Josh Steadmon 2019-10-25 2:51 ` [PATCH v3 4/9] bugreport: add config values from whitelist Emily Shaffer 2019-10-28 14:14 ` Johannes Schindelin 2019-12-11 20:48 ` Emily Shaffer 2019-12-15 17:30 ` Johannes Schindelin 2019-10-29 20:58 ` Josh Steadmon 2019-10-30 1:37 ` Junio C Hamano 2019-11-14 21:55 ` Emily Shaffer 2019-10-25 2:51 ` [PATCH v3 5/9] bugreport: collect list of populated hooks Emily Shaffer 2019-10-28 14:31 ` Johannes Schindelin 2019-12-11 20:51 ` Emily Shaffer 2019-12-15 17:40 ` Johannes Schindelin 2019-10-25 2:51 ` [PATCH v3 6/9] bugreport: count loose objects Emily Shaffer 2019-10-28 15:07 ` Johannes Schindelin 2019-12-10 22:34 ` Emily Shaffer 2019-10-29 21:18 ` Josh Steadmon 2019-10-25 2:51 ` [PATCH v3 7/9] bugreport: add packed object summary Emily Shaffer 2019-10-28 15:43 ` Johannes Schindelin 2019-12-11 0:29 ` Emily Shaffer 2019-12-11 13:37 ` Johannes Schindelin 2019-12-11 20:52 ` Emily Shaffer 2019-10-25 2:51 ` [PATCH v3 8/9] bugreport: list contents of $OBJDIR/info Emily Shaffer 2019-10-28 15:51 ` Johannes Schindelin 2019-10-25 2:51 ` [PATCH v3 9/9] bugreport: print contents of alternates file Emily Shaffer 2019-10-28 15:57 ` Johannes Schindelin [this message] 2019-11-19 20:40 ` Emily Shaffer 2019-10-29 1:54 ` [PATCH v3 0/9] add git-bugreport tool Junio C Hamano 2019-10-29 11:13 ` Johannes Schindelin -- strict thread matches above, loose matches on Subject: below -- 2019-08-17 0:39 [PATCH v2 2/2] bugreport: generate config whitelist based on docs Emily Shaffer 2019-08-17 20:38 ` Martin Ågren 2019-08-21 17:40 ` Emily Shaffer 2019-08-15 2:34 [PATCH] bugreport: add tool to generate debugging info Emily Shaffer 2019-08-15 14:15 ` Derrick Stolee 2019-08-15 14:36 ` Junio C Hamano 2019-08-15 22:52 ` Emily Shaffer 2019-08-15 23:40 ` Junio C Hamano 2019-08-16 1:25 ` Emily Shaffer 2019-08-16 16:41 ` Junio C Hamano 2019-08-16 19:08 ` Emily Shaffer 2019-08-15 20:07 ` Johannes Schindelin 2019-08-15 22:24 ` Emily Shaffer 2019-08-16 20:19 ` Johannes Schindelin 2019-08-15 20:13 ` Emily Shaffer 2019-08-15 18:10 ` Junio C Hamano 2019-08-15 21:52 ` Emily Shaffer 2019-08-15 22:29 ` Junio C Hamano 2019-08-15 22:54 ` Emily Shaffer
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 * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=nycvar.QRO.7.76.6.1910281655420.46@tvgsbejvaqbjf.bet \ --to=johannes.schindelin@gmx.de \ --cc=emilyshaffer@google.com \ --cc=git@vger.kernel.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
Git Mailing List Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/git/0 git/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 git git/ https://lore.kernel.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git