Merge branch 'maint'

* maint:
  backmerge a few more fixes to 1.7.1.X series
  rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
  fix git branch -m in presence of cross devices

Conflicts:
	RelNotes
	builtin/rev-parse.c

diff --cc builtin/rev-parse.c
index b676e296357c41cdca2f030d28b511ff986fdad9,95c59fa686de7c8a90ce935aecc35bc83c68076d..a5a1c86e92720e8beefd8275acfc5df2dbdce175
--- 1/builtin/rev-parse.c
--- 2/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@@ -407,9 -407,8 +407,9 @@@ static int cmd_parseopt(int argc, cons
        ALLOC_GROW(opts, onb + 1, osz);
        memset(opts + onb, 0, sizeof(opts[onb]));
        argc = parse_options(argc, argv, prefix, opts, usage,
-                       keep_dashdash ? PARSE_OPT_KEEP_DASHDASH : 0 |
-                       stop_at_non_option ? PARSE_OPT_STOP_AT_NON_OPTION : 0 |
+                       (keep_dashdash ? PARSE_OPT_KEEP_DASHDASH : 0) |
 -                      (stop_at_non_option ? PARSE_OPT_STOP_AT_NON_OPTION : 0));
++                      (stop_at_non_option ? PARSE_OPT_STOP_AT_NON_OPTION : 0) |
 +                      PARSE_OPT_SHELL_EVAL);
  
        strbuf_addf(&parsed, " --");
        sq_quote_argv(&parsed, argv, 0);

diff --cc refs.c
Simple merge

diff --cc t/t1502-rev-parse-parseopt.sh
Simple merge