Skip to main content

Browse the archive

Revision c7cb333f60db9b8313da75c2075a3619202e905d authored by Junio C Hamano on 12 March 2014, 20:43:51 UTC, committed by Junio C Hamano on 12 March 2014, 21:08:05 UTC 
wt-status: lift the artificual "at least 20 columns" floor
 
When we show unmerged paths, we had an artificial 20 columns floor
for the width of labels (e.g. "both deleted:") shown next to the
pathnames.  Depending on the locale, this may result in a label that
is too wide when all the label strings are way shorter than 20
columns, or no-op when a label string is longer than 20 columns.

Just drop the artificial floor.  The screen real estate is better
utilized this way when all the strings are shorter.

Adjust the tests to this change.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 8f17f5b
Raw File
git-unpack-objects.txt 
git-unpack-objects(1)
=====================

NAME
----
git-unpack-objects - Unpack objects from a packed archive


SYNOPSIS
--------
[verse]
'git unpack-objects' [-n] [-q] [-r] [--strict] < <pack-file>


DESCRIPTION
-----------
Read a packed archive (.pack) from the standard input, expanding
the objects contained within and writing them into the repository in
"loose" (one object per file) format.

Objects that already exist in the repository will *not* be unpacked
from the pack-file.  Therefore, nothing will be unpacked if you use
this command on a pack-file that exists within the target repository.

See linkgit:git-repack[1] for options to generate
new packs and replace existing ones.

OPTIONS
-------
-n::
        Dry run.  Check the pack file without actually unpacking
	the objects.

-q::
	The command usually shows percentage progress.  This
	flag suppresses it.

-r::
	When unpacking a corrupt packfile, the command dies at
	the first corruption.  This flag tells it to keep going
	and make the best effort to recover as many objects as
	possible.

--strict::
	Don't write objects with broken content or links.

GIT
---
Part of the linkgit:git[1] suite
back to top