@matheusbsbs / matheus-bagliano / commits / 8580830084

"git pull" doesn't know "--edit"

Ok, so now "git merge" defaults to editing when interactive - lovely. But when testing that, I noticed that while you can say git merge --[no-]edit ..branch.. that does not work with "git pull". You get a message like error: unknown option `no-edit' usage: git fetch [<options>] [<repository> [<refspec>...]] or: git fetch [<options>] <group> or: git fetch --multiple [<options>] [(<repository> | <group>)...] or: git fetch --all [<options>] -v, --verbose be more verbose -q, --quiet be more quiet --all fetch from all remotes ... which is because that stupid shell script doesn't know about the new flags, and just passes it to "git fetch" instead. Now, I really wanted to just make "git pull" a built-in instead of that nasty shell script, but I'm lazy. So here's the trivial updates to git-pull.sh to at least teach it about -e/--edit/--no-edit. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Linus Torvalds committed Feb 11, 2012 at 10:21 UTC 8580830084c8917ac41d18e39dba276b237f598e

1 file changed +6 -2

git-pull.sh

+6 -2

@@ -40,7 +40,7 @@ test -f "$GIT_DIR/MERGE_HEAD" && die_merge

41 strategy_args= diffstat= no_commit= squash= no_ff= ff_only=

42 log_arg= verbosity= progress= recurse_submodules=

43 -merge_args=

43 +merge_args= edit=

44 curr_branch=$(git symbolic-ref -q HEAD)

45 curr_branch_short="${curr_branch#refs/heads/}"

46 rebase=$(git config --bool branch.$curr_branch_short.rebase)

@@ -70,6 +70,10 @@ do

70 no_commit=--no-commit ;;

71 --c|--co|--com|--comm|--commi|--commit)

72 no_commit=--commit ;;

73 + -e|--edit)

74 + edit=--edit ;;

75 + --no-edit)

76 + edit=--no-edit ;;

77 --sq|--squ|--squa|--squas|--squash)

78 squash=--squash ;;

79 --no-sq|--no-squ|--no-squa|--no-squas|--no-squash)

@@ -278,7 +282,7 @@ true)

282 eval="$eval --onto $merge_head ${oldremoteref:-$merge_head}"

283 ;;

284 *)

281 - eval="git-merge $diffstat $no_commit $squash $no_ff $ff_only"

285 + eval="git-merge $diffstat $no_commit $edit $squash $no_ff $ff_only"

286 eval="$eval $log_arg $strategy_args $merge_args $verbosity $progress"

287 eval="$eval \"\$merge_name\" HEAD $merge_head"

288 ;;