user/sven/git.git/remote.c, branch v1.6.4.5

Merge branch 'cb/maint-fetch-refspec-wo-dst'

2009-07-06T16:39:38Z

* cb/maint-fetch-refspec-wo-dst: fetch: do not create ref from empty name

Fix various sparse warnings in the git source code

2009-06-21T04:52:55Z

There are a few remaining ones, but this fixes the trivial ones. It boils down to two main issues that sparse complains about: - warning: Using plain integer as NULL pointer Sparse doesn't like you using '0' instead of 'NULL'. For various good reasons, not the least of which is just the visual confusion. A NULL pointer is not an integer, and that whole "0 works as NULL" is a historical accident and not very pretty. A few of these remain: zlib is a total mess, and Z_NULL is just a 0. I didn't touch those. - warning: symbol 'xyz' was not declared. Should it be static? Sparse wants to see declarations for any functions you export. A lack of a declaration tends to mean that you should either add one, or you should mark the function 'static' to show that it's in file scope. A few of these remain: I only did the ones that should obviously just be made static. That 'wt_status_submodule_summary' one is debatable. It has a few related flags (like 'wt_status_use_color') which _are_ declared, and are used by builtin-commit.c. So maybe we'd like to export it at some point, but it's not declared now, and not used outside of that file, so 'static' it is in this patch. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

Merge branch 'mg/pushurl'

2009-06-21T04:47:27Z

* mg/pushurl: avoid NULL dereference on failed malloc builtin-remote: Make "remote -v" display push urls builtin-remote: Show push urls as well technical/api-remote: Describe new struct remote member pushurl t5516: Check pushurl config setting Allow push and fetch urls to be different

fetch: do not create ref from empty name

2009-06-18T16:55:34Z

Previously, the refspec ":" would be expanded to ":refs/heads/". Instead, treat an empty just like refspecs without a colon. Signed-off-by: Clemens Buchacher Signed-off-by: Junio C Hamano

Merge branch 'cb/match_refs_internal_tail'

2009-06-13T19:47:52Z

* cb/match_refs_internal_tail: match_refs: search ref list tail internally

Allow push and fetch urls to be different

2009-06-10T06:46:47Z

This introduces a config setting remote.$remotename.pushurl which is used for pushes only. If absent remote.$remotename.url is used for pushes and fetches as before. This is useful, for example, in order to do passwordless fetches (remote update) over the git transport but pushes over ssh. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano

match_refs: search ref list tail internally

2009-06-02T02:41:24Z

Avoid code duplication by moving list tail search to match_refs(). This does not change the semantics, except for http-push, which now inserts to the front of the ref list in order to get rid of the global remote_tail. Signed-off-by: Clemens Buchacher Signed-off-by: Junio C Hamano

Merge branch 'mg/track'

2009-05-23T08:44:00Z

* mg/track: Fix behavior with non-commit upstream references Test tracking of non-commit upstreams

Fix behavior with non-commit upstream references

2009-05-14T16:43:54Z

stat_tracking_info() assumes that upstream references (as specified by --track or set up automatically) are commits. By calling lookup_commit() on them, create_objects() creates objects for them with type commit no matter what their real type is; this disturbs lookup_tag() later on in the call sequence, leading to git status, git branch -v and git checkout erroring out. Fix this by using lookup_commit_reference() instead so that (annotated) tags can be used as upstream references. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano

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