Signed-off-by: Christian Couder <chriscool@xxxxxxxxxxxxx>
---
builtin/revert.c | 7 ++++++-
pick.c | 12 ++++--------
pick.h | 2 +-
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index 3308de1..764cd41 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -193,6 +193,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
struct strbuf msgbuf;
char *reencoded_message = NULL;
const char *encoding;
+ struct commit *parent = NULL;
int failed;
git_config(git_default_config, NULL);
@@ -217,7 +218,11 @@ static int revert_or_cherry_pick(int argc, const char **argv)
git_commit_encoding, encoding)))
commit->buffer = reencoded_message;
- failed = pick_commit(commit, mainline, flags, &msgbuf);
+ failed = check_parent(commit, mainline, flags, &parent);
+ if (failed)
+ return failed;
+
+ failed = pick_commit(commit, parent, flags, &msgbuf);
if (failed < 0) {
exit(1);
} else if (failed > 0) {
diff --git a/pick.c b/pick.c
index 078b78d..d603c5b 100644
--- a/pick.c
+++ b/pick.c
@@ -60,7 +60,7 @@ static struct tree *empty_tree(void)
}
int check_parent(struct commit *commit, int mainline, int flags,
- struct commit **parent)
+ struct commit **parent)
{
if (!commit->parents) {
if (flags & PICK_REVERSE)
@@ -110,12 +110,12 @@ int check_parent(struct commit *commit, int mainline, int flags,
* and a positive value after picking,
* and return 1 if and only if a conflict occurs but no other error.
*/
-int pick_commit(struct commit *pick_commit, int mainline, int flags,
+int pick_commit(struct commit *pick_commit, struct commit *parent, int flags,
struct strbuf *msg)
{
unsigned char head[20];
- struct commit *base, *next, *parent = NULL;
- int i, index_fd, clean, err;
+ struct commit *base, *next;
+ int i, index_fd, clean;
int ret = 0;
char *oneline;
const char *message;
@@ -139,10 +139,6 @@ int pick_commit(struct commit *pick_commit, int mainline, int flags,
return error("Unable to create locked index: %s",
strerror(errno));
- err = check_parent(commit, mainline, flags, &parent);
- if (err)
- return err;
-
if (!(message = commit->buffer))
return error("Cannot get commit message for %s",
sha1_to_hex(commit->object.sha1));
diff --git a/pick.h b/pick.h
index 39af1de..098f765 100644
--- a/pick.h
+++ b/pick.h
@@ -8,7 +8,7 @@
#define PICK_ADD_NOTE 2 /* add note about original commit (unless conflict) */
/* We don't need a PICK_QUIET. This is done by
* setenv("GIT_MERGE_VERBOSITY", "0", 1); */
-extern int pick_commit(struct commit *commit, int mainline, int flags, struct strbuf *msg);
+extern int pick_commit(struct commit *commit, struct commit *parent, int flags, struct strbuf *msg);
extern int check_parent(struct commit *commit, int mainline, int flags, struct commit **parent);
#endif
--
1.7.0.321.g2d270
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html