diff options
| author | Beat Bolli <dev+git@drbeat.li> | 2018-07-09 21:25:35 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-09 14:37:03 -0700 |
| commit | 9ad36356dd13b53667a51020c9aef0d4e014af01 (patch) | |
| tree | 563925bc4355ec14557fdb5aac69c66e229d9bab | |
| parent | 8302f50e8ce687fbb09d8639ef87c0d35fd671b9 (diff) | |
| download | git-9ad36356dd13b53667a51020c9aef0d4e014af01.tar.gz git-9ad36356dd13b53667a51020c9aef0d4e014af01.tar.xz | |
sequencer.c: avoid empty statements at top level
The macro GIT_PATH_FUNC expands to a function definition that ends with
a closing brace. Remove two extra semicolons.
While at it, fix the example in path.h.
Signed-off-by: Beat Bolli <dev+git@drbeat.li>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | path.h | 2 | ||||
| -rw-r--r-- | sequencer.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -147,7 +147,7 @@ extern void report_linked_checkout_garbage(void); /* * You can define a static memoized git path like: * - * static GIT_PATH_FUNC(git_path_foo, "FOO"); + * static GIT_PATH_FUNC(git_path_foo, "FOO") * * or use one of the global ones below. */ diff --git a/sequencer.c b/sequencer.c index 4034c0461..0e9b1d99c 100644 --- a/sequencer.c +++ b/sequencer.c @@ -61,12 +61,12 @@ static GIT_PATH_FUNC(rebase_path_done, "rebase-merge/done") * The file to keep track of how many commands were already processed (e.g. * for the prompt). */ -static GIT_PATH_FUNC(rebase_path_msgnum, "rebase-merge/msgnum"); +static GIT_PATH_FUNC(rebase_path_msgnum, "rebase-merge/msgnum") /* * The file to keep track of how many commands are to be processed in total * (e.g. for the prompt). */ -static GIT_PATH_FUNC(rebase_path_msgtotal, "rebase-merge/end"); +static GIT_PATH_FUNC(rebase_path_msgtotal, "rebase-merge/end") /* * The commit message that is planned to be used for any changes that * need to be committed following a user interaction. |