3 # git-submodule.sh: add, init, update or list git submodules
5 # Copyright (c) 2007 Lars Hjemli
7 dashless=$(basename "$0" | sed -e 's/-/ /')
8 USAGE="[--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>]
9 or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]
10 or: $dashless [--quiet] init [--] [<path>...]
11 or: $dashless [--quiet] deinit [-f|--force] [--] <path>...
12 or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--reference <repository>] [--recursive] [--] [<path>...]
13 or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
14 or: $dashless [--quiet] foreach [--recursive] <command>
15 or: $dashless [--quiet] sync [--recursive] [--] [<path>...]"
22 wt_prefix=$(git rev-parse --show-prefix)
25 # Restrict ourselves to a vanilla subset of protocols; the URLs
26 # we get are under control of a remote repository, and we do not
27 # want them kicking off arbitrary git-remote-* programs.
29 # If the user has already specified a set of allowed protocols,
30 # we assume they know what they're doing and use that instead.
31 : ${GIT_ALLOW_PROTOCOL=file:git:http:https:ssh}
32 export GIT_ALLOW_PROTOCOL
49 # The function takes at most 2 arguments. The first argument is the
50 # URL that navigates to the submodule origin repo. When relative, this URL
51 # is relative to the superproject origin URL repo. The second up_path
52 # argument, if specified, is the relative path that navigates
53 # from the submodule working tree to the superproject working tree.
55 # The output of the function is the origin URL of the submodule.
57 # The output will either be an absolute URL or filesystem path (if the
58 # superproject origin URL is an absolute URL or filesystem path,
59 # respectively) or a relative file system path (if the superproject
60 # origin URL is a relative file system path).
62 # When the output is a relative file system path, the path is either
63 # relative to the submodule working tree, if up_path is specified, or to
64 # the superproject working tree otherwise.
65 resolve_relative_url ()
67 remote=$(get_default_remote)
68 remoteurl=$(git config "remote.$remote.url") ||
69 remoteurl=$(pwd) # the repository is its own authoritative upstream
71 remoteurl=${remoteurl%/}
84 remoteurl="./$remoteurl"
95 remoteurl="${remoteurl%/*}"
98 remoteurl="${remoteurl%:*}"
102 if test -z "$is_relative" || test "." = "$remoteurl"
104 die "$(eval_gettext "cannot strip one component off url '\$remoteurl'")"
118 remoteurl="$remoteurl$sep${url%/}"
119 echo "${is_relative:+${up_path}}${remoteurl#./}"
122 # Resolve a path to be relative to another path. This is intended for
123 # converting submodule paths when git-submodule is run in a subdirectory
124 # and only handles paths where the directory separator is '/'.
126 # The output is the first argument as a path relative to the second argument,
127 # which defaults to $wt_prefix if it is omitted.
130 local target curdir result
132 curdir=${2-$wt_prefix}
136 while test -n "$curdir"
140 target=${target#"$curdir"/}
145 result="${result}../"
146 if test "$curdir" = "${curdir%/*}"
150 curdir="${curdir%/*}"
154 echo "$result$target"
159 if test "$1" = "#unmatched"
166 # Print a submodule configuration setting
168 # $1 = submodule name
172 # Checks in the usual git-config places first (for overrides),
173 # otherwise it falls back on .gitmodules. This allows you to
174 # distribute project-wide defaults in .gitmodules, while still
175 # customizing individual repositories if necessary. If the option is
176 # not in .gitmodules either, print a default value.
178 get_submodule_config () {
182 value=$(git config submodule."$name"."$option")
185 value=$(git config -f .gitmodules submodule."$name"."$option")
187 printf '%s' "${value:-$default}"
192 n=$(($1 + 0)) 2>/dev/null && test "$n" = "$1"
196 # Add a new submodule to the working tree, .gitmodules and the index
200 # optional branch is stored in global branch variable
204 # parse $args after "submodule ... add".
210 case "$2" in '') usage ;; esac
221 case "$2" in '') usage ;; esac
226 reference_path="${1#--reference=}"
229 case "$2" in '') usage ;; esac
234 case "$2" in '') usage ;; esac
255 if test -n "$reference_path"
257 is_absolute_path "$reference_path" ||
258 reference_path="$wt_prefix$reference_path"
260 reference="--reference=$reference_path"
266 if test -z "$sm_path"; then
267 sm_path=$(printf '%s\n' "$repo" |
268 sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
271 if test -z "$repo" || test -z "$sm_path"; then
275 is_absolute_path "$sm_path" || sm_path="$wt_prefix$sm_path"
277 # assure repo is absolute or relative to parent
280 test -z "$wt_prefix" ||
281 die "$(gettext "Relative path can only be used from the toplevel of the working tree")"
283 # dereference source url relative to parent's url
284 realrepo=$(resolve_relative_url "$repo") || exit
291 die "$(eval_gettext "repo URL: '\$repo' must be absolute or begin with ./|../")"
296 # multiple //; leading ./; /./; /../; trailing /
297 sm_path=$(printf '%s/\n' "$sm_path" |
307 git ls-files --error-unmatch "$sm_path" > /dev/null 2>&1 &&
308 die "$(eval_gettext "'\$sm_path' already exists in the index")"
310 if test -z "$force" && ! git add --dry-run --ignore-missing "$sm_path" > /dev/null 2>&1
312 eval_gettextln "The following path is ignored by one of your .gitignore files:
314 Use -f if you really want to add it." >&2
318 if test -n "$custom_name"
320 sm_name="$custom_name"
325 # perhaps the path exists and is already a git repo, else clone it
326 if test -e "$sm_path"
328 if test -d "$sm_path"/.git || test -f "$sm_path"/.git
330 eval_gettextln "Adding existing repo at '\$sm_path' to the index"
332 die "$(eval_gettext "'\$sm_path' already exists and is not a valid git repo")"
336 if test -d ".git/modules/$sm_name"
340 echo >&2 "$(eval_gettext "A git directory for '\$sm_name' is found locally with remote(s):")"
341 GIT_DIR=".git/modules/$sm_name" GIT_WORK_TREE=. git remote -v | grep '(fetch)' | sed -e s,^," ", -e s,' (fetch)',, >&2
342 echo >&2 "$(eval_gettext "If you want to reuse this local git directory instead of cloning again from")"
343 echo >&2 " $realrepo"
344 echo >&2 "$(eval_gettext "use the '--force' option. If the local git directory is not the correct repo")"
345 die "$(eval_gettext "or you are unsure what this means choose another name with the '--name' option.")"
347 echo "$(eval_gettext "Reactivating local git directory for submodule '\$sm_name'.")"
350 git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" "$reference" "$depth" || exit
354 # ash fails to wordsplit ${branch:+-b "$branch"...}
356 '') git checkout -f -q ;;
357 ?*) git checkout -f -q -B "$branch" "origin/$branch" ;;
359 ) || die "$(eval_gettext "Unable to checkout submodule '\$sm_path'")"
361 git config submodule."$sm_name".url "$realrepo"
363 git add $force "$sm_path" ||
364 die "$(eval_gettext "Failed to add submodule '\$sm_path'")"
366 git config -f .gitmodules submodule."$sm_name".path "$sm_path" &&
367 git config -f .gitmodules submodule."$sm_name".url "$repo" &&
370 git config -f .gitmodules submodule."$sm_name".branch "$branch"
372 git add --force .gitmodules ||
373 die "$(eval_gettext "Failed to register submodule '\$sm_path'")"
377 # Execute an arbitrary command sequence in each checked out
380 # $@ = command to execute
384 # parse $args after "submodule ... foreach".
406 # dup stdin so that it can be restored when running the external
407 # command in the subshell (and a recursive call to this function)
410 git submodule--helper list --prefix "$wt_prefix"|
411 while read mode sha1 stage sm_path
413 die_if_unmatched "$mode"
414 if test -e "$sm_path"/.git
416 displaypath=$(relative_path "$sm_path")
417 say "$(eval_gettext "Entering '\$prefix\$displaypath'")"
418 name=$(git submodule--helper name "$sm_path")
420 prefix="$prefix$sm_path/"
423 sm_path=$(relative_path "$sm_path") &&
424 # we make $path available to scripts ...
432 if test -n "$recursive"
434 cmd_foreach "--recursive" "$@"
437 die "$(eval_gettext "Stopping at '\$prefix\$displaypath'; script returned non-zero status.")"
443 # Register submodules in .git/config
445 # $@ = requested paths (default to all)
449 # parse $args after "submodule ... init".
470 git submodule--helper list --prefix "$wt_prefix" "$@" |
471 while read mode sha1 stage sm_path
473 die_if_unmatched "$mode"
474 name=$(git submodule--helper name "$sm_path") || exit
476 displaypath=$(relative_path "$sm_path")
478 # Copy url setting when it is not set yet
479 if test -z "$(git config "submodule.$name.url")"
481 url=$(git config -f .gitmodules submodule."$name".url)
483 die "$(eval_gettext "No url found for submodule path '\$displaypath' in .gitmodules")"
485 # Possibly a url relative to parent
488 url=$(resolve_relative_url "$url") || exit
491 git config submodule."$name".url "$url" ||
492 die "$(eval_gettext "Failed to register url for submodule path '\$displaypath'")"
494 say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$displaypath'")"
497 # Copy "update" setting when it is not set yet
498 if upd="$(git config -f .gitmodules submodule."$name".update)" &&
500 test -z "$(git config submodule."$name".update)"
503 checkout | rebase | merge | none)
504 ;; # known modes of updating
506 echo >&2 "warning: unknown update mode '$upd' suggested for submodule '$name'"
510 git config submodule."$name".update "$upd" ||
511 die "$(eval_gettext "Failed to register update mode for submodule path '\$displaypath'")"
517 # Unregister submodules from .git/config and remove their work tree
519 # $@ = requested paths (use '.' to deinit all submodules)
523 # parse $args after "submodule ... deinit".
549 die "$(eval_gettext "Use '.' if you really want to deinitialize all submodules")"
552 git submodule--helper list --prefix "$wt_prefix" "$@" |
553 while read mode sha1 stage sm_path
555 die_if_unmatched "$mode"
556 name=$(git submodule--helper name "$sm_path") || exit
558 displaypath=$(relative_path "$sm_path")
560 # Remove the submodule work tree (unless the user already did it)
561 if test -d "$sm_path"
563 # Protect submodules containing a .git directory
564 if test -d "$sm_path/.git"
566 echo >&2 "$(eval_gettext "Submodule work tree '\$displaypath' contains a .git directory")"
567 die "$(eval_gettext "(use 'rm -rf' if you really want to remove it including all of its history)")"
572 git rm -qn "$sm_path" ||
573 die "$(eval_gettext "Submodule work tree '\$displaypath' contains local modifications; use '-f' to discard them")"
576 say "$(eval_gettext "Cleared directory '\$displaypath'")" ||
577 say "$(eval_gettext "Could not remove submodule work tree '\$displaypath'")"
580 mkdir "$sm_path" || say "$(eval_gettext "Could not create empty submodule directory '\$displaypath'")"
582 # Remove the .git/config entries (unless the user already did it)
583 if test -n "$(git config --get-regexp submodule."$name\.")"
585 # Remove the whole section so we have a clean state when
586 # the user later decides to init this submodule again
587 url=$(git config submodule."$name".url)
588 git config --remove-section submodule."$name" 2>/dev/null &&
589 say "$(eval_gettext "Submodule '\$name' (\$url) unregistered for path '\$displaypath'")"
595 # Update each submodule path to correct revision, using clone and checkout as needed
597 # $@ = requested paths (default to all)
601 # parse $args after "submodule ... update".
624 case "$2" in '') usage ;; esac
625 reference="--reference=$2"
641 case "$2" in '') usage ;; esac
649 case "$2" in '') usage ;; esac
672 cmd_init "--" "$@" || return
676 git submodule--helper update-clone ${GIT_QUIET:+--quiet} \
677 ${wt_prefix:+--prefix "$wt_prefix"} \
678 ${prefix:+--recursive-prefix "$prefix"} \
679 ${update:+--update "$update"} \
680 ${reference:+--reference "$reference"} \
681 ${depth:+--depth "$depth"} \
683 "$@" || echo "#unmatched"
686 while read mode sha1 stage just_cloned sm_path
688 die_if_unmatched "$mode"
690 name=$(git submodule--helper name "$sm_path") || exit
691 url=$(git config submodule."$name".url)
692 branch=$(get_submodule_config "$name" branch master)
693 if ! test -z "$update"
695 update_module=$update
697 update_module=$(git config submodule."$name".update)
698 if test -z "$update_module"
700 update_module="checkout"
704 displaypath=$(relative_path "$prefix$sm_path")
706 if test $just_cloned -eq 1
709 update_module=checkout
711 subsha1=$(clear_local_git_env; cd "$sm_path" &&
712 git rev-parse --verify HEAD) ||
713 die "$(eval_gettext "Unable to find current revision in submodule path '\$displaypath'")"
718 if test -z "$nofetch"
720 # Fetch remote before determining tracking $sha1
721 (clear_local_git_env; cd "$sm_path" && git-fetch) ||
722 die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")"
724 remote_name=$(clear_local_git_env; cd "$sm_path" && get_default_remote)
725 sha1=$(clear_local_git_env; cd "$sm_path" &&
726 git rev-parse --verify "${remote_name}/${branch}") ||
727 die "$(eval_gettext "Unable to find current ${remote_name}/${branch} revision in submodule path '\$sm_path'")"
730 if test "$subsha1" != "$sha1" || test -n "$force"
733 # If we don't already have a -f flag and the submodule has never been checked out
734 if test -z "$subsha1" && test -z "$force"
739 if test -z "$nofetch"
741 # Run fetch only if $sha1 isn't present or it
742 # is not reachable from a ref.
743 (clear_local_git_env; cd "$sm_path" &&
744 ( (rev=$(git rev-list -n 1 $sha1 --not --all 2>/dev/null) &&
745 test -z "$rev") || git-fetch)) ||
746 die "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'")"
750 case "$update_module" in
752 command="git checkout $subforce -q"
753 die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$displaypath'")"
754 say_msg="$(eval_gettext "Submodule path '\$displaypath': checked out '\$sha1'")"
758 die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$displaypath'")"
759 say_msg="$(eval_gettext "Submodule path '\$displaypath': rebased into '\$sha1'")"
760 must_die_on_failure=yes
764 die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$displaypath'")"
765 say_msg="$(eval_gettext "Submodule path '\$displaypath': merged in '\$sha1'")"
766 must_die_on_failure=yes
769 command="${update_module#!}"
770 die_msg="$(eval_gettext "Execution of '\$command \$sha1' failed in submodule path '\$prefix\$sm_path'")"
771 say_msg="$(eval_gettext "Submodule path '\$prefix\$sm_path': '\$command \$sha1'")"
772 must_die_on_failure=yes
775 die "$(eval_gettext "Invalid update mode '$update_module' for submodule '$name'")"
778 if (clear_local_git_env; cd "$sm_path" && $command "$sha1")
781 elif test -n "$must_die_on_failure"
783 die_with_status 2 "$die_msg"
785 err="${err};$die_msg"
790 if test -n "$recursive"
793 prefix="$prefix$sm_path/"
801 die_msg="$(eval_gettext "Failed to recurse into submodule path '\$displaypath'")"
804 err="${err};$die_msg"
807 die_with_status $res "$die_msg"
834 git describe "$2" 2>/dev/null ||
835 git describe --tags "$2" 2>/dev/null ||
836 git describe --contains "$2" 2>/dev/null ||
837 git describe --all --always "$2"
840 test -z "$revname" || revname=" ($revname)"
843 # Show commit summary for submodules in index or working tree
845 # If '--cached' is given, show summary between index and given commit,
846 # or between working tree and given commit
848 # $@ = [commit (default 'HEAD'),] requested paths (default all)
855 # parse $args after "submodule ... summary".
870 isnumber "$summary_limit" || usage
874 summary_limit="${1#--summary-limit=}"
875 isnumber "$summary_limit" || usage
891 test $summary_limit = 0 && return
893 if rev=$(git rev-parse -q --verify --default HEAD ${1+"$1"})
897 elif test -z "$1" || test "$1" = "HEAD"
899 # before the first commit: compare with an empty tree
900 head=$(git hash-object -w -t tree --stdin </dev/null)
901 test -z "$1" || shift
909 die "$(gettext "The --cached option cannot be used with the --files option")"
915 eval "set $(git rev-parse --sq --prefix "$wt_prefix" -- "$@")"
916 # Get modified modules cared by user
917 modules=$(git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- "$@" |
918 sane_egrep '^:([0-7]* )?160000' |
919 while read mod_src mod_dst sha1_src sha1_dst status sm_path
921 # Always show modules deleted or type-changed (blob<->module)
922 if test "$status" = D || test "$status" = T
924 printf '%s\n' "$sm_path"
927 # Respect the ignore setting for --for-status.
928 if test -n "$for_status"
930 name=$(git submodule--helper name "$sm_path")
931 ignore_config=$(get_submodule_config "$name" ignore none)
932 test $status != A && test $ignore_config = all && continue
934 # Also show added or modified modules which are checked out
935 GIT_DIR="$sm_path/.git" git-rev-parse --git-dir >/dev/null 2>&1 &&
936 printf '%s\n' "$sm_path"
940 test -z "$modules" && return
942 git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- $modules |
943 sane_egrep '^:([0-7]* )?160000' |
945 while read mod_src mod_dst sha1_src sha1_dst status name
947 if test -z "$cached" &&
948 test $sha1_dst = 0000000000000000000000000000000000000000
952 sha1_dst=$(GIT_DIR="$name/.git" git rev-parse HEAD)
954 100644 | 100755 | 120000)
955 sha1_dst=$(git hash-object $name)
961 eval_gettextln "unexpected mode \$mod_dst" >&2
968 test $mod_src = 160000 &&
969 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null &&
972 test $mod_dst = 160000 &&
973 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null &&
976 display_name=$(relative_path "$name")
979 case "$missing_src,$missing_dst" in
981 errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commit \$sha1_src")"
984 errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commit \$sha1_dst")"
987 errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commits \$sha1_src and \$sha1_dst")"
992 if test $mod_src = 160000 && test $mod_dst = 160000
994 range="$sha1_src...$sha1_dst"
995 elif test $mod_src = 160000
1001 GIT_DIR="$name/.git" \
1002 git rev-list --first-parent $range -- | wc -l
1004 total_commits=" ($(($total_commits + 0)))"
1008 sha1_abbr_src=$(echo $sha1_src | cut -c1-7)
1009 sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7)
1012 blob="$(gettext "blob")"
1013 submodule="$(gettext "submodule")"
1014 if test $mod_dst = 160000
1016 echo "* $display_name $sha1_abbr_src($blob)->$sha1_abbr_dst($submodule)$total_commits:"
1018 echo "* $display_name $sha1_abbr_src($submodule)->$sha1_abbr_dst($blob)$total_commits:"
1021 echo "* $display_name $sha1_abbr_src...$sha1_abbr_dst$total_commits:"
1023 if test -n "$errmsg"
1025 # Don't give error msg for modification whose dst is not submodule
1026 # i.e. deleted or changed to blob
1027 test $mod_dst = 160000 && echo "$errmsg"
1029 if test $mod_src = 160000 && test $mod_dst = 160000
1032 test $summary_limit -gt 0 && limit="-$summary_limit"
1033 GIT_DIR="$name/.git" \
1034 git log $limit --pretty='format: %m %s' \
1035 --first-parent $sha1_src...$sha1_dst
1036 elif test $mod_dst = 160000
1038 GIT_DIR="$name/.git" \
1039 git log --pretty='format: > %s' -1 $sha1_dst
1041 GIT_DIR="$name/.git" \
1042 git log --pretty='format: < %s' -1 $sha1_src
1050 # List all submodules, prefixed with:
1051 # - submodule not initialized
1052 # + different revision checked out
1054 # If --cached was specified the revision in the index will be printed
1055 # instead of the currently checked out revision.
1057 # $@ = requested paths (default to all)
1061 # parse $args after "submodule ... status".
1088 git submodule--helper list --prefix "$wt_prefix" "$@" |
1089 while read mode sha1 stage sm_path
1091 die_if_unmatched "$mode"
1092 name=$(git submodule--helper name "$sm_path") || exit
1093 url=$(git config submodule."$name".url)
1094 displaypath=$(relative_path "$prefix$sm_path")
1095 if test "$stage" = U
1097 say "U$sha1 $displaypath"
1100 if test -z "$url" ||
1102 ! test -d "$sm_path"/.git &&
1103 ! test -f "$sm_path"/.git
1106 say "-$sha1 $displaypath"
1109 if git diff-files --ignore-submodules=dirty --quiet -- "$sm_path"
1111 set_name_rev "$sm_path" "$sha1"
1112 say " $sha1 $displaypath$revname"
1114 if test -z "$cached"
1116 sha1=$(clear_local_git_env; cd "$sm_path" && git rev-parse --verify HEAD)
1118 set_name_rev "$sm_path" "$sha1"
1119 say "+$sha1 $displaypath$revname"
1122 if test -n "$recursive"
1125 prefix="$displaypath/"
1130 die "$(eval_gettext "Failed to recurse into submodule path '\$sm_path'")"
1135 # Sync remote urls for submodules
1136 # This makes the value for remote.$remote.url match the value
1137 # specified in .gitmodules.
1165 git submodule--helper list --prefix "$wt_prefix" "$@" |
1166 while read mode sha1 stage sm_path
1168 die_if_unmatched "$mode"
1169 name=$(git submodule--helper name "$sm_path")
1170 url=$(git config -f .gitmodules --get submodule."$name".url)
1172 # Possibly a url relative to parent
1175 # rewrite foo/bar as ../.. to find path from
1176 # submodule work tree to superproject work tree
1177 up_path="$(printf '%s\n' "$sm_path" | sed "s/[^/][^/]*/../g")" &&
1178 # guarantee a trailing /
1179 up_path=${up_path%/}/ &&
1180 # path from submodule work tree to submodule origin repo
1181 sub_origin_url=$(resolve_relative_url "$url" "$up_path") &&
1182 # path from superproject work tree to submodule origin repo
1183 super_config_url=$(resolve_relative_url "$url") || exit
1186 sub_origin_url="$url"
1187 super_config_url="$url"
1191 if git config "submodule.$name.url" >/dev/null 2>/dev/null
1193 displaypath=$(relative_path "$prefix$sm_path")
1194 say "$(eval_gettext "Synchronizing submodule url for '\$displaypath'")"
1195 git config submodule."$name".url "$super_config_url"
1197 if test -e "$sm_path"/.git
1202 remote=$(get_default_remote)
1203 git config remote."$remote".url "$sub_origin_url"
1205 if test -n "$recursive"
1207 prefix="$prefix$sm_path/"
1216 # This loop parses the command line arguments to find the
1217 # subcommand name to dispatch. Parsing of the subcommand specific
1218 # options are primarily done by the subcommand implementations.
1219 # Subcommand specific options such as --branch and --cached are
1220 # parsed here as well, for backward compatibility.
1222 while test $# != 0 && test -z "$command"
1225 add | foreach | init | deinit | update | status | summary | sync)
1255 # No command word defaults to "status"
1256 if test -z "$command"
1266 # "-b branch" is accepted only by "add"
1267 if test -n "$branch" && test "$command" != add
1272 # "--cached" is accepted only by "status" and "summary"
1273 if test -n "$cached" && test "$command" != status && test "$command" != summary