From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 7 Jul 2010 18:18:26 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.2-rc2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fcd91f8de20bf7969599a7a60cba73117d99f2d1;p=git.git

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
---

fcd91f8de20bf7969599a7a60cba73117d99f2d1
diff --cc builtin/rev-parse.c
index b676e2963,95c59fa68..a5a1c86e9
--- a/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);