Changeset 782 for git/branches/dmik/contrib/examples/builtin-fetch--tool.c

Timestamp:

Jun 23, 2014, 9:45:51 PM (11 years ago)

Author:

dmik

Message:

git: Merge version 2.0.0 from vendor to dmik branch.

Location:

git/branches/dmik

Files:

• . (modified) (1 prop)
• contrib/examples/builtin-fetch--tool.c (modified) (3 diffs)

git/branches/dmik/contrib/examples/builtin-fetch--tool.c ¶

@@ -97 +97 @@
         strcpy(newh, find_unique_abbrev(sha1_new, DEFAULT_ABBREV));
 
-        if (in_merge_bases(current, &updated, 1)) {
+        if (in_merge_bases(current, updated)) {
                 fprintf(stderr, "* %s: fast-forward to %s\n",
                         name, note);
@@ -519 +519 @@
                 fp = fopen(filename, "a");
                 if (!fp)
-                        return error("cannot open %s: %s\n", filename, strerror(errno));
+                        return error("cannot open %s: %s", filename, strerror(errno));
                 result = append_fetch_head(fp, argv[2], argv[3],
                                            argv[4], argv[5],
@@ -537 +537 @@
                 fp = fopen(filename, "a");
                 if (!fp)
-                        return error("cannot open %s: %s\n", filename, strerror(errno));
+                        return error("cannot open %s: %s", filename, strerror(errno));
                 result = fetch_native_store(fp, argv[2], argv[3], argv[4],
                                             verbose, force);