git/advice.c, branch v2.0.2

Merge branch 'jc/push-2.0-default-to-simple'

2014-03-07T23:13:15Z

Finally update the "git push" default behaviour to "simple".

Rename advice.object_name_warning to objectNameWarning

2013-07-31T22:20:07Z

We spell config variables in camelCase instead of with_underscores. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

Merge branch 'mm/rm-coalesce-errors'

2013-06-24T20:48:35Z

Give a single message followed by list of paths from "git rm" to report multiple paths that cannot be removed. * mm/rm-coalesce-errors: rm: introduce advice.rmHints to shorten messages rm: better error message on failure for multiple files

push: switch default from "matching" to "simple"

2013-06-18T19:36:00Z

We promised to change the behaviour of lazy "git push [there]" that does not say what to push on the command line from "matching" to "simple" in Git 2.0. This finally flips that bit. Helped-by: Matthieu Moy Signed-off-by: Junio C Hamano

rm: introduce advice.rmHints to shorten messages

2013-06-12T23:59:55Z

Introduce advice.rmHints to choose whether to display advice or not when git rm fails. Defaults to true, in order to preserve current behavior. As an example, the message: error: 'foo.txt' has changes staged in the index (use --cached to keep the file, or -f to force removal) would look like, with advice.rmHints=false: error: 'foo.txt' has changes staged in the index Signed-off-by: Mathieu Lienard--Mayor Signed-off-by: Jorge Juan Garcia Garcia Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

Merge branch 'nd/warn-ambiguous-object-name'

2013-06-11T20:31:07Z

"git cmd ", when happens to be a 40-hex string, directly uses the 40-hex string as an object name, even if a ref "refs//" exists. This disambiguation order is unlikely to change, but we should warn about the ambiguity just like we warn when more than one refs/ hierachies share the same name. * nd/warn-ambiguous-object-name: get_sha1: warn about full or short object names that look like refs

get_sha1: warn about full or short object names that look like refs

2013-05-29T18:31:36Z

When we get 40 hex digits, we immediately assume it's an SHA-1. This is the right thing to do because we have no way else to specify an object. If there is a ref with the same object name, it will be ignored. Warn the user about this case because the ref with full object name is likely a mistake, for example git checkout -b $empty_var $(git rev-parse something) advice.object_name_warning is not documented because frankly people should not be aware about it until they encounter this situation. While at there, warn about ambiguation with abbreviated SHA-1 too. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

branch: give advice when tracking start-point is missing

2013-04-02T23:14:13Z

If the user requests to --set-upstream-to a branch that does not exist, then either: 1. It was a typo. 2. They thought the branch should exist. In case (1), there is not much we can do beyond showing the name we tried to use. For case (2), though, we can help to guide them through common workflows. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'tb/document-status-u-tradeoff'

2013-03-21T21:02:10Z

Suggest users to look into using--untracked=no option when "git status" takes too long. * tb/document-status-u-tradeoff: status: advise to consider use of -u when read_directory takes too long git status: document trade-offs in choosing parameters to the -u option

status: advise to consider use of -u when read_directory takes too long

2013-03-17T04:44:58Z

Introduce advice.statusUoption to suggest considering use of -u to strike different trade-off when it took more than 2 seconds to enumerate untracked/ignored files. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano