From: Johannes Sixt <j6t@kdbg.org>
To: Jeff King <peff@peff.net>, X H <music_is_live_lg@hotmail.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Git force push fails after a rejected push (unpack failed)?
Date: Wed, 08 Jul 2015 19:41:48 +0200 [thread overview]
Message-ID: <559D60DC.4010304@kdbg.org> (raw)
In-Reply-To: <20150707194956.GA13792@peff.net>
Am 07.07.2015 um 21:49 schrieb Jeff King:
> On Tue, Jul 07, 2015 at 09:31:25PM +0200, X H wrote:
>
>> For the moment, I'm the only one pushing to the remote, always with
>> the same user (second user is planned). I use git-for-windows which is
>> based on MSYS2. I have mounted the network share with noacl option so
>> permissions should be handled by the Windows share. I'm in a group
>> which has read/write access. I have not configured
>> core.sharedrepository, I don't think it is useful with noacl since
>> unix group are not used in this case. The permission for the folder
>> above the file with permission denied is rw, but this file is read
>> only so if git try to modify it it won't work.
>
> Ah, so this is not a push to a server, but to a share mounted on the
> local box?
>
> That is leaving my realm of expertise. I'm not sure if it could be a
> misconfiguration in your share setup, or that git is trying to do
> something that would work on a Unix machine, but not on a Windows share.
> You might want to ask on the msysgit list:
>
> https://groups.google.com/forum/#!forum/msysgit
>
>> Why does git try to write a file with the same name? If I amend a
>> commit isn't the sha modified?
>
> Yes, but remember that git stores all of the objects for all of the
> commits. So for some reason your push is perhaps trying to send an
> object that the other side already has. Usually this does not happen
> (the receiver says "I already have these commits, do not bother sending
> their objects"), but it's possible that you have an object that is not
> referenced by any commit, or a similar situation. It's hard to say
> without looking at the repository.
After a non-fast-forward push fails, a subsequent forced push sends the
same set of objects, which are already present at the server side, but
are dangling objects.
Apparently, Git for Windows fails to replace the read-only files that
live on the network file system.
I have observed this recently, as well. I haven't dug into the detailed
failure mode, yet. In my case, I have a daily repack running on the
server side (it's a Samba share on a Linux box), that garbage-collects
the dangling objects. Usually, the next day the forced push is
successful. I know this is not very helpful if you can't wait a day for
the next push attempt...
-- Hannes
next prev parent reply other threads:[~2015-07-08 17:42 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-07 13:45 Git force push fails after a rejected push (unpack failed)? X H
2015-07-07 14:13 ` Jeff King
[not found] ` <DUB120-W36B78FEE6DC80BDCB05D7FF6920@phx.gbl>
2015-07-07 19:49 ` Jeff King
2015-07-07 23:05 ` Eric Sunshine
2015-07-08 17:41 ` Johannes Sixt [this message]
2015-07-08 18:05 ` Jeff King
2015-07-08 18:33 ` [PATCH] check_and_freshen_file: fix reversed success-check Jeff King
2015-07-08 19:24 ` Junio C Hamano
2015-07-08 20:33 ` [PATCH v2] " Jeff King
2015-07-08 21:03 ` [PATCH] " Johannes Sixt
2015-07-09 20:51 ` Johannes Sixt
2015-07-09 22:48 ` Jeff King
2015-07-11 22:21 ` X H
2015-07-13 3:52 ` Jeff King
2015-07-13 19:58 ` X H
2015-07-08 20:28 ` Git force push fails after a rejected push (unpack failed)? X H
2015-07-08 20:56 ` Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=559D60DC.4010304@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=music_is_live_lg@hotmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).