Phil Hord writes:
> + merge a git-merge is in progress
> + am a git-am is in progress
> + rebase a git-rebase is in progress
> + rebase-interactive a git-rebase--interactive is in progress
> + cherry-picka git-cherry-pick is in
Tested against v1.7.12.4
Steps to reproduce:
A. cd $DIRTY_WORKING_COPY
B. git commit --patch --message $MESSAGE
C. Stage this hunk? e
Expected behavior:
After step C, the hunk opens in the user's editor
Actual behavior:
After step C, the hunk is selected une
So, this is due to the major AWS outage today. git-scm.com is hosted
on Heroku and thus on AWS. Heroku is continuing to bring up their
database systems in the wake of the massive AWS outage. Once that is
back online, git-scm.com will also be back online.
As for the git-fetch issue, we'll look i
These functions are called in sequencer.c, which is part of
libgit.a. This makes libgit.a potentially require builtin/merge.c for
external git commands.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
I made some unrelated changes in sequencer.c and this problem shown
up. merge-recursive.c is probably
On Mon, Oct 22, 2012 at 11:01 PM, Sverre Rabbelier wrote:
> On Mon, Oct 22, 2012 at 1:56 PM, Felipe Contreras
> wrote:
>> diff --git a/git-remote-testgit.py b/git-remote-testgit.py
>> index 5f3ebd2..b8707e6 100644
>> --- a/git-remote-testgit.py
>> +++ b/git-remote-testgit.py
>> @@ -159,6 +159,11
Recently git-status learned to display the state of the git
sequencer in long form to help the user remember an interrupted
command. This information is also useful in short form to
humans and scripts, but no option is available to boil it down.
Teach git-status to report the sequencer state in s
git pull --rebase does some clever tricks to find the base
for $upstream , but it forgets that we may not have any
branch at all. When this happens, git merge-base reports its
"usage" help in the middle of an otherwise successful
rebase operation, because git-merge is called with one too
few param
Uri Moszkowicz writes:
> Perhaps Git should switch to a single-file block text or binary format
> once a large number of tags becomes present in a repository.
This is what git pack-refs (called by git gc) does (by putting the refs
in .git/packed-refs).
Andreas.
--
Andreas Schwab, sch...@linux
I'm doing some testing on a large Git repository and am finding local
clones to take a very long time. After some investigation I've
determined that the problem is due to a very large number of tags
(~38k). Even with hard links, it just takes a really long time to
visit that many inodes. As it happ
On Mon, Oct 22, 2012 at 05:55:00PM +0200, Ævar Arnfjörð Bjarmason wrote:
> I was hoping to write something like this:
>
> [user]
> name = Luser
> email = some-defa...@example.com
> [include]
> path = ~/.gitconfig.d/user-email
>
> Where that file would contain:
>
On Mon, Oct 22, 2012 at 1:56 PM, Felipe Contreras
wrote:
> diff --git a/git-remote-testgit.py b/git-remote-testgit.py
> index 5f3ebd2..b8707e6 100644
> --- a/git-remote-testgit.py
> +++ b/git-remote-testgit.py
> @@ -159,6 +159,11 @@ def do_import(repo, args):
> ref = line[7:].strip()
>
'feature done' was missing, which allowed fast-import exit properly, and
transport-helper to continue checking for refs and what not when in fact
the remote-helper died.
Let's enable that, and make sure the error paths are triggered.
Now transport-helper correctly detects the errors from fast-imp
Am 21.10.2012 07:57, schrieb Michael Haggerty:
> Move the responsibility for normalizing the prefixes passed to
> longest_ancestor_length() to its caller. In t0060, only test
> longest_ancestor_lengths using normalized paths: remove empty entries
> and non-absolute paths, strip trailing slashes fr
On Mon, Oct 22, 2012 at 7:12 PM, Felipe Contreras
wrote:
> On Mon, Oct 22, 2012 at 4:31 PM, Felipe Contreras
> I've tried everything, and yet a SIGPIPE is detected only with
> remote-testgit, not with my code, and they both exit the same way, and
> at the same time, and fast-export exits the main
From: "W. Trevor King"
This removes a configuration step if you're trying to setup Ævar's
$ git submodule foreach 'git checkout $(git config --file
$toplevel/.gitmodules submodule.$name.branch) && git pull'
workflow from
commit f030c96d8643fa0a1a9b2bd9c2f36a77721fb61f
Author: Ævar Arnfj
On Mon, Oct 22, 2012 at 4:31 PM, Felipe Contreras
wrote:
> -> import-begin
> <- feature X
> <- feature Y
> -> import refs/heads/master
> <- exported stuff
> -> import refs/heads/devel
> <- exported stuff
> -> import-end
> <- done
>
> This would certainly makes things easier for transport-helpers
Herman van Rink writes:
> The problem is that I don't have the time to split all these out. Dag
> has indicated that he does not have the time either.
I would have the time to review and integrate separate patches. I do
not have time to unwrap the ball of wax and ensure the quality of each
feat
Here's one test failing (on HP NonStop, git-1.8.0), which needs to get enable
first.
/home/jojo/git/git/t $ PATH=/usr/local/bin:$PATH GIT_TEST_GIT_DAEMON=true bash
./t5570-git-daemon.sh
ok 1 - setup repository
ok 2 - create git-accessible bare repository
ok 3 - clone git repository
[946798748] C
Junio C Hamano writes:
> I haven't formed an opinion on the particular change as to how bad
> its collapsing unrelated changes into a single change is. Maybe they
> are not as unrelated and form a coherent whole. Maybe not.
It is difficult for me to tell which is one of the red flags that cau
Herman van Rink writes:
> On 10/21/2012 08:32 AM, Junio C Hamano wrote:
>> Herman van Rink writes:
>>
>>> Junio, Could you please consider merging the single commit from my
>>> subtree-updates branch? https://github.com/helmo/git/tree/subtree-updates
>> In general, in areas like contrib/ where t
On Mon, Oct 22, 2012 at 3:46 PM, Johannes Sixt wrote:
> Am 10/22/2012 13:50, schrieb Felipe Contreras:
>> On Mon, Oct 22, 2012 at 8:35 AM, Johannes Sixt wrote:
>>> Another thought: In your use-case, isn't it so that it would be an error
>>> that the process exited for whatever reason? I.e., even
This fixes the vast majority of test failures on HP NonStop.
Signed-off-by: Joachim Schmitz
---
A few more still insist on /usr/local/bin being 1st in PATH and having done that
we're down to one single failing test, t0301 #12 "helper (cache --timeout=1)
times out"
Makefile | 9 +
1 file
"Joachim Schmitz" schrieb im Newsbeitrag
news:...
> Hi folks
>
> I'm trying to understand why certain tests in 'make test' fail. Here's the
> first one
>
> $ ../git --version
> git version 1.8.0.rc2.5.g6b89306
> $ GIT_TEST_CMP_USE_COPIED_CONTEXT=true ./t-basic.sh # our diff doesn't
> unde
Am 10/22/2012 13:50, schrieb Felipe Contreras:
> On Mon, Oct 22, 2012 at 8:35 AM, Johannes Sixt wrote:
>> Another thought: In your use-case, isn't it so that it would be an error
>> that the process exited for whatever reason? I.e., even if it exited with
>> code 0 ("success"), it would be an erro
As you can see from the below, I can't seem to get it to give me more
verbose results of what's being merged (as in the actual merge below)
with --stat or -v .. is it supposed to do that?
(develop)>$ git merge --no-commit --stat -v widget_twitter
Automatic merge went well; stopped before committin
Hy!
I would like to sign each commit with a X.509 certificate and a private key
stored on a PKCS#11 token. I assume that that should be possible somehow using
a hook which calls openssl. Does somebody know a working implementation of
this?
cheers
Mat
--
To unsubscribe from this list: send the
I have a bunch of branches in my repo (a, b, c, …), and I'd like to
check them out into subdirectories of another branch (index). My
initial inclination was to use something like
$ git checkout index
$ git branch
a
b
c
* index
$ git submodule add -b a --reference ./ ./ dir-for
Am 10/22/2012 15:06, schrieb Ævar Arnfjörð Bjarmason:
> On Mon, Oct 22, 2012 at 1:58 PM, Ulrich Windl
> wrote:
>> However there's one little thing I noticed with "git diff": The
>> conte4xt lines (staring with "@@") show the current function (in Perl
>> and C), but they show the current "feature
David Soria Parra:
- if (p->field < 0 || GREP_HEADER_FIELD_MAX <= p->field)
+ if (GREP_HEADER_FIELD_MAX <= p->field)
A friend taught me this trick, which will check that it isn't negative
for compilers that have the enumeration be signed (notably MSVC),
while not
On Mon, Oct 22, 2012 at 1:58 PM, Ulrich Windl
wrote:
> However there's one little thing I noticed with "git diff":
> The conte4xt lines (staring with "@@") show the current function (in Perl and
> C), but they show the current "feature clause" in Eiffel (as opposed to the
> expected current feat
The commit "git-send-email: introduce compose-encoding" introduced
the compose-encoding option to specify the introduction email encoding
(--compose option), but the email Subject encoding was still hardcoded
to UTF-8.
Signed-off-by: Krzysztof Mazur
---
Patch against km/send-email-compose-encodin
Hi!
After a longer pause, I did some programming in Eiffel again, and while doing
so, why not use Git? It works!
However there's one little thing I noticed with "git diff":
The conte4xt lines (staring with "@@") show the current function (in Perl and
C), but they show the current "feature claus
On Mon, Oct 22, 2012 at 8:35 AM, Johannes Sixt wrote:
> Am 10/21/2012 21:19, schrieb Felipe Contreras:
> I would expect the function to be usable in this way:
>
> start_command(&proc);
>
> loop {
> if (check_command(&proc))
> break;
>
On 10/21/2012 08:51 AM, Junio C Hamano wrote:
> Michael Haggerty writes:
>
>> This patch series has the side effect that all of the directories
>> listed in GIT_CEILING_DIRECTORIES are accessed *unconditionally* to
>> resolve any symlinks that are present in their paths. It is
>> admittedly odd
34 matches
Mail list logo
