git/remote.c, branch v1.6.3

remote.c: do not trigger remote.. `codepath for two-level names`

2009-04-24T08:29:28Z

If the config file contains a section like this: [remote] default = foo (it should be '[remotes]') then commands like git status git checkout git branch -v fail even though they are not obviously related to remotes. (These commands write "ahead, behind" information and, therefore, access the per-remote information). Unknown configuration keys should be ignored, not trigger errors. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano

Revert "stat_tracking_info(): only count real commits"

2009-04-21T23:33:20Z

This reverts commit 19de5d6913b9681d2bde533bccc8445c9236a648. It produces a misleading output to decide if a merge can fast-forward.

Merge branch 'bw/short-ref-strict'

2009-04-18T04:42:12Z

* bw/short-ref-strict: remote.c: use shorten_unambiguous_ref rev-parse: --abbrev-ref option to shorten ref name for-each-ref: utilize core.warnAmbiguousRefs for :short-format shorten_unambiguous_ref(): add strict mode

remote.c: use shorten_unambiguous_ref

2009-04-18T03:53:19Z

Use the new shorten_unambiguous_ref() for simplifying the output of upstream branch names. This affects status and checkout. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano

get_local_heads(): do not return random pointer if there is no head

2009-04-18T03:48:32Z

it's silly to do this: mkdir foo && cd foo && git init && git push somewhere.git but segfault should not happen even in that case. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Merge branch 'fg/remote-prune'

2009-04-12T23:46:41Z

* fg/remote-prune: add tests for remote groups git remote update: Fallback to remote if group does not exist remote: New function remote_is_configured() git remote update: Report error for non-existing groups git remote update: New option --prune builtin-remote.c: Split out prune_remote as a separate function.

remote: New function remote_is_configured()

2009-04-08T04:51:59Z

Previously, there was no easy way to check for the existence of a configured remote. remote_get for example would always create the remote "on demand". This new function returns 1 if the remote is configured, 0 otherwise. Signed-off-by: Finn Arne Gangstad Signed-off-by: Junio C Hamano

Merge branch 'mg/tracked-local-branches'

2009-04-06T07:42:31Z

* mg/tracked-local-branches: Make local branches behave like remote branches when --tracked Test for local branches being followed with --track

Merge branch 'kb/tracking-count-no-merges'

2009-04-02T05:27:43Z

* kb/tracking-count-no-merges: stat_tracking_info(): only count real commits

Make local branches behave like remote branches when --tracked

2009-04-01T22:48:30Z

This makes sure that local branches, when followed using --track, behave the same as remote ones (e.g. differences being reported by git status and git checkout). This fixes 1 known failure. The fix is done within branch_get(): The first natural candidate, namely remote_find_tracking(), does not have all the necessary info because in general there is no remote struct for '.', and we don't want one because it would show up in other places as well. branch_get(), on the other hand, has access to merge_names[] (in addition to merge[]) and therefore can set up the followed branch easily. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano