git, branch v1.8.0.1

Git 1.8.0.1

2012-11-26T02:40:34Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/checkout-out-of-unborn' into maint

2012-11-26T02:35:50Z

* jk/checkout-out-of-unborn: checkout: print a message when switching unborn branches

Merge branch 'cn/config-missing-path' into maint

2012-11-26T02:35:46Z

* cn/config-missing-path: config: don't segfault when given --path with a missing value

Merge branch 'jk/maint-gitweb-xss' into maint

2012-11-26T02:35:41Z

Fixes an XSS vulnerability in gitweb. * jk/maint-gitweb-xss: gitweb: escape html in rss title

Completion must sort before using uniq

2012-11-25T06:35:48Z

The user can be presented with invalid completion results when trying to complete a 'git checkout' command. This can happen when using a branch name prefix that matches multiple remote branches. For example, if available branches are: master remotes/GitHub/maint remotes/GitHub/master remotes/origin/maint remotes/origin/master When performing completion on 'git checkout ma' the user will be given the choices: maint master However, 'git checkout maint' will fail in this case, although completion previously said 'maint' was valid. Furthermore, when performing completion on 'git checkout mai', no choices will be suggested. So, the user is first told that the branch name 'maint' is valid, but when trying to complete 'mai' into 'maint', that completion is no longer valid. The completion results should never propose 'maint' as a valid branch name, since 'git checkout' will refuse it. The reason for this bug is that the uniq program only works with sorted input. The man page states "uniq prints the unique lines in a sorted file". When __git_refs uses the guess heuristic employed by checkout for tracking branches it wants to consider remote branches but only if the branch name is unique. To do that, it calls 'uniq -u'. However the input given to 'uniq -u' is not sorted. Therefore, in the above example, when dealing with 'git checkout ma', "__git_refs '' 1" will find the following list: master maint master maint master which, when passed to 'uniq -u' will remain the same. Therefore 'maint' will be wrongly suggested as a valid option. When dealing with 'git checkout mai', the list will be: maint maint which happens to be sorted and will be emptied by 'uniq -u', properly ignoring 'maint'. A solution for preventing the completion script from suggesting such invalid branch names is to first call 'sort' and then 'uniq -u'. Signed-off-by: Marc Khouzam Reviewed-by: Felipe Contreras Signed-off-by: Junio C Hamano

Further preparation for 1.8.0.1

2012-11-20T18:16:14Z

Signed-off-by: Junio C Hamano

Merge branch 'mg/maint-pull-suggest-upstream-to' into maint

2012-11-20T18:15:09Z

* mg/maint-pull-suggest-upstream-to: push/pull: adjust missing upstream help text to changed interface

Merge branch 'mm/maint-doc-commit-edit' into maint

2012-11-20T18:14:55Z

* mm/maint-doc-commit-edit: Document 'git commit --no-edit' explicitly

Merge branch 'as/maint-doc-fix-no-post-rewrite' into maint

2012-11-20T18:14:47Z

* as/maint-doc-fix-no-post-rewrite: commit: fixup misplacement of --no-post-rewrite description

Merge branch 'rs/lock-correct-ref-during-delete' into maint

2012-11-20T18:14:41Z

* rs/lock-correct-ref-during-delete: refs: lock symref that is to be deleted, not its target