From: Junio C Hamano <gitster@pobox.com>
To: Ben Wijen <ben@wijen.net>
Cc: git@vger.kernel.org,
"Johannes Schindelin" <johannes.schindelin@gmx.de>,
"Pratik Karki" <predatoramigo@gmail.com>,
"Phillip Wood" <phillip.wood123@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Szeder Gábor" <szeder.dev@gmail.com>
Subject: Re: [PATCH v6 1/2] builtin/rebase.c: make sure the active branch isn't moved when autostashing
Date: Fri, 30 Aug 2019 13:15:11 -0700 [thread overview]
Message-ID: <xmqqsgpiwgts.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190830151607.4208-2-ben@wijen.net> (Ben Wijen's message of "Fri, 30 Aug 2019 17:16:05 +0200")
Ben Wijen <ben@wijen.net> writes:
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 670096c065..abcbfb8f01 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -1968,9 +1968,13 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
> state_dir_path("autostash", &options);
> struct child_process stash = CHILD_PROCESS_INIT;
> struct object_id oid;
> + struct object_id head_oid;
> + if (get_oid("HEAD", &head_oid)) {
> + die(_("could not determine HEAD revision"));
> + }
Pointless {} pair around a single statement.
> +
> struct commit *head =
> - lookup_commit_reference(the_repository,
> - &options.orig_head);
> + lookup_commit_reference(the_repository, &head_oid);
This introduces decl-after-statement error, doesn't it?
Perhaps like so...
diff --git a/builtin/rebase.c b/builtin/rebase.c
index abcbfb8f01..0a2f9273ee 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1969,12 +1969,11 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
struct child_process stash = CHILD_PROCESS_INIT;
struct object_id oid;
struct object_id head_oid;
- if (get_oid("HEAD", &head_oid)) {
- die(_("could not determine HEAD revision"));
- }
+ struct commit *head;
- struct commit *head =
- lookup_commit_reference(the_repository, &head_oid);
+ if (get_oid("HEAD", &head_oid))
+ die(_("could not determine HEAD revision"));
+ head = lookup_commit_reference(the_repository, &head_oid);
argv_array_pushl(&stash.args,
"stash", "create", "autostash", NULL);
next prev parent reply other threads:[~2019-08-30 20:15 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-18 9:53 [PATCH 0/2] git rebase: Make sure upstream branch is left alone Ben Wijen
2019-08-18 9:53 ` [PATCH 1/2] t3420: never change upstream branch Ben Wijen
2019-08-19 21:55 ` Junio C Hamano
2019-08-20 8:58 ` Phillip Wood
2019-08-18 9:53 ` [PATCH 2/2] rebase.c: make sure current branch isn't moved when autostashing Ben Wijen
2019-08-20 9:00 ` Phillip Wood
2019-08-20 19:53 ` Ben
2019-08-20 20:12 ` [PATCH v2 0/1] git rebase: Make sure upstream branch is left alone Ben Wijen
2019-08-20 20:12 ` [PATCH v2 1/1] rebase.c: make sure current branch isn't moved when autostashing Ben Wijen
2019-08-20 20:24 ` Eric Sunshine
2019-08-20 20:58 ` Junio C Hamano
2019-08-21 18:29 ` [PATCH v3 0/1] rebase.c: make sure the active " Ben Wijen
2019-08-21 18:29 ` [PATCH v3 1/1] " Ben Wijen
2019-08-22 12:27 ` Johannes Schindelin
2019-08-22 15:49 ` Junio C Hamano
2019-08-26 16:45 ` [PATCH v4 " Ben Wijen
2019-08-26 16:45 ` Ben Wijen
2019-08-26 17:10 ` SZEDER Gábor
2019-08-28 12:56 ` Johannes Schindelin
2019-08-28 15:34 ` Junio C Hamano
2019-08-28 16:03 ` Junio C Hamano
2019-08-29 16:47 ` [PATCH v5 0/2] rebase.c: make sure current " Ben Wijen
2019-08-29 16:47 ` [PATCH v5 1/2] builtin/rebase.c: make sure the active " Ben Wijen
2019-08-29 16:47 ` [PATCH v5 2/2] builtin/rebase.c: Remove pointless message Ben Wijen
2019-08-30 15:16 ` [PATCH v6 0/2] rebase.c: make sure current branch isn't moved when autostashing Ben Wijen
2019-08-30 15:16 ` [PATCH v6 1/2] builtin/rebase.c: make sure the active " Ben Wijen
2019-08-30 20:15 ` Junio C Hamano [this message]
2019-08-31 7:17 ` Ben
2019-09-01 16:01 ` Junio C Hamano
2019-09-01 16:27 ` Ben
2019-09-02 17:33 ` Junio C Hamano
2019-08-30 15:16 ` [PATCH v6 2/2] builtin/rebase.c: Remove pointless message Ben Wijen
2019-08-30 20:16 ` Junio C Hamano
2019-08-31 7:17 ` Ben
2019-08-30 15:16 ` [PATCH " Ben Wijen
2019-08-19 9:26 ` [PATCH 0/2] git rebase: Make sure upstream branch is left alone Phillip Wood
2019-08-19 15:33 ` Ben
2019-08-19 18:21 ` Junio C Hamano
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=xmqqsgpiwgts.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=ben@wijen.net \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=phillip.wood123@gmail.com \
--cc=predatoramigo@gmail.com \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@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).