Browse Source

Merge branch 'maint'

* maint:
  Fix uninitialized variable in get_refs_via_rsync().
  Document git-blame triple -C option
maint
Junio C Hamano 15 years ago
parent
commit
561197238e
  1. 6
      Documentation/blame-options.txt
  2. 2
      Documentation/git-blame.txt
  3. 2
      transport.c

6
Documentation/blame-options.txt

@ -98,8 +98,10 @@ commit.
files that were modified in the same commit. This is files that were modified in the same commit. This is
useful when you reorganize your program and move code useful when you reorganize your program and move code
around across files. When this option is given twice, around across files. When this option is given twice,
the command additionally looks for copies from all other the command additionally looks for copies from other
files in the parent for the commit that creates the file. files in the commit that creates the file. When this
option is given three times, the command additionally
looks for copies from other files in any commit.
+ +
<num> is optional but it is the lower bound on the number of <num> is optional but it is the lower bound on the number of
alphanumeric characters that git must detect as moving alphanumeric characters that git must detect as moving

2
Documentation/git-blame.txt

@ -9,7 +9,7 @@ SYNOPSIS
-------- --------
[verse] [verse]
'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m] 'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m]
[-S <revs-file>] [-M] [-C] [-C] [--since=<date>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]
[<rev> | --contents <file> | --reverse <rev>] [--] <file> [<rev> | --contents <file> | --reverse <rev>] [--] <file>


DESCRIPTION DESCRIPTION

2
transport.c

@ -143,7 +143,7 @@ static const char *rsync_url(const char *url)
static struct ref *get_refs_via_rsync(struct transport *transport, int for_push) static struct ref *get_refs_via_rsync(struct transport *transport, int for_push)
{ {
struct strbuf buf = STRBUF_INIT, temp_dir = STRBUF_INIT; struct strbuf buf = STRBUF_INIT, temp_dir = STRBUF_INIT;
struct ref dummy, *tail = &dummy; struct ref dummy = {0}, *tail = &dummy;
struct child_process rsync; struct child_process rsync;
const char *args[5]; const char *args[5];
int temp_dir_len; int temp_dir_len;

Loading…
Cancel
Save