Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
sequencer.c: avoid empty statements at top level
author
Beat Bolli
<dev+git@drbeat.li>
Mon, 9 Jul 2018 19:25:35 +0000
(21:25 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 9 Jul 2018 21:37:03 +0000
(14:37 -0700)
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>
path.h
patch
|
blob
|
history
sequencer.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
8302f50
)
diff --git
a/path.h
b/path.h
index 1ccd0373c9db8460c7ad7a3f9c5465f84408fd56..fc9d3487a003a076f506706644b61df1abe3b90f 100644
(file)
--- a/
path.h
+++ b/
path.h
@@
-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.
*/
diff --git
a/sequencer.c
b/sequencer.c
index 4034c0461b5022dad01b25d824cdc4f47ee09d13..0e9b1d99c98f5a181cadcd601d5b17368aa60bea 100644
(file)
--- 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).
*/
* 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).
*/
/*
* 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.
/*
* The commit message that is planned to be used for any changes that
* need to be committed following a user interaction.