user/sven/git.git/contrib, branch v1.8.0.2

git-remote-mediawiki: escape ", \, and LF in file names

2012-11-29T19:16:33Z

A mediawiki page can contain, and even start with a " character, we have to escape it when generating the fast-export stream, as well as \ character. While we're there, also escape newlines, but I don't think we can get them from MediaWiki pages. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

completion: add options --single-branch and --branch to "git clone"

2012-11-28T20:01:16Z

Signed-off-by: Ralf Thielow Signed-off-by: Junio C Hamano

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

Merge branch 'maint'

2012-10-14T06:05:54Z

* maint: Fix spelling error in post-receive-email hook

Fix spelling error in post-receive-email hook

2012-10-14T04:50:14Z

Signed-off-by: Richard Fearn Signed-off-by: Junio C Hamano

Merge branch 'maint'

2012-09-25T17:25:52Z

* maint: Revert "completion: fix shell expansion of items"

Revert "completion: fix shell expansion of items"

2012-09-25T16:00:28Z

This reverts commit 25ae7cfd19c8f21721363c64163cd5d9d1135b20. That patch does fix expansion of weird variables in some simple tests, but it also seems to break other things, like expansion of refs by "git checkout". While we're sorting out the correct solution, we are much better with the original bug (people with metacharacters in their completions occasionally see an error message) than the current bug (ref completion does not work at all). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Sync with maint

2012-09-24T19:50:36Z

Improve the description of GIT_PS1_SHOWUPSTREAM

2012-09-24T19:38:41Z

Describe what '=' means in the output of __git_ps1 when using GIT_PS1_SHOWUPSTREAM, which was not previously described. Signed-off-by: Jonathan "Duke" Leto Signed-off-by: Junio C Hamano

Merge branch 'maint'

2012-09-20T22:55:47Z

* maint: Documentation: Document signature showing options completion: fix shell expansion of items