threads / patch / 42753

patchbuiltin/apply: include declaration of cmd_apply()

Subject: [PATCH] builtin/apply: include declaration of cmd_apply()

## tl;dr

2 messages between Jun 30, 2016 and Jun 30, 2016. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Ramsay Jones· Jun 30, 2016, 01:47 UTC · lore

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---

Hi Christian,

If you need to re-roll your 'cc/apply-am' branch, could you please squash this into the relevant patch. Commit 95a3b0ba ("apply: move libified code from builtin/apply.c to apply.{c,h}", 22-04-2016) removed this '#include "builtin.h"' line, which causes sparse to issue a warning.

Thanks!

ATB, Ramsay Jones

 builtin/apply.c | 1 +
 1 file changed, 1 insertion(+)

Show changes to builtin/apply.c +1 −0

diff --git a/builtin/apply.c b/builtin/apply.c
index 066cb29..9c66474 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "builtin.h"
 #include "parse-options.h"
 #include "lockfile.h"
 #include "apply.h"

-- 
2.9.0

Christian Couder· Jun 30, 2016, 09:45 UTC · re: Ramsay Jones · lore

Re: [PATCH] builtin/apply: include declaration of cmd_apply()

Hi Ramsay,

On Thu, Jun 30, 2016 at 3:47 AM, Ramsay Jones <ramsay@ramsayjones.plus.com> wrote:

Show 8 quoted lines

>
> Hi Christian,
>
> If you need to re-roll your 'cc/apply-am' branch, could you please
> squash this into the relevant patch. Commit 95a3b0ba ("apply: move
> libified code from builtin/apply.c to apply.{c,h}", 22-04-2016)
> removed this '#include "builtin.h"' line, which causes sparse to
> issue a warning.

Ok, I will squash this.

Thanks, Christian.