pull: re-fix command line generation
14e5d40 (pull: Fix parsing of -X<option>, 2010-01-17) forgot that merge_name needs to stay as a single non-interpolated string. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jan 24, 2010 at 10:11 UTC
7ecee3314fdafd8015fd14bfb76ae4b601acc25e
2 files changed
+36
-1
git-pull.sh
+1
-1
@@ -275,7 +275,7 @@ true)
275
*)
276
eval="git-merge $diffstat $no_commit $squash $no_ff $ff_only"
277
eval="$eval $log_arg $strategy_args $merge_args"
278
- eval="$eval \"$merge_name\" HEAD $merge_head $verbosity"
278
+ eval="$eval \"\$merge_name\" HEAD $merge_head $verbosity"
279
;;
280
esac
281
eval "exec $eval"
t/t5524-pull-msg.sh
new
+35
@@ -0,0 +1,35 @@
1
+#!/bin/sh
2
+
3
+test_description='git pull message generation'
4
+
5
+. ./test-lib.sh
6
+
7
+dollar='$Dollar'
8
+
9
+test_expect_success setup '
10
+ test_commit initial afile original &&
11
+ git clone . cloned &&
12
+ (
13
+ cd cloned &&
14
+ echo added >bfile &&
15
+ git add bfile &&
16
+ test_tick &&
17
+ git commit -m "add bfile"
18
+ ) &&
19
+ test_tick && test_tick &&
20
+ echo "original $dollar" >afile &&
21
+ git add afile &&
22
+ git commit -m "do not clobber $dollar signs"
23
+'
24
+
25
+test_expect_success pull '
26
+(
27
+ cd cloned &&
28
+ git pull --log &&
29
+ git log -2 &&
30
+ git cat-file commit HEAD >result &&
31
+ grep Dollar result
32
+)
33
+'
34
+
35
+test_done