kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Beat Bolli 2018-07-09 21:25:35 +02:00 committed by Junio C Hamano
parent 8302f50e8c
commit 9ad36356dd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
path.h
View File

@ -147,7 +147,7 @@ extern void report_linked_checkout_garbage(void);
/* /*
* You can define a static memoized git path like: * 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. * or use one of the global ones below.
*/ */

4
sequencer.c
View File

@ -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. * The file to keep track of how many commands were already processed (e.g.
* for the prompt). * 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 * The file to keep track of how many commands are to be processed in total
* (e.g. for the prompt). * (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 * The commit message that is planned to be used for any changes that
* need to be committed following a user interaction. * need to be committed following a user interaction.