user/sven/git.git/git-parse-remote.sh, branch v1.7.6.3

Merge branch 'mz/rebase'

2011-04-28T21:11:39Z

* mz/rebase: (34 commits) rebase: define options in OPTIONS_SPEC Makefile: do not install sourced rebase scripts rebase: use @{upstream} if no upstream specified rebase -i: remove unnecessary state rebase-root rebase -i: don't read unused variable preserve_merges git-rebase--am: remove unnecessary --3way option rebase -m: don't print exit code 2 when merge fails rebase -m: remember allow_rerere_autoupdate option rebase: remember strategy and strategy options rebase: remember verbose option rebase: extract code for writing basic state rebase: factor out sub command handling rebase: make -v a tiny bit more verbose rebase -i: align variable names rebase: show consistent conflict resolution hint rebase: extract am code to new source file rebase: extract merge code to new source file rebase: remove $branch as synonym for $orig_head rebase -i: support --stat rebase: factor out call to pre-rebase hook ...

Merge branch 'maint'

2011-03-31T02:33:53Z

* maint: parse-remote: typofix

parse-remote: typofix

2011-03-31T02:33:41Z

An earlier patch had a trivial typo that two people did not notice. Pointed out by Michael Schubert. Signed-off-by: Junio C Hamano

Merge branch 'maint'

2011-03-30T21:10:41Z

* maint: contrib/thunderbird-patch-inline: do not require bash to run the script t8001: check the exit status of the command being tested strbuf.h: remove a tad stale docs-in-comment and reference api-doc instead Typos: t/README Documentation/config.txt: make truth value of numbers more explicit git-pack-objects.txt: fix grammatical errors parse-remote: replace unnecessary sed invocation

parse-remote: replace unnecessary sed invocation

2011-03-30T18:42:08Z

Just use parameter expansion instead. Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

git-request-pull: open-code the only invocation of get_remote_url

2011-03-02T20:26:58Z

So sh:get_remote_url can go now and git-request-pull doesn't need to source git-parse-remote. anymore. Signed-off-by: Uwe Kleine-König Signed-off-by: Junio C Hamano

get_remote_url(): use the same data source as ls-remote to get remote urls

2011-03-02T20:26:53Z

The formerly implemented algorithm behaved differently to remote.c:remote_get() at least for remotes that contain a slash. While the former just assumes a/b is a path the latter checks the config for remote."a/b" first which is more reasonable. This removes the last user of git-parse-remote.sh:get_data_source(), so this function is removed. Signed-off-by: Uwe Kleine-König Signed-off-by: Junio C Hamano

rebase: use @{upstream} if no upstream specified

2011-02-10T22:45:25Z

'git rebase' without arguments is currently not supported. Make it default to 'git rebase @{upstream}'. That is also what 'git pull [--rebase]' defaults to, so it only makes sense that 'git rebase' defaults to the same thing. Defaulting to @{upstream} will make it possible to run e.g. 'git rebase -i' without arguments, which is probably a quite common use case. It also improves the scenario where you have multiple branches that rebase against a remote-tracking branch, where you currently have to choose between the extra network delay of 'git pull' or the slightly awkward keys to enter 'git rebase @{u}'. The error reporting when no upstream is configured for the current branch or when no branch is checked out is reused from git-pull.sh. A function is extracted into git-parse-remote.sh for this purpose. Helped-by: Yann Dirson Helped-by: Jonathan Nieder Signed-off-by: Martin von Zweigbergk Signed-off-by: Junio C Hamano

Merge branch 'mz/pull-rebase-rebased'

2010-12-13T05:49:51Z

* mz/pull-rebase-rebased: Use reflog in 'pull --rebase . foo'

parse-remote: handle detached HEAD

2010-12-07T00:57:48Z

get_remote_merge_branch with zero or one arguments returns the upstream branch. But a detached HEAD does no have an upstream branch, as it is not tracking anything. Handle this case testing the exit code of "git symbolic-ref -q HEAD". Reported-by: Sverre Rabbelier Signed-off-by: Santi Béjar Tested-by: Sverre Rabbelier Signed-off-by: Junio C Hamano