summaryrefslogtreecommitdiff
path: root/remote.h
diff options
context:
space:
mode:
authorJ Wyman <jwyman@microsoft.com>2017-11-07 16:31:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-08 01:18:23 (GMT)
commit9700fae5ee93dd0928cb82afb7b2fd49295e28d2 (patch)
tree388bac3ca43e4393b9b0dc5c3413b15e79f96377 /remote.h
parentcc72385fe350d4d7bc64f84e8817dbdfe27b04fe (diff)
downloadgit-9700fae5ee93dd0928cb82afb7b2fd49295e28d2.zip
git-9700fae5ee93dd0928cb82afb7b2fd49295e28d2.tar.gz
git-9700fae5ee93dd0928cb82afb7b2fd49295e28d2.tar.bz2
for-each-ref: let upstream/push report the remote ref name
There are times when scripts want to know not only the name of the push branch on the remote, but also the name of the branch as known by the remote repository. An example of this is when a tool wants to push to the very same branch from which it would pull automatically, i.e. the `<remote>` and the `<to>` in `git push <remote> <from>:<to>` would be provided by `%(upstream:remotename)` and `%(upstream:remoteref)`, respectively. This patch offers the new suffix :remoteref for the `upstream` and `push` atoms, allowing to show exactly that. Example: $ cat .git/config ... [remote "origin"] url = https://where.do.we.come/from fetch = refs/heads/*:refs/remote/origin/* [branch "master"] remote = origin merge = refs/heads/master [branch "develop/with/topics"] remote = origin merge = refs/heads/develop/with/topics ... $ git for-each-ref \ --format='%(push) %(push:remoteref)' \ refs/heads refs/remotes/origin/master refs/heads/master refs/remotes/origin/develop/with/topics refs/heads/develop/with/topics Signed-off-by: J Wyman <jwyman@microsoft.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'remote.h')
-rw-r--r--remote.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/remote.h b/remote.h
index 2ecf4c8..1f6611b 100644
--- a/remote.h
+++ b/remote.h
@@ -223,6 +223,8 @@ struct branch {
struct branch *branch_get(const char *name);
const char *remote_for_branch(struct branch *branch, int *explicit);
const char *pushremote_for_branch(struct branch *branch, int *explicit);
+const char *remote_ref_for_branch(struct branch *branch, int for_push,
+ int *explicit);
int branch_has_merge_config(struct branch *branch);
int branch_merge_matches(struct branch *, int n, const char *);