mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
git-submodule.sh: rename unused variables
The 'mode' variable is not used in cmd_update for its original purpose, rename it to 'dummy' as it only serves the purpose to abort quickly documenting this knowledge. The variable 'stage' is also not used any more in cmd_update, so remove it. This went unnoticed as first each function used the commonly used submodule listing, which was converted in74703a1e4d
(submodule: rewrite `module_list` shell function in C, 2015-09-02). When cmd_update was using its own function starting in48308681b0
(git submodule update: have a dedicated helper for cloning, 2016-02-29), its removal was missed. A later patch in this series also touches the communication between the submodule helper and git-submodule.sh, but let's have this as a preparatory patch, as it eases the next patch, which stores the raw data instead of the line printed for this communication. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
ff03d9306c
commit
9eca701f69
|
@ -1573,9 +1573,8 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
|
|||
needs_cloning = !file_exists(sb.buf);
|
||||
|
||||
strbuf_reset(&sb);
|
||||
strbuf_addf(&sb, "%06o %s %d %d\t%s\n", ce->ce_mode,
|
||||
oid_to_hex(&ce->oid), ce_stage(ce),
|
||||
needs_cloning, ce->name);
|
||||
strbuf_addf(&sb, "dummy %s %d\t%s\n",
|
||||
oid_to_hex(&ce->oid), needs_cloning, ce->name);
|
||||
string_list_append(&suc->projectlines, sb.buf);
|
||||
|
||||
if (!needs_cloning)
|
||||
|
|
|
@ -531,9 +531,9 @@ cmd_update()
|
|||
"$@" || echo "#unmatched" $?
|
||||
} | {
|
||||
err=
|
||||
while read -r mode sha1 stage just_cloned sm_path
|
||||
while read -r quickabort sha1 just_cloned sm_path
|
||||
do
|
||||
die_if_unmatched "$mode" "$sha1"
|
||||
die_if_unmatched "$quickabort" "$sha1"
|
||||
|
||||
name=$(git submodule--helper name "$sm_path") || exit
|
||||
if ! test -z "$update"
|
||||
|
|
Loading…
Reference in a new issue