From: "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Phillip Wood <phillip.wood@dunelm.org.uk>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: [PATCH 3/5] reset_head(): mark oid parameter as const
Date: Wed, 08 Sep 2021 13:41:10 +0000 [thread overview]
Message-ID: <614555fc10f336cc6f7681501247209aac879269.1631108472.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1034.git.1631108472.gitgitgadget@gmail.com>
From: Phillip Wood <phillip.wood@dunelm.org.uk>
We do not write to oid so mark it as const in preparation for the next
commit.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
reset.c | 4 ++--
reset.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/reset.c b/reset.c
index 4bea758053b..5b578d6bb68 100644
--- a/reset.c
+++ b/reset.c
@@ -8,8 +8,8 @@
#include "tree.h"
#include "unpack-trees.h"
-int reset_head(struct repository *r, struct object_id *oid, const char *action,
- const char *switch_to_branch, unsigned flags,
+int reset_head(struct repository *r, const struct object_id *oid,
+ const char *action, const char *switch_to_branch, unsigned flags,
const char *reflog_orig_head, const char *reflog_head,
const char *default_reflog_action)
{
diff --git a/reset.h b/reset.h
index 12f83c78e28..6d2be511b8c 100644
--- a/reset.h
+++ b/reset.h
@@ -12,8 +12,8 @@
#define RESET_HEAD_REFS_ONLY (1<<3)
#define RESET_ORIG_HEAD (1<<4)
-int reset_head(struct repository *r, struct object_id *oid, const char *action,
- const char *switch_to_branch, unsigned flags,
+int reset_head(struct repository *r, const struct object_id *oid,
+ const char *action, const char *switch_to_branch, unsigned flags,
const char *reflog_orig_head, const char *reflog_head,
const char *default_reflog_action);
--
gitgitgadget
next prev parent reply other threads:[~2021-09-08 13:41 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-08 13:41 [PATCH 0/5] rebase -i: a couple of small improvements Phillip Wood via GitGitGadget
2021-09-08 13:41 ` [PATCH 1/5] sequencer.c: factor out a function Phillip Wood via GitGitGadget
2021-09-08 17:51 ` Eric Sunshine
2021-09-09 10:10 ` Phillip Wood
2021-09-09 10:44 ` Johannes Schindelin
2021-09-08 13:41 ` [PATCH 2/5] rebase: fix todo-list rereading Phillip Wood via GitGitGadget
2021-09-09 10:48 ` Johannes Schindelin
2021-09-08 13:41 ` Phillip Wood via GitGitGadget [this message]
2021-09-08 13:41 ` [PATCH 4/5] rebase -i: don't fork git checkout Phillip Wood via GitGitGadget
2021-09-08 18:14 ` Philippe Blain
2021-09-09 10:09 ` Phillip Wood
2021-09-09 12:40 ` Philippe Blain
2021-09-09 13:57 ` Phillip Wood
2021-09-09 15:01 ` Elijah Newren
2021-09-10 12:07 ` Philippe Blain
2021-09-15 15:44 ` Phillip Wood
2021-09-09 10:53 ` Johannes Schindelin
2021-09-09 12:44 ` Philippe Blain
2021-09-09 21:43 ` Johannes Schindelin
2021-09-10 10:46 ` Johannes Schindelin
2021-09-10 11:58 ` Philippe Blain
2021-09-09 15:03 ` Elijah Newren
2021-09-08 13:41 ` [PATCH 5/5] rebase: remove unused parameter Phillip Wood via GitGitGadget
2021-09-09 10:54 ` Johannes Schindelin
2021-09-09 14:04 ` Phillip Wood
2021-09-23 15:26 ` [PATCH v2 0/2] rebase -i: a couple of small improvements Phillip Wood via GitGitGadget
2021-09-23 15:26 ` [PATCH v2 1/2] sequencer.c: factor out a function Phillip Wood via GitGitGadget
2021-09-23 15:26 ` [PATCH v2 2/2] rebase: fix todo-list rereading Phillip Wood via GitGitGadget
2021-09-24 16:13 ` Junio C Hamano
2021-09-28 10:20 ` Phillip Wood
2021-09-24 19:24 ` [PATCH v2 0/2] rebase -i: a couple of small improvements 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=614555fc10f336cc6f7681501247209aac879269.1631108472.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood@dunelm.org.uk \
/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.
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 NNTP newsgroup(s).