Skip to content

Commit 5611972

Browse files
committed
Merge branch 'maint'
* maint: Fix uninitialized variable in get_refs_via_rsync(). Document git-blame triple -C option
2 parents 0346e32 + b9cb077 commit 5611972

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Documentation/blame-options.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,10 @@ commit.
9898
files that were modified in the same commit. This is
9999
useful when you reorganize your program and move code
100100
around across files. When this option is given twice,
101-
the command additionally looks for copies from all other
102-
files in the parent for the commit that creates the file.
101+
the command additionally looks for copies from other
102+
files in the commit that creates the file. When this
103+
option is given three times, the command additionally
104+
looks for copies from other files in any commit.
103105
+
104106
<num> is optional but it is the lower bound on the number of
105107
alphanumeric characters that git must detect as moving

Documentation/git-blame.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ SYNOPSIS
99
--------
1010
[verse]
1111
'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m]
12-
[-S <revs-file>] [-M] [-C] [-C] [--since=<date>]
12+
[-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]
1313
[<rev> | --contents <file> | --reverse <rev>] [--] <file>
1414

1515
DESCRIPTION

transport.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ static const char *rsync_url(const char *url)
143143
static struct ref *get_refs_via_rsync(struct transport *transport, int for_push)
144144
{
145145
struct strbuf buf = STRBUF_INIT, temp_dir = STRBUF_INIT;
146-
struct ref dummy, *tail = &dummy;
146+
struct ref dummy = {0}, *tail = &dummy;
147147
struct child_process rsync;
148148
const char *args[5];
149149
int temp_dir_len;

0 commit comments

Comments
 (0)