Re: [PATCH v11 33/41] refs.c: pass the ref log message to _create/delete/update instead of _commit
flat view
From: Jonathan Nieder <hidden>
Date: 2016-06-15 23:01:26
Subsystem:
the rest · Maintainer:
Linus Torvalds
Ronnie Sahlberg wrote:
Change the reference transactions so that we pass the reflog message through to the create/delete/update function instead of the commit message. This allows for individual messages for each change in a multi ref transaction.
Nice. That reminds me: in the future, do we want to have some way to figure out what ref updates happened together? E.g., cvsnt introduced commit identifiers to answer a similar kind of question in CVS per-file history. If some backend wants to support that, the API this patch introduces would handle it fine --- good. [...]
quoted hunk ↗ jump to hunk
--- a/builtin/fetch.c +++ b/builtin/fetch.c@@ -673,10 +673,9 @@ static int store_updated_refs(const char *raw_url, const char *remote_name, } } } - if (rc & STORE_REF_ERROR_DF_CONFLICT) error(_("some local refs could not be updated; try running\n" - " 'git remote prune %s' to remove any old, conflicting " + "'git remote prune %s' to remove any old, conflicting " "branches"), remote_name);
Unrelated change snuck in? The rest of the patch is Reviewed-by: Jonathan Nieder <redacted>
diff --git a/builtin/fetch.c b/builtin/fetch.c
index faa1233..55f457c 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c@@ -673,9 +673,10 @@ static int store_updated_refs(const char *raw_url, const char *remote_name, } } } + if (rc & STORE_REF_ERROR_DF_CONFLICT) error(_("some local refs could not be updated; try running\n" - "'git remote prune %s' to remove any old, conflicting " + " 'git remote prune %s' to remove any old, conflicting " "branches"), remote_name); abort: