[PATCH] builtin-fetch.c (store_updated_refs): Honor update_local_ref() return value
From: Dmitry V. Levin <hidden>
Date: 2016-06-15 22:44:39
Subsystem:
the rest · Maintainer:
Linus Torvalds
Sync with builtin-fetch--tool.c where append_fetch_head() honors update_local_ref() return value. This fixes git-fetch exit status, http://bugzilla.altlinux.org/show_bug.cgi?id=15037 --- builtin-fetch.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin-fetch.c b/builtin-fetch.c
index 167f948..db60966 100644
--- a/builtin-fetch.c
+++ b/builtin-fetch.c@@ -292,7 +292,7 @@ static int store_updated_refs(const char *url, struct ref *ref_map) { FILE *fp; struct commit *commit; - int url_len, i, note_len, shown_url = 0; + int rc = 0, url_len, i, note_len, shown_url = 0; char note[1024]; const char *what, *kind; struct ref *rm;
@@ -359,7 +359,7 @@ static int store_updated_refs(const char *url, struct ref *ref_map) note); if (ref) - update_local_ref(ref, what, verbose, note); + rc |= update_local_ref(ref, what, verbose, note); else if (verbose) sprintf(note, "* %-*s %-*s -> FETCH_HEAD", SUMMARY_WIDTH, *kind ? kind : "branch",
@@ -376,7 +376,7 @@ static int store_updated_refs(const char *url, struct ref *ref_map) } } fclose(fp); - return 0; + return rc; } /*
--
ldv