Skip to content

Commit 03c6e97

Browse files
gitstergitster
committed
Merge branch 'maint-1.6.4' into maint-1.6.5
* maint-1.6.4: Fix mis-backport of t7002 base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". textconv: stop leaking file descriptors commit: --cleanup is a message option git count-objects: handle packs bigger than 4G t7102: make the test fail if one of its check fails
2 parents c8cba79 + 814035c commit 03c6e97

File tree

8 files changed

+47
-43
lines changed

8 files changed

+47
-43
lines changed

‎base85.c‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,8 @@ int decode_85(char *dst, const char *buffer, int len)
5757
de = de85[ch];
5858
if (--de < 0)
5959
return error("invalid base85 alphabet %c", ch);
60-
/*
61-
* Detect overflow. The largest
62-
* 5-letter possible is "|NsC0" to
63-
* encode 0xffffffff, and "|NsC" gives
64-
* 0x03030303 at this point (i.e.
65-
* 0xffffffff = 0x03030303 * 85).
66-
*/
67-
if (0x03030303 < acc ||
60+
/* Detect overflow. */
61+
if (0xffffffff / 85 < acc ||
6862
0xffffffff - de < (acc *= 85))
6963
return error("invalid base85 sequence %.5s", buffer-5);
7064
acc += de;
@@ -84,8 +78,6 @@ int decode_85(char *dst, const char *buffer, int len)
8478

8579
void encode_85(char *buf, const unsigned char *data, int bytes)
8680
{
87-
prep_base85();
88-
8981
say("encode 85");
9082
while (bytes) {
9183
unsigned acc = 0;
@@ -118,7 +110,7 @@ int main(int ac, char **av)
118110
int len = strlen(av[2]);
119111
encode_85(buf, av[2], len);
120112
if (len <= 26) len = len + 'A' - 1;
121-
else len = len + 'a' - 26 + 1;
113+
else len = len + 'a' - 26 - 1;
122114
printf("encoded: %c%s\n", len, buf);
123115
return 0;
124116
}

‎builtin-branch.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -637,10 +637,12 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
637637
rename_branch(head, argv[0], rename > 1);
638638
else if (rename && (argc == 2))
639639
rename_branch(argv[0], argv[1], rename > 1);
640-
else if (argc <= 2)
640+
else if (argc <= 2) {
641+
if (kinds != REF_LOCAL_BRANCH)
642+
die("-a and -r options to 'git branch' do not make sense with a branch name");
641643
create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
642644
force_create, reflog, track);
643-
else
645+
} else
644646
usage_with_options(builtin_branch_usage, options);
645647

646648
return 0;

‎builtin-checkout.c‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ static int merge_working_tree(struct checkout_opts *opts,
396396
topts.initial_checkout = is_cache_unborn();
397397
topts.update = 1;
398398
topts.merge = 1;
399-
topts.gently = opts->merge;
399+
topts.gently = opts->merge && old->commit;
400400
topts.verbose_update = !opts->quiet;
401401
topts.fn = twoway_merge;
402402
topts.dir = xcalloc(1, sizeof(*topts.dir));
@@ -421,7 +421,13 @@ static int merge_working_tree(struct checkout_opts *opts,
421421
struct merge_options o;
422422
if (!opts->merge)
423423
return 1;
424-
parse_commit(old->commit);
424+
425+
/*
426+
* Without old->commit, the below is the same as
427+
* the two-tree unpack we already tried and failed.
428+
*/
429+
if (!old->commit)
430+
return 1;
425431

426432
/* Do more real merge */
427433

‎builtin-commit.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ static int opt_parse_m(const struct option *opt, const char *arg, int unset)
8686
static struct option builtin_commit_options[] = {
8787
OPT__QUIET(&quiet),
8888
OPT__VERBOSE(&verbose),
89-
OPT_GROUP("Commit message options"),
9089

90+
OPT_GROUP("Commit message options"),
9191
OPT_FILENAME('F', "file", &logfile, "read log from file"),
9292
OPT_STRING(0, "author", &force_author, "AUTHOR", "override author for commit"),
9393
OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m),
@@ -96,6 +96,8 @@ static struct option builtin_commit_options[] = {
9696
OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),
9797
OPT_FILENAME('t', "template", &template_file, "use specified template file"),
9898
OPT_BOOLEAN('e', "edit", &edit_flag, "force edit of commit"),
99+
OPT_STRING(0, "cleanup", &cleanup_arg, "default", "how to strip spaces and #comments from message"),
100+
/* end commit message options */
99101

100102
OPT_GROUP("Commit contents options"),
101103
OPT_BOOLEAN('a', "all", &all, "commit all changed files"),
@@ -107,7 +109,7 @@ static struct option builtin_commit_options[] = {
107109
OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),
108110
{ OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, "mode", "show untracked files, optional modes: all, normal, no. (Default: all)", PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
109111
OPT_BOOLEAN(0, "allow-empty", &allow_empty, "ok to record an empty change"),
110-
OPT_STRING(0, "cleanup", &cleanup_arg, "default", "how to strip spaces and #comments from message"),
112+
/* end commit contents options */
111113

112114
OPT_END()
113115
};

‎builtin-count-objects.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
static void count_objects(DIR *d, char *path, int len, int verbose,
1313
unsigned long *loose,
14-
unsigned long *loose_size,
14+
off_t *loose_size,
1515
unsigned long *packed_loose,
1616
unsigned long *garbage)
1717
{
@@ -77,7 +77,7 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix)
7777
int len = strlen(objdir);
7878
char *path = xmalloc(len + 50);
7979
unsigned long loose = 0, packed = 0, packed_loose = 0, garbage = 0;
80-
unsigned long loose_size = 0;
80+
off_t loose_size = 0;
8181
struct option opts[] = {
8282
OPT__VERBOSE(&verbose),
8383
OPT_END(),
@@ -103,7 +103,7 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix)
103103
if (verbose) {
104104
struct packed_git *p;
105105
unsigned long num_pack = 0;
106-
unsigned long size_pack = 0;
106+
off_t size_pack = 0;
107107
if (!packed_git)
108108
prepare_packed_git();
109109
for (p = packed_git; p; p = p->next) {
@@ -116,15 +116,15 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix)
116116
num_pack++;
117117
}
118118
printf("count: %lu\n", loose);
119-
printf("size: %lu\n", loose_size / 1024);
119+
printf("size: %lu\n", (unsigned long) (loose_size / 1024));
120120
printf("in-pack: %lu\n", packed);
121121
printf("packs: %lu\n", num_pack);
122-
printf("size-pack: %lu\n", size_pack / 1024);
122+
printf("size-pack: %lu\n", (unsigned long) (size_pack / 1024));
123123
printf("prune-packable: %lu\n", packed_loose);
124124
printf("garbage: %lu\n", garbage);
125125
}
126126
else
127127
printf("%lu objects, %lu kilobytes\n",
128-
loose, loose_size / 1024);
128+
loose, (unsigned long) (loose_size / 1024));
129129
return 0;
130130
}

‎diff.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3720,11 +3720,13 @@ static char *run_textconv(const char *pgm, struct diff_filespec *spec,
37203720
if (start_command(&child) != 0 ||
37213721
strbuf_read(&buf, child.out, 0) < 0 ||
37223722
finish_command(&child) != 0) {
3723+
close(child.out);
37233724
strbuf_release(&buf);
37243725
remove_tempfile();
37253726
error("error running textconv command '%s'", pgm);
37263727
return NULL;
37273728
}
3729+
close(child.out);
37283730
remove_tempfile();
37293731

37303732
return strbuf_detach(&buf, outsize);

‎t/t5403-post-checkout-hook.sh‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ test_description='Test the post-checkout hook.'
77
. ./test-lib.sh
88

99
test_expect_success setup '
10-
echo Data for commit0. >a &&
11-
echo Data for commit0. >b &&
12-
git update-index --add a &&
13-
git update-index --add b &&
14-
tree0=$(git write-tree) &&
15-
commit0=$(echo setup | git commit-tree $tree0) &&
16-
git update-ref refs/heads/master $commit0 &&
17-
git clone ./. clone1 &&
18-
git clone ./. clone2 &&
19-
GIT_DIR=clone2/.git git branch -a new2 &&
20-
echo Data for commit1. >clone2/b &&
21-
GIT_DIR=clone2/.git git add clone2/b &&
22-
GIT_DIR=clone2/.git git commit -m new2
10+
echo Data for commit0. >a &&
11+
echo Data for commit0. >b &&
12+
git update-index --add a &&
13+
git update-index --add b &&
14+
tree0=$(git write-tree) &&
15+
commit0=$(echo setup | git commit-tree $tree0) &&
16+
git update-ref refs/heads/master $commit0 &&
17+
git clone ./. clone1 &&
18+
git clone ./. clone2 &&
19+
GIT_DIR=clone2/.git git branch new2 &&
20+
echo Data for commit1. >clone2/b &&
21+
GIT_DIR=clone2/.git git add clone2/b &&
22+
GIT_DIR=clone2/.git git commit -m new2
2323
'
2424

2525
for clone in 1 2; do

‎t/t7102-reset.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -139,19 +139,19 @@ test_expect_success \
139139
test_expect_success \
140140
'resetting to HEAD with no changes should succeed and do nothing' '
141141
git reset --hard &&
142-
check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
142+
check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
143143
git reset --hard HEAD &&
144-
check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
144+
check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
145145
git reset --soft &&
146-
check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
146+
check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
147147
git reset --soft HEAD &&
148-
check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
148+
check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
149149
git reset --mixed &&
150-
check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
150+
check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
151151
git reset --mixed HEAD &&
152-
check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
152+
check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
153153
git reset &&
154-
check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
154+
check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
155155
git reset HEAD &&
156156
check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
157157
'

0 commit comments

Comments
 (0)