kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

archive.c: use OPT_BOOL() 

The list variable (which is OPT_BOOLEAN) is initialized to 0 and only
checked against 0 in the code, so it is safe to use OPT_BOOL().

The worktree_attributes variable (which is OPT_BOOLEAN) is initialized to
0 and later assigned to a field with the same name in struct archive_args,
which is a bitfield of width 1. It is safe and even more correct to use
OPT_BOOL() here; the new test in 5001 demonstrates why using OPT_COUNTUP
is wrong.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2011-09-27 16:59:01 -07:00
parent b04ba2bb42
commit f858c646b5
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archive.c
View File

@ -318,7 +318,7 @@ static int parse_archive_args(int argc, const char **argv,
"prepend prefix to each pathname in the archive"), "prepend prefix to each pathname in the archive"),
OPT_STRING('o', "output", &output, "file", OPT_STRING('o', "output", &output, "file",
"write the archive to this file"), "write the archive to this file"),
OPT_BOOLEAN(0, "worktree-attributes", &worktree_attributes, OPT_BOOL(0, "worktree-attributes", &worktree_attributes,
"read .gitattributes in working directory"), "read .gitattributes in working directory"),
OPT__VERBOSE(&verbose, "report archived files on stderr"), OPT__VERBOSE(&verbose, "report archived files on stderr"),
OPT__COMPR('0', &compression_level, "store only", 0), OPT__COMPR('0', &compression_level, "store only", 0),
@ -332,7 +332,7 @@ static int parse_archive_args(int argc, const char **argv,
OPT__COMPR_HIDDEN('8', &compression_level, 8), OPT__COMPR_HIDDEN('8', &compression_level, 8),
OPT__COMPR('9', &compression_level, "compress better", 9), OPT__COMPR('9', &compression_level, "compress better", 9),
OPT_GROUP(""), OPT_GROUP(""),
OPT_BOOLEAN('l', "list", &list, OPT_BOOL('l', "list", &list,
"list supported archive formats"), "list supported archive formats"),
OPT_GROUP(""), OPT_GROUP(""),
OPT_STRING(0, "remote", &remote, "repo", OPT_STRING(0, "remote", &remote, "repo",

9
t/t5001-archive-attr.sh
View File

@ -57,6 +57,15 @@ test_expect_missing worktree/ignored
test_expect_exists worktree/ignored-by-tree test_expect_exists worktree/ignored-by-tree
test_expect_missing worktree/ignored-by-worktree test_expect_missing worktree/ignored-by-worktree


test_expect_success 'git archive --worktree-attributes option' '
git archive --worktree-attributes --worktree-attributes HEAD >worktree.tar &&
(mkdir worktree2 && cd worktree2 && "$TAR" xf -) <worktree.tar
'

test_expect_missing worktree2/ignored
test_expect_exists worktree2/ignored-by-tree
test_expect_missing worktree2/ignored-by-worktree

test_expect_success 'git archive vs. bare' ' test_expect_success 'git archive vs. bare' '
(cd bare && git archive HEAD) >bare-archive.tar && (cd bare && git archive HEAD) >bare-archive.tar &&
test_cmp archive.tar bare-archive.tar test_cmp archive.tar bare-archive.tar