On 31 May 2013 10:57, Alex Bennée wrote:
> On 31 May 2013 09:46, Thomas Rast wrote:
>>
>> So that deleted all unannotated tags pointing at commits, and then it
>> was fast. Curious.
>>
>> However, if that turns out to be the culprit, it's not fixable
>> currently[1]. Having commits with insanel
On 31 May 2013 17:17, Jeff King wrote:
> On Fri, May 31, 2013 at 12:27:11PM +0200, Thomas Rast wrote:
>
>> Thomas Rast writes:
>>
>> > However, if that turns out to be the culprit, it's not fixable
>> > currently[1]. Having commits with insanely long messages is just, well,
>> > insane.
>> >
>>
Ramkumar Ramachandra writes:
> Currently, when performing any operation that saves the state and
> expects the user the continue (like rebase, bisect, am), the prompt
> screams:
>
> artagnon|completion|REBASE-i 2/2:~/src/git$
>
> Lowercase the words, so we get a more pleasant
>
> artagnon|com
Ramkumar Ramachandra writes:
> Add support for completing 'git blame'. List only the common short
> options.
[...]
> +_git_blame ()
> +{
> + __git_has_doubledash && return
> +
> + case "$cur" in
> + -*)
> + __gitcomp "-M -C -L -s -w"
> + esac
> + __git_complete_re
Thomas Rast wrote:
> Is this the first time we introduce completion (I guess you could call
> it "help") for short options? I only did a quick search for /-. -/ but
> it certainly seems that way.
Yeah. We generally prefer the long-form equivalents while doing
completions, but these blame options
Thomas Rast wrote:
> Do you have other ways of distinguishing the branch and the state?
> Colors? I'm a bit too lazy to check. Perhaps it could be made to only
> use caps if not in colored mode?
Currently, no. See git-prompt.sh:401, 403, 409; we don't have a
separate color for $r. I didn't in
Jiang Xin wrote:
> It will be nice to add this pretty formatter automatically when run
> `git reflog` in verbose mode. And in order to support verbose mode, add
> new flag "verbose" in struct rev_info.
Sorry I missed earlier revisions of this patch. Generally speaking,
"verbose" is a bad way to c
From: 乙酸鋰
Signed-off-by: Ramkumar Ramachandra
---
乙酸鋰: please read Documentation/SubmittingPatches and submit a
patch yourself next time. I've done it for you this time as an
example.
Junio: please (add-hook 'text-mode-hook 'flyspell-mode) to your
.emacs to catch this early.
Documentati
On Mon, Jun 3, 2013 at 5:00 PM, Ramkumar Ramachandra wrote:
> Jiang Xin wrote:
>> It will be nice to add this pretty formatter automatically when run
>> `git reflog` in verbose mode. And in order to support verbose mode, add
>> new flag "verbose" in struct rev_info.
>
> Sorry I missed earlier revi
2013/6/3 Ramkumar Ramachandra :
> Jiang Xin wrote:
>> It will be nice to add this pretty formatter automatically when run
>> `git reflog` in verbose mode. And in order to support verbose mode, add
>> new flag "verbose" in struct rev_info.
>
> Sorry I missed earlier revisions of this patch. General
On Mon, Jun 3, 2013 at 1:58 AM, Junio C Hamano wrote:
> * ap/wildmatch-foldcase (2013-06-02) 1 commit
> - wildmatch: properly fold case everywhere
nit: I think this is "ar/" ;)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
On Sun, Jun 2, 2013 at 9:36 PM, 乙酸鋰 wrote:
> Typo in Documentation/RelNotes/1.8.4.txt
> line 39:
> opportunisticly -> opportunistically
乙酸鋰 ,
You'll get a quicker response if you submit that as a proper commit
using the git tools and CC Junio Hamano (currently gits...@pobox.com)
as noted in the d
On Sun, Jun 2, 2013 at 7:58 PM, Junio C Hamano wrote:
...
> --
> [Stalled]
...
> * jk/gitweb-utf8 (2013-04-08) 4 commits
> - gitweb: Fix broken blob action parameters on blob/commitdiff pages
> - gitweb: Don't append ';js=(0|1)' to external links
>
On Mon, Jun 3, 2013 at 6:58 AM, Junio C Hamano wrote:
> [Graduated to "master"]
> * tr/line-log (2013-04-22) 13 commits
> (merged to 'next' on 2013-04-22 at 8f2c1de)
Should I resend nd/magic-pathspecs again now that all three topics
that cause a lot of conflicts with it have graduated? Some con
On Mon, Jun 03, 2013 at 09:39:21AM +0100, Alex Bennée wrote:
> > in the target repository. You can check that it's working because "git
> > rev-list --all --count" should be an order of magnitude faster. You may
> > need to add "save_commit_buffer = 0" in any commands you are checking,
> > though,
On Fri, May 31, 2013 at 08:40:51PM +0100, John Keeping wrote:
> On Thu, May 30, 2013 at 09:23:40PM +0200, Jens Lehmann wrote:
> > Am 30.05.2013 01:58, schrieb Junio C Hamano:
> > > * jk/submodule-subdirectory-ok (2013-04-24) 3 commits
> > > (merged to 'next' on 2013-04-24 at 6306b29)
> > > + sub
Thanks.
--
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
Drew Northup writes:
> On Sun, Jun 2, 2013 at 7:58 PM, Junio C Hamano wrote:
> ...
>> --
>> [Stalled]
> ...
>> * jk/gitweb-utf8 (2013-04-08) 4 commits
>> - gitweb: Fix broken blob action parameters on blob/commitdiff pages
>> - gitweb: Don't appe
Duy Nguyen writes:
> On Mon, Jun 3, 2013 at 6:58 AM, Junio C Hamano wrote:
>> [Graduated to "master"]
>> * tr/line-log (2013-04-22) 13 commits
>> (merged to 'next' on 2013-04-22 at 8f2c1de)
>
> Should I resend nd/magic-pathspecs again now that all three topics
> that cause a lot of conflicts w
John Keeping writes:
> I started looking at this over the weekend but didn't get time to get
> something ready to be submitted. I did find a couple of issues in
> cmd_foreach that make me think this topic should be dropped when "next"
> is rewound and held in pu waiting for a re-roll.
Thanks fo
Michael Haggerty writes:
> Signed-off-by: Michael Haggerty
> ---
> Junio, would you mind squashing this patch onto mh/reflife 22/25?
Done. Thanks.
>
> notes.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/notes.c b/notes.c
> index 602d956..b69c0b8 100644
> --- a/notes.c
> +++ b/no
"Michael S. Tsirkin" writes:
> When cccmd is used, old-style suppress-from filter
> is applied by the newer suppress-cc=self isn't.
> Fix this up.
>
> Signed-off-by: Michael S. Tsirkin
> ---
> git-send-email.perl | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/git-send-
Am 03.06.2013 02:04, schrieb Felipe Contreras:
On Sun, Jun 2, 2013 at 6:47 PM, René Scharfe
wrote:
Am 03.06.2013 01:23, schrieb Felipe Contreras:
I didn't say we should do 'if (ce) free(ce);' instead of 'free(ce);' I
said we should do 'if (cd && ce != o->df_conflict_entry)' instead of
'if (ce
On Mon, Jun 03, 2013 at 08:58:14AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > When cccmd is used, old-style suppress-from filter
> > is applied by the newer suppress-cc=self isn't.
> > Fix this up.
> >
> > Signed-off-by: Michael S. Tsirkin
> > ---
> > git-send-email.perl
"Michael S. Tsirkin" writes:
> This includes bugfixes related to handling of --suppress-cc=self
> flag. Tests are also included.
Thanks, will queue.
--
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 htt
"Michael S. Tsirkin" writes:
> This adds a basic test for --suppress-cc=self
> option of git send-email.
>
> Signed-off-by: Michael S. Tsirkin
> ---
> t/t9001-send-email.sh | 43 +++
> 1 file changed, 43 insertions(+)
>
> diff --git a/t/t9001-send-email.s
Alex Bennée writes:
> Why is git attempting to parse a commit not on the DAG for the branch
> I'm attempting to describe?
I think that is because you need to parse the objects at the tip of
refs to see if they are on the DAG in the first place.
If there weren't any annotated tag, conceivably yo
On Mon, Jun 03, 2013 at 09:17:21AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > --suppress-cc=self fails to filter sender address in many cases where it
> > needs to be sanitized in some way, for example quoted:
> > "A U. Thor"
> > To fix, make send-email sanitize both sende
On Mon, Jun 03, 2013 at 09:18:56AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > This includes bugfixes related to handling of --suppress-cc=self
> > flag. Tests are also included.
>
> Thanks, will queue.
OK pls let me know if this means you intend to handle the rest of your
On Mon, Jun 3, 2013 at 10:59 AM, René Scharfe
wrote:
> Am 03.06.2013 02:04, schrieb Felipe Contreras:
>>
>> On Sun, Jun 2, 2013 at 6:47 PM, René Scharfe
>> wrote:
>>>
>>> Am 03.06.2013 01:23, schrieb Felipe Contreras:
>>>
I didn't say we should do 'if (ce) free(ce);' instead of 'free(ce);' I
"Michael S. Tsirkin" writes:
> --suppress-cc=self fails to filter sender address in many cases where it
> needs to be sanitized in some way, for example quoted:
> "A U. Thor"
> To fix, make send-email sanitize both sender and the address it is
> compared against.
>
> Signed-off-by: Michael S. Ts
From: Felipe Contreras
If someone adds code that dereferences ce before it is freed without
checking for NULL it will crash sometimes. Spare that person from
having to wonder about the reason.
Signed-off-by: Felipe Contreras
---
Signoff from http://article.gmane.org/gmane.comp.version-control.
Felipe Contreras writes:
> We are dealing with the 'istate' index, not 'the_index'.
>
> Signed-off-by: Felipe Contreras
> ---
Good catch; will apply.
> read-cache.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/read-cache.c b/read-cache.c
> index 04ed561..5253ec5 10
Felipe Contreras writes:
> dfc has not been initialized at this point.
>
> Signed-off-by: Felipe Contreras
> ---
Upon the first entry to this function, because dfc is
static struct cache_entry *dfc;
it is NULL. In that case, we allocate one instance. When the
function is called aga
On Tue, May 28, 2013 at 11:39 PM, Martin von Zweigbergk
wrote:
> create mode 100755 t/t3420-rebase-topology-linear.sh
Just FYI, there's another test case with the same number
(t3420-rebase-autostash) in pu. I don't know how you normally handle
such cases.
--
To unsubscribe from this list: send t
Sandro Santilli writes:
> git merge anotherbranch
> git add something
> git commit --amend
>
> After the steps above the addition of "something" can't be found in
> the history anymore, but the file is there.
This is a very common and sensible thing to do when dealing with
semantic conflict.
On Fri, May 31, 2013 at 10:22 PM, Eugene Sajine wrote:
> and trying to perform some operations like fetch or push. It is cloned
> and fetches and pushes successfully.
> The problem is that the file test_hook_out.txt doesn't have anything
> in it after the execution, So the hook doesn't seem to wor
Thomas Rast writes:
> Ramkumar Ramachandra writes:
>
>> Currently, when performing any operation that saves the state and
>> expects the user the continue (like rebase, bisect, am), the prompt
>> screams:
>>
>> artagnon|completion|REBASE-i 2/2:~/src/git$
>>
>> Lowercase the words, so we get a
Thomas Rast writes:
> Ramkumar Ramachandra writes:
>
>> Add support for completing 'git blame'. List only the common short
>> options.
> [...]
>> +_git_blame ()
>> +{
>> +__git_has_doubledash && return
>> +
>> +case "$cur" in
>> +-*)
>> +__gitcomp "-M -C -L -s -w"
>> +
On 2012-11-07 22:13, Jeff King wrote:
> On Wed, Nov 07, 2012 at 10:10:59PM +0100, Peter Oberndorfer wrote:
>
For me the key to reproduce the problem was to have 2 commits.
Adding the file in the root commit it did not work. [1]
>>> You probably would need to pass "--root" for it to do the
Ramkumar Ramachandra writes:
> 'git difftool' is clearly a frontend to 'git diff' and is used in
> exactly the same way, but it uses a misleading completion function name
> __git_complete_file (aliased to to __git_complete_revlist_file). Change
> it to use __git_complete_revlist_file, just like
Ramkumar Ramachandra writes:
> Currently, the 'git ls-tree', 'git archive', and 'git show' completions
> use __git_complete_file (aliased to __git_complete_revlist_file).
>
> In the case of 'git ls-tree' and 'git archive', they necessarily require
> a tree-ish argument (and optionally a pathspec
On Mon, Jun 3, 2013 at 7:20 PM, Junio C Hamano wrote:
> Sandro Santilli writes:
>
>> git merge anotherbranch
>> git add something
>> git commit --amend
>>
>> After the steps above the addition of "something" can't be found in
>> the history anymore, but the file is there.
>
> This is a very co
Felipe Contreras writes:
>> I don't see that, and I don't like adding a check that I don't expect to be
>> ever needed.
>
> It's called self-documenting code; by adding a check for the NULL
> pointer, we are stating that ce can be NULL, if we don't do that,
> people reading that code would need t
Jiang Xin writes:
> 2013/6/3 Ramkumar Ramachandra :
>> Jiang Xin wrote:
>>> It will be nice to add this pretty formatter automatically when run
>>> `git reflog` in verbose mode. And in order to support verbose mode, add
>>> new flag "verbose" in struct rev_info.
>>
>> Sorry I missed earlier revis
Junio C Hamano writes:
> Alex Bennée writes:
>
>> Why is git attempting to parse a commit not on the DAG for the branch
>> I'm attempting to describe?
>
> I think that is because you need to parse the objects at the tip of
> refs to see if they are on the DAG in the first place.
>
> If there wer
Ramkumar Ramachandra writes:
> Currently, diffcore-pickaxe reports two distinct errors for the same
> user error:
>
> $ git log --pickaxe-regex -S'\1'
> fatal: invalid pickaxe regex: Invalid back reference
>
> $ git log -G'\1' # --pickaxe-regex is implied
> fatal: invalid log-grep
Ramkumar Ramachandra writes:
> The documentation of -S and -G is very sketchy. Completely rewrite the
> sections in Documentation/diff-options.txt and
> Documentation/gitdiffcore.txt.
Will queue; thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message
Ramkumar Ramachandra writes:
> Currently, the 'git ls-tree', 'git archive', and 'git show' completions
> use __git_complete_file (aliased to __git_complete_revlist_file).
>
> In the case of 'git ls-tree' and 'git archive', they necessarily require
> a tree-ish argument (and optionally a pathspec
> - Your log file might not be located where you expect, you should use
> absolute path to dump text
You were right! The problem was with the script itself - the log file
not being specified with absolute path! Stupid me!
...
> - The documentation says you can print one line before a failure, als
"Michael S. Tsirkin" writes:
> Yes, I think so too. So - what do you suggest?
> Add a test?
> Add a comment?
> more?
Nothing major comes to my mind at this moment.
I guess it would be good to add a test or two to use "A U. Thor"
example with and without end-user added quotes, but th
"Michael S. Tsirkin" writes:
> What I tried to do here is split the changes to small chunks and I
> picked a chunk of a later patch in an earlier one by mistake.
>
> So this is fixed up by patch 4/6 in the series, which redefines
> sender to have the sanitized value, everywhere.
>
> I guess I'll
Martin von Zweigbergk writes:
> On Tue, May 28, 2013 at 11:39 PM, Martin von Zweigbergk
> wrote:
>> create mode 100755 t/t3420-rebase-topology-linear.sh
>
> Just FYI, there's another test case with the same number
> (t3420-rebase-autostash) in pu. I don't know how you normally handle
> such cas
On Mon, Jun 03, 2013 at 03:02:00PM +0530, Ramkumar Ramachandra wrote:
> Thomas Rast wrote:
> > Is this the first time we introduce completion (I guess you could call
> > it "help") for short options? I only did a quick search for /-. -/ but
> > it certainly seems that way.
>
> Yeah. We generally
On Mon, Jun 3, 2013 at 11:05 AM, Junio C Hamano wrote:
> Martin von Zweigbergk writes:
>
>> On Tue, May 28, 2013 at 11:39 PM, Martin von Zweigbergk
>> wrote:
>>> create mode 100755 t/t3420-rebase-topology-linear.sh
>>
>> Just FYI, there's another test case with the same number
>> (t3420-rebase-
Jiang Xin writes:
> I have updated the patch in the new reply for this thread, and it need
> some feedbacks:
>
> http://thread.gmane.org/gmane.comp.version-control.git/225139/focus=225934
Will re-queue and wait for "some feedbacks" then. Thanks.
--
To unsubscribe from this list: send the line "
Felipe Contreras writes:
> 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
Felipe Contreras writes:
> +static void add_rewritten(unsigned char *from, unsigned char *to)
> +{
> + struct rewritten_list_item *item;
> + if (rewritten.nr + 1 >= rewritten.alloc) {
> + rewritten.alloc += 32;
> + rewritten.items = xrealloc(rewritten.items, rewrit
Felipe Contreras writes:
> As we should.
>
> Signed-off-by: Felipe Contreras
> ---
> sequencer.c | 45 -
> 1 file changed, 44 insertions(+), 1 deletion(-)
>
> diff --git a/sequencer.c b/sequencer.c
> index c217716..3aa480e 100644
> --- a/sequencer.c
>
On Mon, Jun 3, 2013 at 8:02 PM, Eugene Sajine wrote:
> Would you be able to advise how this should be done?
> I don't get the error message (i mean the output of pwd) if i do this:
>
> echo `pwd`
> exit 1
>
> What should it be?
Actually, after digging into the code, it looks like you need to call
Felipe Contreras writes:
> For example master..feature-a.
>
> Signed-off-by: Felipe Contreras
> ---
> contrib/related/git-related | 38 --
> 1 file changed, 36 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/related/git-related b/contrib/related/git-re
The new 4015 does not pass under Mac OS:
a) The seq command, does not exits (we can use printf)
b) One sed expression is not understood, sed exporst needed ;-)
git diff
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index b3c4fcc..f00d20b 100755
--- a/t/t4015-diff-whites
On Mon, Jun 3, 2013 at 9:01 PM, Torsten Bögershausen wrote:
> The new 4015 does not pass under Mac OS:
>
> a) The seq command, does not exits (we can use printf)
I was planning to reroll with test_seq instead of seq, as advised by
Johannes Sixt.
> b) One sed expression is not understood, sed exp
Makes sense.
--
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
On Mon, Jun 03, 2013 at 09:01:45PM +0200, Torsten Bögershausen wrote:
> The new 4015 does not pass under Mac OS:
>
> a) The seq command, does not exits (we can use printf)
> [...]
> diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
> index b3c4fcc..f00d20b 100755
> --- a/t/t4015
SZEDER Gábor writes:
> But providing short options for completion is pointless. Those who
> know git blame's short options will just type them right away, because
> it requires less key presses than using completion, and those who
> don't know these options will only see -C, -M, etc. and won't h
Felipe Contreras writes:
> I changed my mind, this is the same as v9 but minus some potentially
> controversial changes.
>
> Felipe Contreras (4):
> Add new git-related helper to contrib
> contrib: related: add support for multiple patches
> contrib: related: add option to parse from commit
Junio C Hamano writes:
> Felipe Contreras writes:
>
>> 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 ++
>> seque
On Sun, Jun 02, 2013 at 07:33:42PM +0530, Ramkumar Ramachandra wrote:
> Currently, the 'git ls-tree', 'git archive', and 'git show' completions
> use __git_complete_file (aliased to __git_complete_revlist_file).
>
> In the case of 'git ls-tree' and 'git archive', they necessarily require
> a tree-
On Mon, Jun 03, 2013 at 11:04:31AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > What I tried to do here is split the changes to small chunks and I
> > picked a chunk of a later patch in an earlier one by mistake.
> >
> > So this is fixed up by patch 4/6 in the series, which r
Right, --informative-errors does make it better;)
Actually the CWD for the access-hook is not where the hook script is,
but inside the .git folder of the target repo. GTK.
and yes, definitely some documentation improvements needed;)
Thanks!
On Mon, Jun 3, 2013 at 3:05 PM, Antoine Pelisse wrote
For some reason info/exclude hasn't been working for me. I have a
pretty plain macbook pro, with a slow standard hard drive, running the
latest mac os 10.7 lion
MBP:dish devin$ pwd
/Users/devin/Dropbox/ads-G2/dish
MBP:dish devin$ cat ../.git/info/exclude
# git ls-files --others --exclude-from=.gi
Nguyễn Thái Ngọc Duy writes:
> diff --git a/sha1_file.c b/sha1_file.c
> index 67e815b..7b47bdc 100644
> --- a/sha1_file.c
> +++ b/sha1_file.c
> @@ -36,6 +36,8 @@ static inline uintmax_t sz_fmt(size_t s) { return s; }
>
> const unsigned char null_sha1[20];
>
> +static const char *log_pack_ac
On Mon, Jun 03, 2013 at 01:04:39PM -0700, Devin Rhode wrote:
> MBP:dish devin$ cat ../.git/info/exclude
> # git ls-files --others --exclude-from=.git/info/exclude
> # Lines that start with '#' are comments.
> # For a project mostly in C, the following would be a good set of
> # exclude patterns (u
t3406 is supposed to test "messages from rebase operation", so let's
move tests in t3400 that fit that description into 3406. Most of the
functionality they tested, except for the messages, has now been
subsumed by t3420.
---
t/t3400-rebase.sh | 22 --
t/t3406-rebase-me
The only change since v4 should be that t3420 was renamed t3421.
Martin von Zweigbergk (7):
add simple tests of consistency across rebase types
add tests for rebasing with patch-equivalence present
add tests for rebasing of empty commits
add tests for rebasing root
add tests for rebasing
---
t/lib-rebase.sh | 17
t/t3421-rebase-topology-linear.sh | 85 +++
2 files changed, 102 insertions(+)
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index 62b3887..16eeb1c 100644
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -80,3
---
t/t3401-rebase-partial.sh | 24
t/t3421-rebase-topology-linear.sh | 58 +++
2 files changed, 58 insertions(+), 24 deletions(-)
diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh
index 58f4823..7ba1797 100755
--- a/t/
Update the following:
- Quote 'setup'
- Remove blank lines within test case body
- Use test_commit instead of custom quick_one
- Create branch "topic" from tag created by test_commit
---
t/t3406-rebase-message.sh | 30 +-
1 file changed, 9 insertions(+), 21 deletio
---
t/t3421-rebase-topology-linear.sh | 129 ++
1 file changed, 129 insertions(+)
diff --git a/t/t3421-rebase-topology-linear.sh
b/t/t3421-rebase-topology-linear.sh
index 81e3d59..659a7b3 100755
--- a/t/t3421-rebase-topology-linear.sh
+++ b/t/t3421-rebase-topo
I wouldn't worry too much about this use case, we have a pretty lame workflow
On Mon, Jun 3, 2013 at 1:32 PM, Jeff King wrote:
> On Mon, Jun 03, 2013 at 01:04:39PM -0700, Devin Rhode wrote:
>
>> MBP:dish devin$ cat ../.git/info/exclude
>> # git ls-files --others --exclude-from=.git/info/exclude
>
On Mon, Jun 3, 2013 at 12:13 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> dfc has not been initialized at this point.
>>
>> Signed-off-by: Felipe Contreras
>> ---
>
> Upon the first entry to this function, because dfc is
>
> static struct cache_entry *dfc;
Ah, I didn't noti
Helped-by: Johannes Sixt
---
t/lib-rebase.sh | 15
t/t3421-rebase-topology-linear.sh | 78 +++
2 files changed, 93 insertions(+)
create mode 100755 t/t3421-rebase-topology-linear.sh
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
ind
---
t/t3400-rebase.sh | 31 +
t/t3401-rebase-partial.sh | 45 ---
t/t3404-rebase-interactive.sh | 10 +-
t/t3409-rebase-preserve-merges.sh | 53
t/t3425-rebase-topology-merges.sh | 258 ++
5 files changed, 260 ins
On Mon, Jun 3, 2013 at 12:40 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>>> I don't see that, and I don't like adding a check that I don't expect to be
>>> ever needed.
>>
>> It's called self-documenting code; by adding a check for the NULL
>> pointer, we are stating that ce can be NU
On Mon, Jun 3, 2013 at 1:49 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> +static void add_rewritten(unsigned char *from, unsigned char *to)
>> +{
>> + struct rewritten_list_item *item;
>> + if (rewritten.nr + 1 >= rewritten.alloc) {
>> + rewritten.alloc += 32;
>>
On Mon, Jun 3, 2013 at 1:57 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> As we should.
>>
>> Signed-off-by: Felipe Contreras
>> ---
>> sequencer.c | 45 -
>> 1 file changed, 44 insertions(+), 1 deletion(-)
>>
>> diff --git a/sequencer.c b
On Mon, Jun 3, 2013 at 2:05 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> For example master..feature-a.
>>
>> Signed-off-by: Felipe Contreras
>> ---
>> contrib/related/git-related | 38 --
>> 1 file changed, 36 insertions(+), 2 deletions(-)
>>
>>
On Mon, Jun 3, 2013 at 1:40 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> 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
On Mon, Jun 03, 2013 at 03:17:27PM +0530, Ramkumar Ramachandra wrote:
> Thomas Rast wrote:
> > Do you have other ways of distinguishing the branch and the state?
> > Colors? I'm a bit too lazy to check. Perhaps it could be made to only
> > use caps if not in colored mode?
>
> Currently, no. S
Am 02.06.2013 20:50, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> Am 30.05.2013 01:58, schrieb Junio C Hamano:
>>> * jl/submodule-mv (2013-04-23) 5 commits
>>> (merged to 'next' on 2013-04-23 at c04f574)
>>> + submodule.c: duplicate real_path's return value
>>> (merged to 'next' on 20
Felipe Contreras writes:
> On Mon, Jun 3, 2013 at 1:40 PM, Junio C Hamano wrote:
>> Felipe Contreras writes:
>>
>>> Pretty much what it says on the tin.
>>>
>>> Signed-off-by: Felipe Contreras
>>> ---
>>> Documentation/git-cherry-pick.txt | 3 +++
>>> builtin/revert.c|
"Michael S. Tsirkin" writes:
> On Mon, Jun 03, 2013 at 11:04:31AM -0700, Junio C Hamano wrote:
>> "Michael S. Tsirkin" writes:
>>
>> > What I tried to do here is split the changes to small chunks and I
>> > picked a chunk of a later patch in an earlier one by mistake.
>> >
>> > So this is fixed
Am 31.05.2013 21:40, schrieb John Keeping:
> On Thu, May 30, 2013 at 09:23:40PM +0200, Jens Lehmann wrote:
>> Am 30.05.2013 01:58, schrieb Junio C Hamano:
>>> * jk/submodule-subdirectory-ok (2013-04-24) 3 commits
>>> (merged to 'next' on 2013-04-24 at 6306b29)
>>> + submodule: fix quoting in rel
I am setting up a git repository which I cloned using git svn. git
ls-remote shows something like:
...
refs/remotes/trunk
refs/remotes/2.0.2a
...
To get the subversion branch names to appear as a local branch, I:
git remote add blah http://example.com/blah
git fetch blah +refs/remotes/*:refs/h
On Mon, Jun 03, 2013 at 07:25:06PM +0200, Peter Oberndorfer wrote:
> > Thanks for the report. I'd still like to pursue using a regex library
> > that does not require NUL-termination, but I've been distracted by other
> > things. I'm going to hold back my copy-to-a-NUL-buffer patch for now and
> >
On Mon, Jun 03, 2013 at 11:47:23PM +0200, Jens Lehmann wrote:
> Am 31.05.2013 21:40, schrieb John Keeping:
> > The current version does make '$sm_path' relative in "submodule
> > foreach", although it's hard to spot because we have to leave doing so
> > until right before the "eval".
>
> Yes. If I
On Wed, May 29, 2013 at 11:40:56AM +0300, Andrey Kiyanovsky wrote:
> Git version 1.8.1.2. for Windows
>
> Git config:
>
> [core]
> repositoryformatversion = 0
> filemode = false
> bare = false
> logallrefupdates = true
> symlinks = false
> ignorecase = true
>
Martin von Zweigbergk writes:
> Helped-by: Johannes Sixt
> ---
> t/lib-rebase.sh | 15
> t/t3421-rebase-topology-linear.sh | 78
> +++
> 2 files changed, 93 insertions(+)
> create mode 100755 t/t3421-rebase-topology-linear.sh
>
>
5f44324 (core: log offset pack data accesses happened - 2011-07-06)
provides a way to observe pack access patterns via a config
switch. Setting an environment variable looks more obvious than a
config var, especially when you just need to _observe_, and more
inline with other tracing knobs we have.
1 - 100 of 117 matches
Mail list logo
