Andrew Wong writes:
> Signed-off-by: Andrew Wong
> ---
> t/t3404-rebase-interactive.sh | 16
> 1 file changed, 16 insertions(+)
>
> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
> index 7304b66..a194c97 100755
> --- a/t/t3404-rebase-interactive.sh
>
Andrew Wong writes:
> This allows users to edit the todo file while they're stopped in the
> middle of an interactive rebase. When this action is executed, all
> comments from the original todo file are stripped, and new help messages
> are appended to the end.
>
> Signed-off-by: Andrew Wong
> -
Nguyễn Thái Ngọc Duy writes:
> These files are from rsync.git commit
> d51a3adb4fca3e6b1b046c6e570828f3bca8fe36. The commit is GPL-3. However
> wildmatch.[ch] have not changed since rsync turned to GPL-3.
I'd like see the last version of rsync that was GPLv2 hunted down
and the copy from that v
Adrian Johnson writes:
> Add Ada xfuncname and wordRegex patterns to the list of builtin
> patterns.
>
> Signed-off-by: Adrian Johnson
> ---
Interesting. I do not read Ada, but in this "expect" file,...
> diff --git a/t/t4034/ada/expect b/t/t4034/ada/expect
> new file mode 100644
> index
Luke Diamand writes:
> Looks good to me, ack.
Thanks; is this an ack for the entire series, or are you expecting
further back-and-forth with Pete before the whole thing is ready?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.o
David Chanters writes:
> I've tried:
>
> [remote "origin"]
> fetch =
> +refs/replace/*:+refs/heads/*:refs/remotes/origin/*:refs/replace/*
Read the documentation and learn about instead of blindly
guessing.
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/ori
Add Ada xfuncname and wordRegex patterns to the list of builtin
patterns.
Signed-off-by: Adrian Johnson
---
Documentation/gitattributes.txt | 2 ++
t/t4018-diff-funcname.sh| 2 +-
t/t4034-diff-words.sh | 1 +
t/t4034/ada/expect | 27 +++
I have created a GIT repository on Linux 64 bit machine.
When I tried to clone GIT repository on windows 7 machine then I am getting
below error.
Error:
git-upload-pack: error while loading shared libraries: libiconv.so.2: cannot
open shared object file: No such file or directory
fatal: The re
Hi,
On Sat, Sep 15, 2012 at 11:49 PM, David Chanters
wrote:
> Hi,
>
> On 15 September 2012 18:21, Junio C Hamano wrote:
>
>> Assuming that they do, pushing the replacement ref makes the
>> replacing object available in the pushed-into repository, so
>> they will *not* rely on your repository.
>
On Tue, Sep 11, 2012 at 3:24 PM, Jean-Baptiste Quenot wrote:
> 2012/9/7 Jonas Fonseca :
>> [snip] I suggest to support something like the following:
>>
>> tig --no-walk --stdin < tmp-file
>>
>> Would that cover your use case?
>
> That would be great! I would then feed tig with all commits I w
Ack.
On 09/09/12 21:16, Pete Wyckoff wrote:
When editing the submit template, if no change was made to it,
git p4 offers a prompt "Submit anyway?". Answering "no" cancels
the submit.
Previously, a "no" answer behaves like a "[s]kip" answer to the
failed-patch prompt, in that it proceeded to tr
I'll need to supply a followup patch to ensure that a config option can
override the prompt.
Ack.
On 09/09/12 21:16, Pete Wyckoff wrote:
When applying a commit to the p4 workspace fails, a prompt
asks what to do next. This belongs up in run() instead
of in applyCommit(), where run() can not
git-p4 won't be quite the same without these completely misleading and
confusing messages :-)
Ack.
On 09/09/12 21:16, Pete Wyckoff wrote:
When a patch failed to apply, these interactive options offered
to:
1) apply the patch anyway, leaving reject (.rej) files around, or,
2) write
Hi,
On 15 September 2012 18:21, Junio C Hamano wrote:
> David Chanters writes:
>> 2. If I do publish it, are there any caveats with that? i.e.,
>> because the replace data will likely point to a repo which in my
>> working checkout I added with "git-remote", is that going to be a
>> problem?
>
I've only played around with this a bit, but it looks to be doing the
right thing.
In practice, I think the normal workflow tends to be 'rebase, submit'
and so this code path will only be taken in the case where a conflicting
change is submitted to p4 in the window between rebasing and submitt
Looks good to me, ack.
On 09/09/12 21:16, Pete Wyckoff wrote:
Signed-off-by: Pete Wyckoff
---
t/lib-git-p4.sh | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index 2d753ab..482eeac 100644
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
Signed-off-by: Junio C Hamano
---
rerere.c | 2 +-
rerere.h | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/rerere.c b/rerere.c
index b57a34d..a6a5cd5 100644
--- a/rerere.c
+++ b/rerere.c
@@ -25,7 +25,7 @@ const char *rerere_path(const char *hex, const char *file)
ret
Signed-off-by: Junio C Hamano
---
notes.c | 14 --
notes.h | 14 --
2 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/notes.c b/notes.c
index 93e9868..bc454e1 100644
--- a/notes.c
+++ b/notes.c
@@ -1196,8 +1196,18 @@ void free_notes(struct notes_tree *t)
Signed-off-by: Junio C Hamano
---
grep.c | 6 +-
grep.h | 3 +--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/grep.c b/grep.c
index 925aa92..c7f8a47 100644
--- a/grep.c
+++ b/grep.c
@@ -3,6 +3,10 @@
#include "userdiff.h"
#include "xdiff-interface.h"
+static int grep_sour
Signed-off-by: Junio C Hamano
---
graph.c | 32 ++--
graph.h | 27 ---
2 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/graph.c b/graph.c
index 7e0a099..e864fe2 100644
--- a/graph.c
+++ b/graph.c
@@ -8,6 +8,34 @@
/* Internal API
---
diff.c | 2 +-
diff.h | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index 32142db..35d3f07 100644
--- a/diff.c
+++ b/diff.c
@@ -25,7 +25,7 @@
static int diff_detect_rename_default;
static int diff_rename_limit_default = 400;
static int diff_suppress_bl
Signed-off-by: Junio C Hamano
---
commit.c | 7 +--
commit.h | 1 -
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/commit.c b/commit.c
index 0ea441d..0246767 100644
--- a/commit.c
+++ b/commit.c
@@ -9,6 +9,8 @@
#include "gpg-interface.h"
#include "mergesort.h"
+static stru
Signed-off-by: Junio C Hamano
---
builtin.h | 2 --
builtin/notes.c | 7 +--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/builtin.h b/builtin.h
index 8e37752..95116b8 100644
--- a/builtin.h
+++ b/builtin.h
@@ -21,7 +21,6 @@ struct fmt_merge_msg_opts {
extern int fmt
Signed-off-by: Andrew Wong
---
t/t3404-rebase-interactive.sh | 16
1 file changed, 16 insertions(+)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 7304b66..a194c97 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@
This allows users to edit the todo file while they're stopped in the
middle of an interactive rebase. When this action is executed, all
comments from the original todo file are stripped, and new help messages
are appended to the end.
Signed-off-by: Andrew Wong
---
Documentation/git-rebase.txt |
Signed-off-by: Andrew Wong
---
git-rebase--interactive.sh | 31 ---
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index a09e842..4d57e50 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--
The flag will allow the user to edit the todo file while they're in the middle
of an interactive rebase. It simply invoke the editor and do nothing else.
More discussions here:
http://thread.gmane.org/gmane.comp.version-control.git/205133/focus=205182
Andrew Wong (3):
rebase -i: Refactor he
Queued. 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
In particular, sparse complains as follows:
SP test-string-list.c
test-string-list.c:10:6: warning: symbol 'parse_string_list' was not \
declared. Should it be static?
test-string-list.c:18:6: warning: symbol 'write_list' was not \
declared. Should it be static?
gcc complains as follows:
CC test-generation.o
test-generation.c: In function `main':
test-generation.c:105: warning: control reaches end of \
non-void function
In order to suppress the warning, we simply add a suitable
return statement to main().
Signed-off-by: Ramsay J
David Chanters writes:
> 1. I thought the replace data in .git/refs/replace was published when
> I did "git push" so that others could use this information as a
> base-point, yet it seems not to be the case. How do I publish this?
If you don't tell it what to push, the command will just update
On Sat, Sep 15, 2012 at 9:24 AM, Yi, EungJun wrote:
> "bee-lob" or "bla:b"?
Like Bob, add an L in there.
m
--
martin.langh...@gmail.com
mar...@laptop.org -- Software Architect - OLPC
- ask interesting questions
- don't get distracted with shiny stuff - working code first
- http://wiki.la
> From: Junio C Hamano [mailto:gits...@pobox.com]
> Sent: Saturday, September 15, 2012 7:01 PM
> To: Joachim Schmitz
> Cc: git@vger.kernel.org
> Subject: Re: What's cooking in git.git (Sep 2012, #05; Fri, 14)
>
> "Joachim Schmitz" writes:
>
> > Junio C Hamano wrote:
> >> I think we can start thi
"Philip Oakley" writes:
> "Typically it will be placed in a MUA’s drafts folder, edited to add
> timely commentary that should not go in the changelog after the three
> dashes, and then sent as a message whose body, in our example, starts
> with "arch/arm config files were…". On the receiving end
"Joachim Schmitz" writes:
> Junio C Hamano wrote:
>> I think we can start thinking about feature freeze once the topics
>> in 'next' that are scheduled to graduate to 'master' already are
>> fully cooked. For any late-coming topic, there always is the next
>> cycle ;-)
>
> I've not hear anything
Thanks for your help, Jan!
On Sat, Sep 15, 2012 at 10:26 PM, Jan Engelhardt wrote:
> On Saturday 2012-09-15 15:24, Yi, EungJun wrote:
>
>>"bee-lob" or "bla:b"?
>
> http://en.wiktionary.org/wiki/blob
>
> BLOB as a Binary Large OBject reeks of a retronym.
>
>>I guess "bee-lob" is correct if it mean
The git format-patch allows numbered patches to be created, however I'm
not sure how folk generate the initial "0/n" patch. Which of the various
options should I be using?
Also, being on windows, the various 'mbox' and 'MUA' discussions are new
to me, so the format-patch step where :-
"Typically
On Saturday 2012-09-15 15:24, Yi, EungJun wrote:
>"bee-lob" or "bla:b"?
http://en.wiktionary.org/wiki/blob
BLOB as a Binary Large OBject reeks of a retronym.
>I guess "bee-lob" is correct if it means binary large object. But I'm
>not sure because gitglossary does not tell me about that.
--
To u
"bee-lob" or "bla:b"?
I guess "bee-lob" is correct if it means binary large object. But I'm
not sure because gitglossary does not tell me about that.
--
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
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/gitignore.txt | 3 +++
attr.c | 4 +++-
dir.c | 5 -
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index c1f692a..eb81d
Hi,
Earlier this month I asked how best to handle two branches without a
common ancestor to sync changes from one branch to another. Initially
I did this via the grafts mechanism, but this wasn't a "shared"
solution, in that the graft was local to my checkout of the repository
and no one else's.
This makes wildmatch.c part of libgit.a and builds test-wildmatch
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Makefile | 6 ++
compat/wildmatch.c | 8 +++-
t/t3070-wildmatch.sh | 27 +++
test-wildmatch.c | 8 +++-
4 files changed, 47 insertion
dowild() does case insensitive matching by lower-casing the text. That
means lower case letters in patterns imply case-insensitive matching,
but upper case means exact matching.
We do not want that subtlety. Lower case pattern too so iwildmatch()
always does what we expect it to do.
Signed-off-by
One place less to worry about thread safety
Signed-off-by: Nguyễn Thái Ngọc Duy
---
compat/wildmatch.c | 17 +++--
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/compat/wildmatch.c b/compat/wildmatch.c
index f3a1731..e824eb2 100644
--- a/compat/wildmatch.c
+++ b/compa
These files are from rsync.git commit
d51a3adb4fca3e6b1b046c6e570828f3bca8fe36. The commit is GPL-3. However
wildmatch.[ch] have not changed since rsync turned to GPL-3.
rsync.git -> git.git
lib/wildmatch.[ch] compat/wildmatch.[ch]
wildtest.c test-wildmatch.c
wildtest.
A while back I posted a proof of concept using wildmatch() from rsync.
Back then the obstacle was case-insensitive matching support. I did not
realize that there was iwildmatch() that does exactly that.
So here again a series that is probably ready for consumption. Now
patterns that contain slashe
On Sat, Sep 15, 2012 at 1:36 AM, wrote:
> From: Vitaly _Vi Shukela
>
> Make Ctrl+U for unstaging and Ctrl+J for reverting selection behave
> more like Ctrl+T for adding.
>
> They were working only when one area was focused (diff or commit message),
> now they should work everywhere.
>
> Signed-o
Junio C Hamano wrote:
I think we can start thinking about feature freeze once the topics
in 'next' that are scheduled to graduate to 'master' already are
fully cooked. For any late-coming topic, there always is the next
cycle ;-)
I've not hear anything about my poll patches and I'd really like
> > Does anyone have an idea, what might be wrong here / how to fix it
> > ?
>
> Here: git svn --version
> git-svn version 1.7.12.592.g41e7905 (svn 1.6.18)
>
> What's yours?
1.7.9.5 (ubuntu precise)
> I'm getting
>
> Initialized empty Git repository in /tmp/discovery/.git/
> Using higher lev
49 matches
Mail list logo
