commit: Let the callback of for_each_mergetag return on error

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index c4272fbc96dc274f3287ab01f3fbe57c2cdb9d9c..4b68a28e92e726b4d16c4d3a0a339feb1aeacaee 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -7,7 +7,7 @@
 #include "pkt-line.h"
 #include "sideband.h"
 #include "run-command.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "commit.h"
 #include "object.h"
 #include "remote.h"