color box, display box, corrugated box, color card, blister card, color sleeve, hang tag, label

2014-08-31 Thread Jinghao Printing - CHINA
Hi, this is David Wu from Shanghai, China. We are a printing company, we can print color box, corrugated box, label, hang tag etc. Please let me know if you need these. I will send you the website then. Best regards, David Wu -- To unsubscribe from this list: send the line "unsubscribe git" in th

[PATCH] wt-status.c: Expand cut_line so the scissor line is 72 chars

2014-08-31 Thread Øyvind A . Holm
Change the size of the commit scissor line to 72 characters (the recommended maximum line length in log messages) so it can be used as a visual clue in editors using monospaced fonts. Signed-off-by: Øyvind A. Holm --- Documentation/git-commit.txt | 2 +- t/t7502-commit.sh| 2 +- wt-s

Re: [PATCH 4/6] fsck: check tag objects' headers

2014-08-31 Thread Junio C Hamano
Jeff King writes: > Hmm. But that is because "git tag" always makes one type of tag: one in > which the "tag" field is the same as the refname in which we store it. > So the name must be a valid refname there to meet the ref storage > requirement, and therefore the tag name must, too. > > But is

Re: [PATCH 2/2] index-pack: handle duplicate base objects gracefully

2014-08-31 Thread Junio C Hamano
Jeff King writes: > Broken ident lines are annoying, but not _too_ fundamentally bad. > Duplicate tree entries are a lot worse. Fsck even distinguishes between > "error" and "warning", but "index-pack --strict" treats both as a reason > to reject the object. We could perhaps loosen that, and make

Re: [PATCH] rev-parse: include HEAD in --all output

2014-08-31 Thread Max Kirillov
On Sun, Aug 31, 2014 at 11:30:54AM -0400, Jeff King wrote: > On Sun, Aug 31, 2014 at 01:24:48AM +0300, Max Kirillov wrote: > >> for_each_ref() does not include it itself, and without >> the hash the detached HEAD may be missed by some >> frontends (like gitk). >> >> Add test which verifies the he

[PATCH v2] reachable.c: add HEAD to reachability starting commits

2014-08-31 Thread Max Kirillov
HEAD is not explicitly used as a starting commit for calculating reachability, so if it's detached and reflogs are disabled it may be pruned. Add tests which demonstrate it. Test 'prune: prune former HEAD after checking out branch' also reverts changes to repository. Signed-off-by: Max Kirillov

[RFC PATCH 1/3] stylefix: pointers bind to the variable, not the type

2014-08-31 Thread David Aguilar
Signed-off-by: David Aguilar --- This is an RFC patch but this is probably fine as-is, and is orthogonal to the next two patches. builtin/clone.c | 7 --- commit.c| 2 +- commit.h| 2 +- reflog-walk.c | 2 +- reflog-walk.h | 2 +- refs.h | 2 +- remote-curl.c |

[RFC PATCH 3/3] core: improve header dependencies

2014-08-31 Thread David Aguilar
Remove includes that have already been included by another header. Signed-off-by: David Aguilar --- This patch is the culmination of the previous patches and is a pure removal. builtin/add.c | 3 --- builtin/blame.c | 4 builtin/branch.c| 4 builtin/checkout.

[RFC PATCH 2/3] headers: improve header dependencies

2014-08-31 Thread David Aguilar
Add missing includes or forward declarations where needed. Signed-off-by: David Aguilar --- If enum date_type were moved to object.h then we wouldn't need to include cache.h from commit.h, but this patch doesn't touch that. If we want to avoid including cache.h, another possibility is moving enu

Re: git fsck exit code?

2014-08-31 Thread Øyvind A . Holm
On 29 August 2014 22:18, David Turner wrote: > On Fri, 2014-08-29 at 12:21 -0700, Junio C Hamano wrote: > > Jeff King writes: > > > On Wed, Aug 27, 2014 at 06:10:12PM -0400, David Turner wrote: > > > > It looks like git fsck exits with 0 status even if there are > > > > some errors. The only case

Re: [PATCH 2/2] index-pack: handle duplicate base objects gracefully

2014-08-31 Thread René Scharfe
Am 31.08.2014 um 17:17 schrieb Jeff King: On Sat, Aug 30, 2014 at 06:00:59PM +0200, René Scharfe wrote: My only nit with patch 2: Petr Stodulka and Martin von Gagern should be mentioned as bug reporters. Yeah, I agree with that. And actually, you should get a Reported-by: on the first patch

Re: [PATCH v3] teach fast-export an --anonymize option

2014-08-31 Thread Jeff King
On Sun, Aug 31, 2014 at 06:34:08AM -0400, Eric Sunshine wrote: > >> I feel like this should be part of git-fast-export.txt, just to > >> increase the user's confidence in the tool (and I don't expect most > >> users to read this commit message). > > > > Hmph. Whenever I say "I think this patch is

Re: [PATCH] rev-parse: include HEAD in --all output

2014-08-31 Thread Jeff King
On Sun, Aug 31, 2014 at 01:24:48AM +0300, Max Kirillov wrote: > for_each_ref() does not include it itself, and without the hash > the detached HEAD may be missed by some frontends (like gitk). > > Add test which verifies the head is returned > > Update test t6018-rev-list-glob.sh which relied on

Re: [PATCH] reachable.c: add HEAD to reachability starting commits

2014-08-31 Thread Jeff King
On Sat, Aug 30, 2014 at 11:58:35PM +0300, Max Kirillov wrote: > HEAD is not explicitly used as a starting commit for > calculating reachability, so if it's detached and reflogs > are disabled it may be pruned. Eek, you're right. I think nobody noticed because the HEAD reflog usually picks it up (

Re: [PATCH 2/2] index-pack: handle duplicate base objects gracefully

2014-08-31 Thread Jeff King
On Sat, Aug 30, 2014 at 06:10:33PM -0700, Shawn Pearce wrote: > > We do detect and complain if --strict is given. Should we make it the > > default instead? I think it is still worthwhile to have a mode that can > > handle these packs. It may be the only reasonable way to recover the > > data from

Re: [PATCH 2/2] index-pack: handle duplicate base objects gracefully

2014-08-31 Thread Jeff King
On Sat, Aug 30, 2014 at 06:00:59PM +0200, René Scharfe wrote: > My only nit with patch 2: Petr Stodulka and Martin von > Gagern should be mentioned as bug reporters. Yeah, I agree with that. And actually, you should get a Reported-by: on the first patch. :) However, I think there are some grav

Re: [PATCH 3/2] t5309: mark delta-cycle failover tests as passing

2014-08-31 Thread Jeff King
On Sat, Aug 30, 2014 at 09:23:11AM -0400, Jeff King wrote: > The implications of this make me slightly nervous, though. In the > --fix-thin case, the resulting pack will have 3 objects: > > - A as a delta on B > - B as a delta on A > - a full copy of either A (or B) provided by --fix-thin >

Re: [PATCH v8 1/4] cache-tree: Create/update cache-tree on checkou

2014-08-31 Thread John Keeping
On Fri, Jul 11, 2014 at 09:44:33PM -0700, David Turner wrote: > When git checkout checks out a branch, create or update the > cache-tree so that subsequent operations are faster. > > update_main_cache_tree learned a new flag, WRITE_TREE_REPAIR. When > WRITE_TREE_REPAIR is set, portions of the cac

Re: [PATCH 22/32] checkout: support checking out into a new working directory

2014-08-31 Thread Philip Oakley
From: "Duy Nguyen" On Sun, Aug 31, 2014 at 11:49 AM, Duy Nguyen wrote: All checkouts share the same repository. Linked checkouts see the repository a bit different from the main checkout. When you perform the command git checkout --to The checkout at will have a

Re: [PATCH v3] teach fast-export an --anonymize option

2014-08-31 Thread Eric Sunshine
On Thu, Aug 28, 2014 at 8:32 AM, Jeff King wrote: > On Thu, Aug 28, 2014 at 05:30:44PM +0700, Duy Nguyen wrote: > >> On Thu, Aug 28, 2014 at 12:01 AM, Jeff King wrote: >> > You can get an overview of what will be shared >> > by running a command like: >> > >> > git fast-export --anonymize --all

[PATCH v2] stash: prefer --quiet over shell redirection

2014-08-31 Thread David Aguilar
Use `git rev-parse --verify --quiet` instead of redirecting stderr to /dev/null. Signed-off-by: David Aguilar --- git-stash.sh | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index bcc757b..2ff8b94 100755 --- a/git-stash.sh +++ b/git-

Re: [PATCH 2/2] stash: prefer --quiet over shell redirection

2014-08-31 Thread David Aguilar
On Sat, Aug 30, 2014 at 11:07:13PM +0200, Johannes Sixt wrote: > Am 30.08.2014 21:30, schrieb David Aguilar: > > @@ -392,12 +392,12 @@ parse_flags_and_rev() > > ;; > > esac > > > > - REV=$(git rev-parse --quiet --symbolic --verify "$1" 2>/dev/null) || { > > + REV=$(git rev-par