@matheusbsbs / matheus-bagliano / commits / 00df3bed2b
Fork 0

Migrate git-checkout.sh to use git-rev-parse --parseopt --keep-dashdash

Also fix some space versus tabs issues. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Pierre Habouzit committed Nov 4, 2007 at 11:31 UTC 00df3bed2bf77ad31094e6d064d2c4f069086b41
1 file changed +49 -50
git-checkout.sh
+49 -50
@@ -1,6 +1,16 @@
1 #!/bin/sh
2
3 -USAGE='[-q] [-f] [-b <new_branch>] [-m] [<branch>] [<paths>...]'
3 +OPTIONS_KEEPDASHDASH=t
4 +OPTIONS_SPEC="\
5 +git-branch [options] [<branch>] [<paths>...]
6 +--
7 +b= create a new branch started at <branch>
8 +l create the new branchs reflog
9 +track tells if the new branch should track the remote branch
10 +f proceed even if the index or working tree is not HEAD
11 +m performa three-way merge on local modifications if needed
12 +q,quiet be quiet
13 +"
14 SUBDIRECTORY_OK=Sometimes
15 . git-sh-setup
16 require_work_tree
@@ -20,13 +30,12 @@ quiet=
30 v=-v
31 LF='
32 '
23 -while [ "$#" != "0" ]; do
24 - arg="$1"
25 - shift
26 - case "$arg" in
27 - "-b")
28 - newbranch="$1"
33 +
34 +while test $# != 0; do
35 + case "$1" in
36 + -b)
37 shift
38 + newbranch="$1"
39 [ -z "$newbranch" ] &&
40 die "git checkout: -b needs a branch name"
41 git show-ref --verify --quiet -- "refs/heads/$newbranch" &&
@@ -34,64 +43,54 @@ while [ "$#" != "0" ]; do
43 git check-ref-format "heads/$newbranch" ||
44 die "git checkout: we do not like '$newbranch' as a branch name."
45 ;;
37 - "-l")
46 + -l)
47 newbranch_log=-l
48 ;;
40 - "--track"|"--no-track")
41 - track="$arg"
49 + --track|--no-track)
50 + track="$1"
51 ;;
43 - "-f")
52 + -f)
53 force=1
54 ;;
55 -m)
56 merge=1
57 ;;
49 - "-q")
58 + -q|--quiet)
59 quiet=1
60 v=
61 ;;
62 --)
63 + shift
64 break
65 ;;
56 - -*)
57 - usage
58 - ;;
66 *)
60 - if rev=$(git rev-parse --verify "$arg^0" 2>/dev/null)
61 - then
62 - if [ -z "$rev" ]; then
63 - echo "unknown flag $arg"
64 - exit 1
65 - fi
66 - new_name="$arg"
67 - if git show-ref --verify --quiet -- "refs/heads/$arg"
68 - then
69 - rev=$(git rev-parse --verify "refs/heads/$arg^0")
70 - branch="$arg"
71 - fi
72 - new="$rev"
73 - elif rev=$(git rev-parse --verify "$arg^{tree}" 2>/dev/null)
74 - then
75 - # checking out selected paths from a tree-ish.
76 - new="$rev"
77 - new_name="$arg^{tree}"
78 - branch=
79 - else
80 - new=
81 - new_name=
82 - branch=
83 - set x "$arg" "$@"
84 - shift
85 - fi
86 - case "$1" in
87 - --)
88 - shift ;;
89 - esac
90 - break
67 + usage
68 ;;
92 - esac
69 + esac
70 + shift
71 done
72
73 +arg="$1"
74 +if rev=$(git rev-parse --verify "$arg^0" 2>/dev/null)
75 +then
76 + [ -z "$rev" ] && die "unknown flag $arg"
77 + new_name="$arg"
78 + if git show-ref --verify --quiet -- "refs/heads/$arg"
79 + then
80 + rev=$(git rev-parse --verify "refs/heads/$arg^0")
81 + branch="$arg"
82 + fi
83 + new="$rev"
84 + shift
85 +elif rev=$(git rev-parse --verify "$arg^{tree}" 2>/dev/null)
86 +then
87 + # checking out selected paths from a tree-ish.
88 + new="$rev"
89 + new_name="$arg^{tree}"
90 + shift
91 +fi
92 +[ "$1" = "--" ] && shift
93 +
94 case "$newbranch,$track" in
95 ,--*)
96 die "git checkout: --track and --no-track require -b"
@@ -138,8 +137,8 @@ Did you intend to checkout '$@' which can not be resolved as commit?"
137 git ls-files -- "$@" |
138 git checkout-index -f -u --stdin
139
141 - # Run a post-checkout hook -- the HEAD does not change so the
142 - # current HEAD is passed in for both args
140 + # Run a post-checkout hook -- the HEAD does not change so the
141 + # current HEAD is passed in for both args
142 if test -x "$GIT_DIR"/hooks/post-checkout; then
143 "$GIT_DIR"/hooks/post-checkout $old $old 0
144 fi
@@ -294,5 +293,5 @@ fi
293
294 # Run a post-checkout hook
295 if test -x "$GIT_DIR"/hooks/post-checkout; then
297 - "$GIT_DIR"/hooks/post-checkout $old $new 1
296 + "$GIT_DIR"/hooks/post-checkout $old $new 1
297 fi