From: Joel Teichroeb <joel@teichroeb.net>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
t.gummerer@gmail.com, Jeff King <peff@peff.net>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH v3 4/4] stash: implement builtin stash
Date: Sun, 28 May 2017 11:31:48 -0700 [thread overview]
Message-ID: <CA+CzEk8Xx4nh=Bh533DR=Xo_BjQsxAoYNbx3=O=rtWr8+v4xsQ@mail.gmail.com> (raw)
In-Reply-To: <CACBZZX5cxkV4C42OwJ077b1XMHCk+uTCbdHV9Ez5EVStR4DWxg@mail.gmail.com>
On Sun, May 28, 2017 at 11:26 AM, Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
> On Sun, May 28, 2017 at 6:56 PM, Joel Teichroeb <joel@teichroeb.net> wrote:
>> Implement all git stash functionality as a builtin command
>
> First thanks for working on this, it's great. Applied it locally,
> passes all tests for me. A couple of comments Christian didn't cover
>
>> + info->has_u = get_sha1_with_context(u_commit_rev.buf, 0, info->u_commit.hash, &unused) == 0 &&
>> + get_sha1_with_context(u_tree_rev.buf, 0, info->u_tree.hash, &unused) == 0;
>> +
>> +
>> + /* TODO: Improve this logic */
>> + strbuf_addf(&symbolic, "%s", REV);
>> + str = strstr(symbolic.buf, "@");
>
> Could you elaborate on how this should be improved?
>
I just figured there would be a builtin function that could help here,
but hadn't had the chance to look into it. It's something easy to do
in bash, but more complicated in C.
>
>> +static int patch_working_tree(struct stash_info *info, const char *prefix,
>> + const char **argv)
>> +{
>> + const char *stash_index_path = ".git/foocache2";
>
> This foocache path isn't created by the shell code, if it's a new
> thing that's needed (and I haven't followed this code in detail, don'n
> know what it's for) shouldn't we give it a more descriptive name so
> that if git crashes it's obvious what it is?
>
Opps, I had cleaned that part up locally, but I forgot to push it when
switching computers. It'll be better in the next patch set.
>> + const char *message = NULL;
>> + const char *commit = NULL;
>> + struct object_id obj;
>> + struct option options[] = {
>> + OPT_STRING('m', "message", &message, N_("message"),
>> + N_("stash commit message")),
>> + OPT__QUIET(&quiet, N_("be quiet, only report errors")),
>> + OPT_END()
>> + };
>> + argc = parse_options(argc, argv, prefix, options,
>> + git_stash_store_usage, 0);
>
> Nit: In general in this patch the 2nd line of parse_options doesn't
> align with a tabwidth of 8. Ditto for indenting function arguments
> (e.g. for untracked_files).
I'll fix my tab width. Forgot that long lines would change, haha.
next prev parent reply other threads:[~2017-05-28 18:32 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-28 16:56 [PATCH v3 0/4] Implement git stash as a builtin command Joel Teichroeb
2017-05-28 16:56 ` [PATCH v3 1/4] stash: add test for stash create with no files Joel Teichroeb
2017-05-28 17:45 ` Ævar Arnfjörð Bjarmason
2017-05-29 6:35 ` Junio C Hamano
2017-05-28 16:56 ` [PATCH v3 2/4] stash: add test for stashing in a detached state Joel Teichroeb
2017-05-28 17:57 ` Ævar Arnfjörð Bjarmason
2017-05-29 6:41 ` Junio C Hamano
2017-05-28 16:56 ` [PATCH v3 3/4] close the index lock when not writing the new index Joel Teichroeb
2017-05-28 17:46 ` Ævar Arnfjörð Bjarmason
2017-05-29 6:46 ` Junio C Hamano
2017-05-28 16:56 ` [PATCH v3 4/4] stash: implement builtin stash Joel Teichroeb
2017-05-28 17:56 ` Christian Couder
2017-05-28 18:26 ` Ævar Arnfjörð Bjarmason
2017-05-28 18:31 ` Joel Teichroeb [this message]
2017-05-28 19:26 ` Jeff King
2017-05-28 18:51 ` Ævar Arnfjörð Bjarmason
2017-05-28 19:21 ` Jeff King
2017-05-29 18:18 ` Joel Teichroeb
2017-05-29 18:26 ` Ævar Arnfjörð Bjarmason
2017-06-01 3:29 ` Joel Teichroeb
2017-06-01 4:07 ` Jeff King
2017-05-29 7:16 ` Junio C Hamano
2017-05-28 19:08 ` [PATCH v3 0/4] Implement git stash as a builtin command Ævar Arnfjörð Bjarmason
2017-10-23 11:09 ` Johannes Schindelin
2017-10-23 18:35 ` Joel Teichroeb
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='CA+CzEk8Xx4nh=Bh533DR=Xo_BjQsxAoYNbx3=O=rtWr8+v4xsQ@mail.gmail.com' \
--to=joel@teichroeb.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=t.gummerer@gmail.com \
/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).