On Wed, Apr 23, 2014 at 03:05:42PM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > On Wed, Apr 23, 2014 at 10:39:23AM -0700, Junio C Hamano wrote:
> >> Are these three patches the same as what has been queued on
> >> mt/patch-id-stable topic and cooking in 'next' for a few weeks
Felipe Contreras writes:
> Matthieu Moy wrote:
>> Felipe Contreras writes:
>>
>> > Commit 26cd160 (rebase -i: use a better reflog message) tried to produce
>> > a better reflog message, however, it seems a statement was introduced by
>> > mistake.
>> >
>> > 'comment_for_reflog start' basically
Felipe Contreras wrote:
>This is a false dichotomy; there aren't just two kinds
> of Git users.
>
> There is such a category of Git users who are not
> fresh-out-of-the-boat, yet not power users either.
Oh, I didn't mean to suggest a dichotomy of any kind. However these
are the two groups (I
sugge
Felipe Contreras writes:
> David Kastrup wrote:
>
>> Life's hardness is not proportional to the number of typed characters
>
> It is. Why do you think people set aliases? To make their life harder?
>
> Anyway, if you disagree change one of your frequently used passwords
> to a chapter of The Lord
d...@mailtor.net writes:
> It would be nice if we could change the flags to either
>
> a) avoid cutting off
> b) indicate something has been cut off (<- I prefer this)
>
> I assume there are more people with a similar workflow who're still
> unaware of this feature.
>
> I would joke about how 3
James Denholm wrote:
> Felipe Contreras wrote:
> > It is when they start to use Git seriously and type them a lot.
>
> Felipe, I think you refute your own point here, because people _learning_ git
> aren't power-users. They might be one day, but not that day. If power-users
> are complaining that
Felipe Contreras wrote:
>>David Lang wrote:
>> agreed, of all the things that people complain
about regarding learning git,
>> the fact that the commands are words instead of
cryptic 2 letter
>> abberviations is not one of them.
>It is when they start to use Git seriously and type
them a lot.
Feli
On Wed, Apr 23, 2014 at 07:49:09AM -0400, Greg M wrote:
> > The easiest way to find it is probably to attach a debugger to the
> > running git-remote-https, and get a backtrace when it dies from SIGPIPE.
> > You'll probably want to install your system's debug packages for curl,
> > too.
> >
>
> T
David Lang wrote:
> On Wed, 23 Apr 2014, Felipe Contreras wrote:
>
> > David Lang wrote:
> >> agreed, of all the things that people complain about regarding learning
> >> git,
> >> the fact that the commands are words instead of cryptic 2 letter
> >> abberviations is not one of them.
> >
> > It i
Hi,
Sorry it took too long to reply to this.
Junio C Hamano wrote:
> Felipe Contreras writes:
>
> > Junio C Hamano wrote:
> >> Junio C Hamano writes:
> >> > Felipe Contreras writes:
> >
> >> But it does not have to stay that way. In order to move things
> >> forward in that direction, this n
On Wed, 23 Apr 2014, Felipe Contreras wrote:
David Lang wrote:
agreed, of all the things that people complain about regarding learning git,
the fact that the commands are words instead of cryptic 2 letter
abberviations is not one of them.
It is when they start to use Git seriously and type th
David Lang wrote:
> agreed, of all the things that people complain about regarding learning git,
> the fact that the commands are words instead of cryptic 2 letter
> abberviations is not one of them.
It is when they start to use Git seriously and type them a lot.
> The complaints tend to be far m
David Kastrup wrote:
> Felipe Contreras writes:
>
> > Theodore Ts'o wrote:
> >
> >> This is especially true for commands which might not be used as often
> >> -- e.g., "rebase", and for commands where the meaning of "git commit"
> >> without any argument is qualitatively different from what "ci"
Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > I am not fundamentally opposed. I just do not think it would add
> > much value to new people at this point, and it will actively hurt
> > if we shoved barely cooked one in 2.0.
> >
> > A few thinking points that are necessary to be worked out
Signed-off-by: Felipe Contreras
---
Documentation/git-cherry-pick.txt | 6 +-
Documentation/git-revert.txt | 6 +-
builtin/revert.c | 1 +
sequencer.c | 11 +++
sequencer.h | 1 +
5 files changed, 19 insertions(
And use struct rewrite.
Signed-off-by: Felipe Contreras
---
builtin/commit.c | 38 +-
rewrite.c| 32
rewrite.h| 1 +
3 files changed, 38 insertions(+), 33 deletions(-)
diff --git a/builtin/commit.c b/builtin/c
So it can be used by other tools (e.g. git rebase), and the right action
is passed to the hooks and notes rewrite stuff.
Signed-off-by: Felipe Contreras
---
builtin/revert.c | 2 ++
sequencer.c | 4
sequencer.h | 2 ++
3 files changed, 8 insertions(+)
diff --git a/builtin/revert.
If no action-name is specified, nothing is done.
Signed-off-by: Felipe Contreras
---
Documentation/config.txt | 9 -
Documentation/githooks.txt | 8
git-rebase--interactive.sh | 4 ++--
sequencer.c| 28 +++-
t/t3512-re
Will be useful for the next commits.
Signed-off-by: Felipe Contreras
---
sequencer.c | 22 +-
sequencer.h | 1 +
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c
index a258627..426fddd 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -14,
Akin to 'am --skip' and 'rebase --skip'.
Signed-off-by: Felipe Contreras
---
Documentation/git-cherry-pick.txt | 1 +
Documentation/git-revert.txt | 1 +
Documentation/sequencer.txt | 3 +++
builtin/revert.c | 6 ++
sequencer.c | 24 +
Signed-off-by: Felipe Contreras
---
sequencer.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 426fddd..fc0dd04 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -1056,7 +1056,7 @@ static int continue_single_pick(void)
return run_co
Pretty much what it says on the tin.
Signed-off-by: Felipe Contreras
---
Documentation/git-cherry-pick.txt | 3 +++
builtin/revert.c| 2 ++
sequencer.c | 6 ++
sequencer.h | 1 +
t/t3508-cherry-pick-many-commits.sh | 1
And use it on commit.c.
Signed-off-by: Felipe Contreras
---
builtin/commit.c | 8 +---
rewrite.c| 18 ++
rewrite.h| 1 +
3 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index ea42f22..b5287d6 100644
--- a/b
Signed-off-by: Felipe Contreras
---
sequencer.c | 10 +-
t/t3504-cherry-pick-rerere.sh | 39 +++
2 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c
index c01ad08..a258627 100644
--- a/sequencer.c
+
Hi,
In the process of revamping 'git rebase' I found many areas of improvments in
`git cherry-pick`, here are the patches to improve the situation.
These were prettuch sent before already, but this time I dropped the second
part of the series to improve 'git rebase'.
Felipe Contreras (12):
ch
So that we can load and store rewrites, as well as other operations on a
list of rewritten commits.
Signed-off-by: Felipe Contreras
---
Makefile | 2 ++
rewrite.c | 71 +++
rewrite.h | 18
3 files changed, 91 insertio
Signed-off-by: Felipe Contreras
---
sequencer.c | 2 +-
t/t3510-cherry-pick-sequence.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 90cac7b..c94942a 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -662,7 +662,7 @@ static
From: James Denholm
contrib/subtree/Makefile is a shambles in regards to it's consistency
with other makefiles, which makes subtree overly painful to include in
build scripts.
Two major issues are present:
Firstly, calls to git itself (for $(gitdir) and $(gitver)), making
building difficult on
Junio C Hamano wrote:
> Felipe Contreras writes:
>
> >> >> I have a branch which should always be recompiled on update;
> >> >> post-update-branch would be a good place for that.
> >> >
> >> > And why would pre-update-branch not serve that purpose?
> >>
> >> Because the code that needs to be com
Junio C Hamano wrote:
> Felipe Contreras writes:
>
> > Junio C Hamano wrote:
> >> Felipe Contreras writes:
> >>
> >> > ... there are _already_ hooks without pre/post.
> >>
> >> Like commit-msg? Yes, it would have been nicer if it were named
> >> verify-commit-message or something.
> >
> > No
Max Horn wrote:
> On 23.04.2014, at 22:54, Felipe Contreras wrote:
> > Max Horn wrote:
> >> On 21.04.2014, at 22:37, Felipe Contreras
> >> wrote:
> >>
> >>> The remote-helpers in contrib/remote-helpers have proved to work, be
> >>> reliable, and stable. It's time to move them out of contrib, an
(cc-ing Mark Nudelman, less maintainer)
Hi,
d...@mailtor.net wrote:
> Consider this diff, printed by `git diff`
>
>#!/usr/bin/env python
> -print('foo')
> +print('bar')
>
> Looks ok to merge and run.
>
> But, after disabling the pager:
Unfortunately there are other kinds of s
hello list,
as mentioned earlier on IRC, I'm a bit concerned about the default LESS flags
used by git.
The S option causes git to cut off everything to the right
Consider this diff, printed by `git diff`
#!/usr/bin/env python
-print('foo')
+print('bar')
Looks ok to mer
Felipe Contreras writes:
>> >> I have a branch which should always be recompiled on update;
>> >> post-update-branch would be a good place for that.
>> >
>> > And why would pre-update-branch not serve that purpose?
>>
>> Because the code that needs to be compiled is not yet in the workspace
>
>
On 23.04.2014, at 22:54, Felipe Contreras wrote:
> Max Horn wrote:
>> On 21.04.2014, at 22:37, Felipe Contreras wrote:
>>
>>> The remote-helpers in contrib/remote-helpers have proved to work, be
>>> reliable, and stable. It's time to move them out of contrib, and be
>>> distributed by default.
Felipe Contreras writes:
> Junio C Hamano wrote:
>> Felipe Contreras writes:
>>
>> > ... there are _already_ hooks without pre/post.
>>
>> Like commit-msg? Yes, it would have been nicer if it were named
>> verify-commit-message or something.
>
> No it wouldn't. I can use the commit-msg hook t
"Michael S. Tsirkin" writes:
> On Wed, Apr 23, 2014 at 10:39:23AM -0700, Junio C Hamano wrote:
>> Are these three patches the same as what has been queued on
>> mt/patch-id-stable topic and cooking in 'next' for a few weeks?
>
> Not exactly - at your request I implemented git config
> options to
Junio C Hamano wrote:
> Felipe Contreras writes:
>
> > Junio C Hamano wrote:
> >> Felipe Contreras writes:
> >>
> >> > This hook is invoked before a branch is updated, either when a branch is
> >> > created or updated with 'git branch', or when it's rebased with 'git
> >> > rebase'. It receive
Junio C Hamano wrote:
> Felipe Contreras writes:
>
> > ... there are _already_ hooks without pre/post.
>
> Like commit-msg? Yes, it would have been nicer if it were named
> verify-commit-message or something.
No it wouldn't. I can use the commit-msg hook to change the commit message and
to abs
Matthieu Moy wrote:
> Felipe Contreras writes:
>
> > Commit 26cd160 (rebase -i: use a better reflog message) tried to produce
> > a better reflog message, however, it seems a statement was introduced by
> > mistake.
> >
> > 'comment_for_reflog start' basically overides the GIT_REFLOG_ACTION we
>
Felipe Contreras writes:
> The very unlikely issue that nobody has reported about hg multiple heads and
> gc
> I just fixed, and the issue he just reported about 'foo' and 'foo/bar' is
> newly
> reported, and there's no easy way to fix this.
I would not judge on likelyhood, but I would say tha
Junio C Hamano wrote:
> Felipe Contreras writes:
>
> > Signed-off-by: Felipe Contreras
>
> Why is this a good change?
When a hook is called from a command without NEED_WORK_TREE, GIT_DIR is not set
(e.g. git branch).
> How does it prevent existing hook scripts from suddenly start
> misbehavin
Felipe Contreras writes:
> Junio C Hamano wrote:
>> Felipe Contreras writes:
>>
>> > This hook is invoked before a branch is updated, either when a branch is
>> > created or updated with 'git branch', or when it's rebased with 'git
>> > rebase'. It receives three parameters; the name of the br
Junio C Hamano wrote:
> Felipe Contreras writes:
>
> > This hook is invoked before a branch is updated, either when a branch is
> > created or updated with 'git branch', or when it's rebased with 'git
> > rebase'. It receives three parameters; the name of the branch, the
> > SHA-1 of the latest
Junio C Hamano wrote:
> Robert Dailey writes:
>
> [Administrivia: because people read from top to bottom / why is it
> bad to top-post? / please do not top-post.]
https://en.wikipedia.org/wiki/Posting_style
--
Felipe Contreras
--
To unsubscribe from this list: send the line "unsubscribe git" i
Hi Peff,
On Wed, 23 Apr 2014, Jeff King wrote:
> On Wed, Apr 23, 2014 at 09:53:25AM +0200, Stepan Kasal wrote:
>
> > I have found out that "ulimit -s" does not work on Windows. Adding
> > this as a prerequisite, we will skip the test there.
>
> I found this bit weird, as the test originated on
Junio C Hamano wrote:
> Max Horn writes:
>
> > Perhaps it is OK to move an undocumented remote-helper
> > with known bugs out of contrib.
>
> We should strive to apply the same criteria as new submission to the
> main part of the system. And inputs from people like you who have
> more experienc
Jeff King writes:
> On Wed, Apr 23, 2014 at 01:48:05PM -0700, Junio C Hamano wrote:
>
>> > I don't think so. The point is that we _must_ use bash here, not any
>> > POSIX shell.
>>
>> Sorry, but I do not understand. Isn't what you want "any POSIX
>> shell with 'ulimit -s 64' supported"?
>
> Sur
Max Horn wrote:
> On 21.04.2014, at 22:37, Felipe Contreras wrote:
>
> > The remote-helpers in contrib/remote-helpers have proved to work, be
> > reliable, and stable. It's time to move them out of contrib, and be
> > distributed by default.
>
> Really? While I agree that git-remote-hg by now wo
On Wed, Apr 23, 2014 at 01:48:05PM -0700, Junio C Hamano wrote:
> > I don't think so. The point is that we _must_ use bash here, not any
> > POSIX shell.
>
> Sorry, but I do not understand. Isn't what you want "any POSIX
> shell with 'ulimit -s 64' supported"?
Sure, that would be fine, but the
Jeff King writes:
> On Wed, Apr 23, 2014 at 12:12:14PM -0700, Junio C Hamano wrote:
>
>> > +ulimit_stack="ulimit -s 64"
>> > +test_lazy_prereq ULIMIT 'bash -c "'"$ulimit_stack"'"'
>>
>> With this implementaion, ULIMIT implies bash, and we use bash that
>> appears on user's PATH that may not be t
On Wed, Apr 23, 2014 at 02:59:26PM -0500, Robert Dailey wrote:
> I referred back to the documentation for --decorate:
>
> --decorate[=short|full|no]
> Print out the ref names of any commits that are shown. If short is
> specified, the ref name prefixesrefs/heads/, refs/tags/ and
> refs/remotes/ w
Felipe Contreras writes:
> Signed-off-by: Felipe Contreras
Why is this a good change? From a zero-line log message, I cannot
even tell if this is trying to fix some problem, or trying to give
new capabilities to hooks.
How does it prevent existing hook scripts from suddenly start
misbehaving,
Felipe Contreras writes:
> This hook is invoked before a branch is updated, either when a branch is
> created or updated with 'git branch', or when it's rebased with 'git
> rebase'. It receives three parameters; the name of the branch, the
> SHA-1 of the latest commit, and the SHA-1 of the first
On Tue, Apr 22, 2014 at 5:12 PM, Ronald Weiss wrote:
> Allow ignoring submodules (or not) by command line switch, like diff
> and status do.
>
> This commit is also a prerequisite for the next one in series, which
> adds the --ignore-submodules switch to git commit. That's why a new
> argument is
On Tue, Apr 22, 2014 at 2:45 PM, Ronnie Sahlberg wrote:
> Change store_updated_refs to use a single ref transaction for all refs that
> are updated during the fetch. This makes the fetch more atomic when update
> failures occur.
>
> Since ref update failures will now no longer occur in the code pa
Jeff King writes:
> On Wed, Apr 23, 2014 at 02:42:38PM -0500, Felipe Contreras wrote:
>
>> It is what the clients of this library expect.
>
> Is it? Passing GIT_DIR to sub-invocations of git will change how they
> determine the repo and working tree. Your patch seems to cause failures
> all over
Robert Dailey writes:
> On Wed, Apr 23, 2014 at 12:30 PM, Junio C Hamano wrote:
>> Robert Dailey writes:
>>
>> [Administrivia: because people read from top to bottom / why is it
>> bad to top-post? / please do not top-post.]
>>
>>> On Tue, Apr 22, 2014 at 4:37 PM, Junio C Hamano wrote:
Ro
Max Horn writes:
[Administrivia: please wrap your lines to reasonable length like 70-75].
> On 21.04.2014, at 22:37, Felipe Contreras
> wrote:
>
>> The remote-helpers in contrib/remote-helpers have proved to work, be
>> reliable, and stable. It's time to move them out of contrib, and be
>> dist
On Tue, Apr 22, 2014 at 2:45 PM, Ronnie Sahlberg wrote:
> Change s_update_ref to use a ref transaction for the ref update.
> Signed-off-by: Ronnie Sahlberg
>
> Signed-off-by: Ronnie Sahlberg
Doubled sign-off.
> ---
> builtin/fetch.c | 15 +++
> 1 file changed, 7 insertions(+), 8 d
On Tue, Apr 22, 2014 at 2:45 PM, Ronnie Sahlberg wrote:
> In s_update_ref there are two calls that when they fail we return an error
> based on the errno value. In particular we want to return a specific error
> if ENOTDIR happened. Both these functions do have failure modes where they
> may retur
On Wed, Apr 23, 2014 at 02:42:38PM -0500, Felipe Contreras wrote:
> It is what the clients of this library expect.
Is it? Passing GIT_DIR to sub-invocations of git will change how they
determine the repo and working tree. Your patch seems to cause failures
all over the test suite.
Without lookin
Hi,
On Wed, Apr 23, 2014 at 12:12:14PM -0700, Junio C Hamano wrote:
> [Administrivia: please refrain from using Mail-Followup-To to
> deflect an attempt to directly respond to you;
thanks a lot for telling me.
Actually, this was a mistake: I added git to the list of discussion
lists, without real
On Wed, Apr 23, 2014 at 12:30 PM, Junio C Hamano wrote:
> Robert Dailey writes:
>
> [Administrivia: because people read from top to bottom / why is it
> bad to top-post? / please do not top-post.]
>
>> On Tue, Apr 22, 2014 at 4:37 PM, Junio C Hamano wrote:
>>> Robert Dailey writes:
>>>
git
On 4/23/2014 2:04 PM, Charles Buege wrote:
> If, in actuality, I can use a CentOS git server with Visual Studio
> 2013, can anyone point me in the direction of an FAQ/directions/
> YouTube video/book/anything for how to setup something like this?
http://lmgtfy.com/?q=%22visual+studio+2013%22+clone
It is what the clients of this library expect.
Signed-off-by: Felipe Contreras
---
git-sh-setup.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 5f28b32..fb0362f 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -346,6 +346,7 @@ then
Signed-off-by: Felipe Contreras
---
run-command.c | 24 ++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/run-command.c b/run-command.c
index 75abc47..8e188f6 100644
--- a/run-command.c
+++ b/run-command.c
@@ -765,12 +765,29 @@ int run_hook_ve(const char *con
This hook is invoked before a branch is updated, either when a branch is
created or updated with 'git branch', or when it's rebased with 'git
rebase'. It receives three parameters; the name of the branch, the
SHA-1 of the latest commit, and the SHA-1 of the first commit of the
branch.
When a bran
Currently it's not possible to keep track of changes that happen to a branch,
specifically; when a branch is created and rebased. This patch series aims to
fix that.
The last patch is the important one, but in the process of testing this I found
out that the GIT_DIR environment variable is not al
On Tue, Apr 22, 2014 at 4:19 AM, Ilya Bobyr wrote:
> Allow better control of the set of tests that will be executed for a
> single test suite. Mostly useful while debugging or developing as it
> allows to focus on a specific test.
>
> Signed-off-by: Ilya Bobyr
> ---
> diff --git a/t/README b/t/R
dpr...@gmail.com wrote on Tue, 22 Apr 2014 10:29 +0100:
> There is a patch viewable at this link:
> https://github.com/Stealthii/git/commit/f7a2e611262fd977ac99e066872d3d0743b7df3c
>
> For the use case this works perfectly - if I define branch mappings
> with git config, followed by setting 'git-p
Max Horn writes:
> That said, I don't know what the criteria are for moving something out
> of contrib.
Because we accept stuff to contrib/, with an assumption that it is
to stay there without contaminating the main part of the system, the
quality of stuff in contrib/ can be sub-par and it is ve
Hi,
Charles Buege wrote:
> If, in actuality, I can use a CentOS git server with Visual Studio
> 2013, can anyone point me in the direction of an
> FAQ/directions/YouTube video/book/anything for how to setup something
> like this?
I suspect
http://msdn.microsoft.com/en-us/library/hh850445.aspx#re
On Wed, Apr 23, 2014 at 09:53:25AM +0200, Stepan Kasal wrote:
> I have found out that "ulimit -s" does not work on Windows.
> Adding this as a prerequisite, we will skip the test there.
I found this bit weird, as the test originated on Windows. Did it never
actually cause a failure there (i.e., t
On Wed, Apr 23, 2014 at 12:12:14PM -0700, Junio C Hamano wrote:
> > +ulimit_stack="ulimit -s 64"
> > +test_lazy_prereq ULIMIT 'bash -c "'"$ulimit_stack"'"'
>
> With this implementaion, ULIMIT implies bash, and we use bash that
> appears on user's PATH that may not be the one the user chose to run
Stepan Kasal writes:
[Administrivia: please refrain from using Mail-Followup-To to
deflect an attempt to directly respond to you; it will waste time of
other people while it may be saving your time].
> From: Jean-Jacques Lafay
>
> In large repos, the recursion implementation of contains(commit,
All -
If this is the wrong place to ask this question (I'm heading to
Microsoft's site next), then I apologize, but communities like this
have always been kind to me in the past, so I thought I'd start here.
I'm looking to setup a git server under CentOS 6.5 x64 that will serve
2-5 .NET developer
Ilya Bobyr writes:
> @@ -187,10 +192,70 @@ and either can match the "t[0-9]{4}" part to skip the
> whole
> test, or t[0-9]{4} followed by ".$number" to say which
> particular test to skip.
>
> -Note that some tests in the existing test suite rely on previous
> -test item, so you cannot arbit
Ilya Bobyr writes:
> Most arguments that could be provided to a test have short forms.
> Unless documented, the only way to learn them is to read the code.
>
> Signed-off-by: Ilya Bobyr
> ---
> t/README |8
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/t/READM
Jonathan Nieder writes:
> Tim Chase wrote:
>
>> cd .git/refs
>> mkdir -p closed
>> mv heads/BUG-123 closed
>
> That breaks with packed refs (see git-pack-refs(1)), which are a normal
> thing to encounter after garbage collection.
Specifically,
- if BUG-123 branch was placed in packed-ref
On 2014-04-23 10:58, Jonathan Nieder wrote:
> Tim Chase wrote:
> > cd .git/refs
> > mkdir -p closed
> > mv heads/BUG-123 closed
>
> That breaks with packed refs (see git-pack-refs(1)), which are a
> normal thing to encounter after garbage collection.
>
> Hope that helps,
Very much so. Alr
On Wed, Apr 23, 2014 at 10:38:07AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > The test is very basic and can be extended.
> > Couldn't find a good existing place to put it,
> > so created a new file.
> >
> > Signed-off-by: Michael S. Tsirkin
> > ---
> > t/t4056-diff-order
Hi,
Tim Chase wrote:
> cd .git/refs
> mkdir -p closed
> mv heads/BUG-123 closed
That breaks with packed refs (see git-pack-refs(1)), which are a normal
thing to encounter after garbage collection.
Hope that helps,
Jonathan
--
To unsubscribe from this list: send the line "unsubscribe git"
On Wed, Apr 23, 2014 at 10:34:30AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > As suggested by Junio.
> >
> > Signed-off-by: Michael S. Tsirkin
> > ---
>
> Ehh, I would probably not suggest such an implementation though.
>
> test_write_lines () {
> pri
On Wed, Apr 23, 2014 at 10:39:23AM -0700, Junio C Hamano wrote:
> Are these three patches the same as what has been queued on
> mt/patch-id-stable topic and cooking in 'next' for a few weeks?
Not exactly - at your request I implemented git config
options to control patch id behaviour.
Documentatio
Tim Chase writes:
> Reading up on "git help update-ref", it states that it updates the
> name "safely".
I think that description is well intended but is misleading. There
are many potential sources of risk, and the "safely" refers to
protection against a particular kind of risk: updating from a
"Michael S. Tsirkin" writes:
> The test is very basic and can be extended.
> Couldn't find a good existing place to put it,
> so created a new file.
>
> Signed-off-by: Michael S. Tsirkin
> ---
> t/t4056-diff-order.sh | 63
> +++
> 1 file changed,
Are these three patches the same as what has been queued on
mt/patch-id-stable topic and cooking in 'next' for a few weeks?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordo
"Michael S. Tsirkin" writes:
> As suggested by Junio.
>
> Signed-off-by: Michael S. Tsirkin
> ---
Ehh, I would probably not suggest such an implementation though.
test_write_lines () {
printf "%s\n" "$@"
}
might be, but not with "echo" and semicolon on the same
Robert Dailey writes:
[Administrivia: because people read from top to bottom / why is it
bad to top-post? / please do not top-post.]
> On Tue, Apr 22, 2014 at 4:37 PM, Junio C Hamano wrote:
>> Robert Dailey writes:
>>
>>> git log log --graph --abbrev-commit --decorate --date=relative
>>> --for
I've got a branch for each bug/issue and it was getting a bit
unwieldy. A little searching suggested this
# archive off the BUG-123 branch
git update-ref refs/closed/BUG-123 BUG-123
git branch -D BUG-123
which seems to do exactly what I want -- branches are archived off so
they still have
Charles Bailey writes:
> The bit of documentation that I was thinking of is in
> Documentation/git-mergetool.txt where it states that "--prompt" is the
> default which is now only partially true.
Thanks for being careful to help tying the loose ends.
Perhaps like this?
I take that your origina
David Aguilar writes:
> On Tue, Apr 22, 2014 at 10:19 AM, Junio C Hamano wrote:
> ...
>> Thanks for CC'ing Charles, by the way. I think his point about
>> mentioning the change of default somewhere in the documentation
>> has some merits, and it can be done in a follow-up patch on top.
>
> Anot
Johan Herland writes:
> I.e. use Kyle's patch to t9117, plus something like this:
>
> diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
> index 5b3c38d..9f579e0 100644
> --- a/Documentation/git-svn.txt
> +++ b/Documentation/git-svn.txt
> @@ -91,6 +91,9 @@ COMMANDS
> NOTE: Before
Thanks, removing those two options did help quite a bit already.
However, the history can still get pretty crazy. Is there a way to
hide all tags from the log graph? Really I just want the LABELS to be
hidden.
On Tue, Apr 22, 2014 at 4:37 PM, Junio C Hamano wrote:
> Robert Dailey writes:
>
>> gi
Hello,
On Wed, Apr 23, 2014 at 04:28:39PM +0200, Johannes Schindelin wrote:
> The interdiff can be seen here:
> https://github.com/msysgit/git/commit/c68e27d5
not exatly, is also changes the number of commits in the "deep repo"
from 1000 to 4000, as peff proposed.
Stepan
--
To unsubscribe
When a media file contains valid UTF-8, git-remote-mediawiki tried to be
too clever about the encoding, and the call to utf8::downgrade() on the
downloaded content was failing with
Wide character in subroutine entry at git-remote-mediawiki line 583.
Instead, use $response->decode() to apply dec
Patches 01 to 14/14 are
Reviewed-by: Matthieu Moy
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Elia Pinto writes:
> git-gui/po/glossary/txt-to-pot.sh |4 ++--
git-gui is a separate project, patches are normally applied to git-gui
first, and then pulled by Junio.
I'd suggest dropping this patch, it's probably not worth the trouble
(although the patch is correct).
--
Matthieu Moy
htt
Previously, the user had to launch a complete re-install after a lighttpd
stop (e.g. a reboot).
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/t/install-wiki.sh | 10 ++
contrib/mw-to-git/t/test-gitmw-lib.sh | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/con
1 - 100 of 132 matches
Mail list logo
