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

Merge branch 'jc/same-encoding' into maint

2012-12-07T22:10:56Z

Various codepaths checked if two encoding names are the same using ad-hoc code and some of them ended up asking iconv() to convert between "utf8" and "UTF-8". The former is not a valid way to spell the encoding name, but often people use it by mistake, and we equated them in some but not all codepaths. Introduce a new helper function to make these codepaths consistent. * jc/same-encoding: reencode_string(): introduce and use same_encoding()

Fix typo in remote set-head usage

2012-11-26T21:27:45Z

parenthesis are not matching in `builtin_remote_sethead_usage` as a square bracket is closing something never opened. Signed-off-by: Antoine Pelisse 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 'rs/branch-del-symref' into maint

2012-11-19T03:32:58Z

A symbolic ref refs/heads/SYM was not correctly removed with "git branch -d SYM"; the command removed the ref pointed by SYM instead. * rs/branch-del-symref: branch: show targets of deleted symrefs, not sha1s branch: skip commit checks when deleting symref branches branch: delete symref branch, not its target branch: factor out delete_branch_config() branch: factor out check_branch_commit()

Merge branch 'nd/grep-true-path' into maint

2012-11-19T03:32:30Z

"git grep -e pattern " asked the attribute system to read ":.gitattributes" file in the working tree, which was nonsense. * nd/grep-true-path: grep: stop looking at random places for .gitattributes

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

2012-11-16T02:12:17Z

When given a variable without a value, such as '[section] var' and asking git-config to treat it as a path, git_config_pathname returns an error and doesn't modify its output parameter. show_config assumes that the call is always successful and sets a variable to indicate that vptr should be freed. In case of an error however, trying to do this will cause the program to be killed, as it's pointing to memory in the stack. Detect the error and return immediately to avoid freeing or accessing the uninitialed memory in the stack. Signed-off-by: Carlos Martín Nieto Acked-by: Jeff King Signed-off-by: Junio C Hamano

checkout: print a message when switching unborn branches

2012-11-16T01:36:26Z

When we switch to a new branch using checkout, we usually output a message indicating what happened. However, when we switch from an unborn branch to a new branch, we do not print anything, which may leave the user wondering what happened. The reason is that the unborn branch is a special case (see abe1998), and does not follow the usual switch_branches code path. Let's add a similar informational message to the special case to match the usual code path. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

reencode_string(): introduce and use same_encoding()

2012-11-04T13:10:33Z

Callers of reencode_string() that re-encodes a string from one encoding to another all used ad-hoc way to bypass the case where the input and the output encodings are the same. Some did strcmp(), some did strcasecmp(), yet some others when converting to UTF-8 used is_encoding_utf8(). Introduce same_encoding() helper function to make these callers use the same logic. Notably, is_encoding_utf8() has a work-around for common misconfiguration to use "utf8" to name UTF-8 encoding, which does not match "UTF-8" hence strcasecmp() would not consider the same. Make use of it in this helper function. Signed-off-by: Junio C Hamano

branch: show targets of deleted symrefs, not sha1s

2012-10-18T21:36:17Z

git branch reports the abbreviated hash of the head commit of a deleted branch to make it easier for a user to undo the operation. For symref branches this doesn't help. Print the symref target instead for them. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano