diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2016-07-01 18:03:31 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 11:48:25 -0700 |
commit | bc437d10202c015a5733f706dc44fa6bbf4d85b9 (patch) | |
tree | 47dfb2453743e78b671584e08d9abe3af9e9d259 /Documentation/git-fetch.txt | |
parent | 6bc91f23a6e14d540ab6950b438d40cf678143f0 (diff) | |
download | git-bc437d10202c015a5733f706dc44fa6bbf4d85b9.tar.gz |
fetch: reduce duplicate in ref update status lines with placeholder
In the "remote -> local" line, if either ref is a substring of the
other, the common part in the other string is replaced with "*". For
example
abc -> origin/abc
refs/pull/123/head -> pull/123
become
abc -> origin/*
refs/*/head -> pull/123
Activated with fetch.output=compact.
For the record, this output is not perfect. A single giant ref can
push all refs very far to the right and likely be wrapped around. We
may have a few options:
- exclude these long lines smarter
- break the line after "->", exclude it from column width calculation
- implement a new format, { -> origin/}foo, which makes the problem
go away at the cost of a bit harder to read
- reverse all the arrows so we have "* <- looong-ref", again still
hard to read.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-fetch.txt')
-rw-r--r-- | Documentation/git-fetch.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index 771dde51cd..9e4216999d 100644 --- a/Documentation/git-fetch.txt +++ b/Documentation/git-fetch.txt @@ -116,6 +116,11 @@ representing the status of a single ref. Each line is of the form: The status of up-to-date refs is shown only if the --verbose option is used. +In compact output mode, specified with configuration variable +fetch.output, if either entire `<from>` or `<to>` is found in the +other string, it will be substituted with `*` in the other string. For +example, `master -> origin/master` becomes `master -> origin/*`. + flag:: A single character indicating the status of the ref: (space);; for a successfully fetched fast-forward; |