Jeff King 979cb245e2 remote.c: return upstream name from stat_tracking_info ... After calling stat_tracking_info, callers often want to print the name of the upstream branch (in addition to the tracking count). To do this, they have to access branch->merge->dst[0] themselves. This is not wrong, as the return value from stat_tracking_info tells us whether we have an upstream branch or not. But it is a bit leaky, as we make an assumption about how it calculated the upstream name. Instead, let's add an out-parameter that lets the caller know the upstream name we found. As a bonus, we can get rid of the unusual tri-state return from the function. We no longer need to use it to differentiate between "no tracking config" and "tracking ref does not exist" (since you can check the upstream_name for that), so we can just use the usual 0/-1 convention for success/error. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2015-05-22 09:32:34 -07:00
..
add.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
annotate.c
apply.c	Merge branch 'jc/apply-beyond-symlink' into maint	2015-03-13 22:56:02 -07:00
archive.c
bisect--helper.c
blame.c	Merge branch 'es/blame-commit-info-fix' into maint	2015-03-05 13:13:12 -08:00
branch.c	remote.c: return upstream name from stat_tracking_info	2015-05-22 09:32:34 -07:00
bundle.c
cat-file.c	Merge branch 'ah/usage-strings'	2015-02-11 13:44:20 -08:00
check-attr.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
check-ignore.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
check-mailmap.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
check-ref-format.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
checkout-index.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
checkout.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
clean.c	Merge branch 'ja/clean-confirm-i18n'	2015-03-06 15:02:30 -08:00
clone.c	Merge branch 'jk/cleanup-failed-clone'	2015-03-25 12:54:24 -07:00
column.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
commit-tree.c	commit-tree: simplify parsing of option -S using skip_prefix()	2014-12-29 09:32:45 -08:00
commit.c	Merge branch 'mh/refs-have-new'	2015-03-05 12:45:39 -08:00
config.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
count-objects.c	count-objects: use for_each_loose_file_in_objdir	2014-10-16 10:10:41 -07:00
credential.c
describe.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
diff-files.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
diff-index.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
diff-tree.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
diff.c	lockfile.h: extract new header file for the functions in lockfile.c	2014-10-01 13:56:14 -07:00
fast-export.c
fetch-pack.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
fetch.c	Merge branch 'mh/refs-have-new'	2015-03-05 12:45:39 -08:00
fmt-merge-msg.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
for-each-ref.c	remote.c: return upstream name from stat_tracking_info	2015-05-22 09:32:34 -07:00
fsck.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
gc.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
get-tar-commit-id.c	use skip_prefix() to avoid more magic numbers	2014-10-07 11:09:16 -07:00
grep.c	Merge branch 'ws/grep-quiet-no-pager'	2015-03-25 12:54:20 -07:00
hash-object.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
help.c	Merge branch 'sb/leaks'	2015-03-20 13:11:53 -07:00
index-pack.c	Merge branch 'rs/deflate-init-cleanup'	2015-03-17 16:01:26 -07:00
init-db.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
interpret-trailers.c	trailer: add interpret-trailers command	2014-10-13 13:55:27 -07:00
log.c	remote.c: report specific errors from branch_get_upstream	2015-05-21 11:07:46 -07:00
ls-files.c	Merge branch 'jc/report-path-error-to-dir'	2015-03-26 11:57:13 -07:00
ls-remote.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
ls-tree.c	ls-tree: disable negative pathspec because it's not supported	2014-12-01 11:33:45 -08:00
mailinfo.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
mailsplit.c	mailsplit: remove unnecessary unlink(2) call	2014-10-07 10:49:57 -07:00
merge-base.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
merge-file.c	Merge branch 'ab/merge-file-prefix'	2015-02-22 12:28:25 -08:00
merge-index.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
merge-ours.c
merge-recursive.c
merge-tree.c
merge.c	remote.c: drop "remote" pointer from "struct branch"	2015-05-21 10:48:10 -07:00
mktag.c
mktree.c
mv.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
name-rev.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
notes.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
pack-objects.c	Merge branch 'rs/deflate-init-cleanup'	2015-03-17 16:01:26 -07:00
pack-redundant.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
pack-refs.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
patch-id.c
prune-packed.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
prune.c	prune: turn on ref_paranoia flag	2015-03-20 12:40:56 -07:00
push.c	push: allow --follow-tags to be set by config push.followTags	2015-03-14 15:08:35 -07:00
read-tree.c	lockfile.h: extract new header file for the functions in lockfile.c	2014-10-01 13:56:14 -07:00
receive-pack.c	ref_transaction_delete(): remove "have_old" parameter	2015-02-17 11:23:48 -08:00
reflog.c	reflog: improve and update documentation	2015-03-05 12:35:36 -08:00
remote-ext.c	use skip_prefix() to avoid more magic numbers	2014-10-07 11:09:16 -07:00
remote-fd.c
remote.c	Merge branch 'ah/usage-strings'	2015-02-11 13:44:20 -08:00
repack.c	Merge branch 'jk/prune-with-corrupt-refs'	2015-03-25 12:54:26 -07:00
replace.c	ref_transaction_update(): remove "have_old" parameter	2015-02-17 11:22:50 -08:00
rerere.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
reset.c	lockfile.h: extract new header file for the functions in lockfile.c	2014-10-01 13:56:14 -07:00
rev-list.c
rev-parse.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
revert.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
rm.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
send-pack.c	send-pack.c: add --atomic command line argument	2015-01-07 19:56:44 -08:00
shortlog.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
show-branch.c	Merge branch 'ah/usage-strings'	2015-02-11 13:44:20 -08:00
show-ref.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
stripspace.c
symbolic-ref.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
tag.c	Merge branch 'jk/tag-h-column-is-a-listing-option'	2015-03-23 11:28:02 -07:00
unpack-file.c
unpack-objects.c	index-pack: terminate object buffers with NUL	2014-12-09 11:56:37 -08:00
update-index.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
update-ref.c	ref_transaction_verify(): new function to check a reference's value	2015-02-17 11:24:59 -08:00
update-server-info.c
upload-archive.c
var.c
verify-commit.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
verify-pack.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
verify-tag.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
write-tree.c