Thread (38 messages) flat view 38 messages, 5 authors, 2016-06-15

Re: [PATCH 12/13] Build in merge

From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:44:50

Hi,

On Fri, 27 Jun 2008, Miklos Vajna wrote:
quoted hunk ↗ jump to hunk
diff --git a/builtin-merge.c b/builtin-merge.c
index cc04d01..77de9e8 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -836,9 +836,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 		/* Again the most common case of merging one remote. */
 		struct strbuf msg;
 		struct object *o;
+		char hex[41];
+
+		memcpy(hex, find_unique_abbrev(head, DEFAULT_ABBREV), 41);
Maybe strcpy(hex, find_unique_abbrev(head, DEFAULT_ABBREV)) would be more 
intuitive?

Ciao,
Dscho
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help