On Thu, Dec 27, 2012 at 04:11:51PM -0700, Martin Fick wrote:
For a single user repo this is not a big deal, the lock can
always be cleaned up manually (and it is a rare occurrence).
However, in a multi user server environment, possibly even
from multiple hosts over a shared filesystem
On Fri, Dec 28, 2012 at 07:50:14AM -0700, Martin Fick wrote:
Hmm, actually I believe that with a small modification to the
semantics described here it would be possible to make multi
repo/branch commits work. Simply allow the ref filename to
be locked by a transaction by appending the
On Fri, Dec 28, 2012 at 09:15:52AM -0800, Junio C Hamano wrote:
Martin Fick mf...@codeaurora.org writes:
Hmm, actually I believe that with a small modification to the
semantics described here it would be possible to make multi
repo/branch commits work
Shawn talked about adding
On Sat, Dec 29, 2012 at 12:27:47AM -0500, Jeff King wrote:
I think I tried the partial decompression for commit header and it did
not help much (or I misremember it, not so sure).
I'll see if I can dig up the reference, as it was something I was going
to look at next.
I tried the simple
On Sat, Dec 29, 2012 at 04:05:58AM -0500, Jeff King wrote:
On Sat, Dec 29, 2012 at 12:27:47AM -0500, Jeff King wrote:
I think I tried the partial decompression for commit header and it did
not help much (or I misremember it, not so sure).
I'll see if I can dig up the reference, as
Hi Peff,
Jeff King wrote:
--- a/read-cache.c
+++ b/read-cache.c
@@ -1800,6 +1800,8 @@ int write_index(struct index_state *istate, int newfd)
continue;
if (!ce_uptodate(ce) is_racy_timestamp(istate, ce))
On Sat, Dec 29, 2012 at 02:03:46AM -0800, Jonathan Nieder wrote:
--- a/read-cache.c
+++ b/read-cache.c
@@ -1800,6 +1800,8 @@ int write_index(struct index_state *istate, int newfd)
continue;
if (!ce_uptodate(ce) is_racy_timestamp(istate, ce))
Jeff King wrote:
I can't reproduce here. I can checkout v3.2.35, and I guess that the
patch you are applying comes from f5f1654, but I don't know your
local modification to sound/usb/midi.c.
No local modification. The unstaged change after git am --abort to
recover from a conflicted git am
Jeff King wrote:
Can you give more details?
$ GIT_TRACE=1 git am --abort
trace: exec: 'git-am' '--abort'
trace: run_command: 'git-am' '--abort'
trace: built-in: git 'rev-parse' '--parseopt' '--' '--abort'
trace: built-in: git 'rev-parse' '--git-dir'
trace: built-in: git 'rev-parse'
On Sat, Dec 29, 2012 at 02:34:30AM -0800, Jonathan Nieder wrote:
Jeff King wrote:
I can't reproduce here. I can checkout v3.2.35, and I guess that the
patch you are applying comes from f5f1654, but I don't know your
local modification to sound/usb/midi.c.
No local modification. The
Jeff King wrote:
Hrm. But your output does not say there is a conflict. It says you have
a local modification and it does not try the merge:
That's probably operator error on my part when gathering output to
paste into the email.
In other words, nothing to see there. :) Sorry for the
On Sat, Dec 29, 2012 at 02:34:30AM -0800, Jonathan Nieder wrote:
$ git am --abort
Unstaged changes after reset:
M sound/usb/midi.c
What does your index look like afterwards? Does it have a null sha1 in
it (check ls-files -s)?
$ git diff-index --abbrev HEAD
:100644
At 18:01 -0800 28 Dec 2012, Junio C Hamano gits...@pobox.com wrote:
One lesson we learned long time ago while doing hooks is to avoid
unbound number of command line arguments and instead feed them from
the standard input. I think this should do the same.
Good point. I had been trying to keep
At 18:08 -0800 28 Dec 2012, Junio C Hamano gits...@pobox.com wrote:
Aaron Schrab aa...@schrab.com writes:
Create find_hook() function to determine if a given hook exists and is
executable. If it is the path to the script will be returned, otherwise
NULL is returned.
Sounds like a sensible
On Fri, Dec 28, 2012 at 11:52 PM, Junio C Hamano gits...@pobox.com wrote:
Junio C Hamano gits...@pobox.com writes:
Primarily in order to force me concentrate on the releng for the
upcoming release, and also to encourage contributors to focus on
finding and fixing any last minute regressions
Aaron Schrab aa...@schrab.com writes:
At 18:01 -0800 28 Dec 2012, Junio C Hamano gits...@pobox.com wrote:
Will it be all-or-none, or I'll allow these but not those?
Currently it just uses the exit code to communicate that back, so it's
all-or-none. I think I'll keep that in the updated
Aaron Schrab aa...@schrab.com writes:
Since I'm going to be changing the interface for this hook in v2 of
the series so that it will be more complicated than can be readily
addressed with the run_hook() API (and will have use a fixed number of
arguments anyway) I'll be dropping the
Hi,
I'm not able to setup a public Git repository over plain HTTP with
MySQL authentication.
Both HTTP and authentication are provided by Apache2.
SETUP:
-
This setup is performed on Debian 6.0.4.
Apache2 (v. 2.2), with modules:
auth_mysql
WebDAV
Git (v. 1.7.8.3)
Git repository
On Sat, Dec 29, 2012 at 06:05:41AM -0500, Jeff King wrote:
[clear state from last run]
$ rm -rf .git/rebase-apply
$ git reset --hard
[apply the patch; we get a conflict]
$ git am -3sc
queue-3.2/alsa-usb-audio-fix-missing-autopm-for-midi-input.patch
[now run just the
On Sat, Dec 29, 2012 at 08:54:32PM +0100, Davide Baldini wrote:
SETUP:
-
[...]
Git repository has been configured as:
cd /var/www/public/GT_rulesets/GT00.git
git init --bare
mv hooks/post-update.sample hooks/post-update
git update server-info
chmode 777
Jeff King p...@peff.net wrote:
On Fri, Dec 28, 2012 at 09:15:52AM -0800, Junio C Hamano wrote:
Martin Fick mf...@codeaurora.org writes:
Hmm, actually I believe that with a small modification to the
semantics described here it would be possible to make multi
repo/branch commits
Jeff King p...@peff.net wrote:
On Fri, Dec 28, 2012 at 07:50:14AM -0700, Martin Fick wrote:
Hmm, actually I believe that with a small modification to the
semantics described here it would be possible to make multi
repo/branch commits work. Simply allow the ref filename to
be locked by a
Jeff King p...@peff.net wrote:
On Thu, Dec 27, 2012 at 04:11:51PM -0700, Martin Fick wrote:
My idea is based on using filenames to store sha1s instead of
file contents. To do this, the sha1 one of a ref would be
stored in a file in a directory named after the loose ref. I
believe this
When first doing a merge in git-gui, the Visualize Merge button is
quite helpful to visualize the changes due to a merge.
But once the merge is complete, there's not a similarly convenient
way to recreate that merge view in gitk.
This commit adds to gitk the ability to right-click on a merge
On 12/29/12 22:01, Jeff King wrote:
However, before trying to investigate that avenue, have you considered
using git's smart-http backend instead of WebDAV? It's significantly
more efficient. You can get details and example apache configuration
from git help http-backend.
Thank you for the
25 matches
Mail list logo
