Whenever the diff pane scrolls, highlight the corresponding file in the
file list on the right. For a large commit with many files and long
per-file diffs, this makes it easier to keep track of what you're looking
at.
This allows simplifying the prevfile and nextfile functions, because
all they
Add more test cases to check that the topology after a rebase is as
expected. Conflicts are not considered, but patch-equivalence is.
---
Tests pass and fail as indicated by the suffix
(_success/_failure). Your input especially appreciated on whether you
agree with the intent of the test cases.
Hi,
Junio C Hamano wrote:
Thanks. I _think_ you still want to make sure these are
directories, so instead of losing the trailing slash, you would want
to keep it and add a leading slash to anchor them to the t/perf
directory, i.e.
/build/
/test-results/
/trash
Signed-off-by: Joachim Schmitz j...@schmitz-digital.de
---
This needs the 4 compat-poll patches posted earlier.
Needs a different link order in Makefile: libintl before libiconv.
This may affect other platforms, so needs some checking.
Also I'm not really sure how to best #ifdef the #include
Andrew Wong andrew.k...@gmail.com writes:
On 09/16/12 02:54, Junio C Hamano wrote:
In any case, what information are you discarding and then replacing
with the standard boilerplate?
It's to strip out the comment that says:
# However, if you remove everything, the rebase will be aborted.
Am 9/18/2012 8:31, schrieb Martin von Zweigbergk:
Add more test cases to check that the topology after a rebase is as
expected. Conflicts are not considered, but patch-equivalence is.
---
Tests pass and fail as indicated by the suffix
(_success/_failure). Your input especially appreciated
All,
Thanks for reply but its not working still. Things which I have done till now
is
On Linux machine
Installed libiconv-1.14 unded /usr/local/lib path.
-rw-r--r-- 1 root root 912 Sep 15 20:40 libiconv.la
lrwxrwxrwx 1 root root 17 Sep 15 20:40
Johannes Sixt j.s...@viscovery.net writes:
From: Johannes Sixt j...@kdbg.org
When the todo sheet of interactive rebase instructs to run a non-existing
command, the operation stops with the following error:
Execution failed: no-such
You can fix the problem, and then run
git
Is there an easy way to get git to clone/pull from a Mercurial repository?
Bye, Jojo
--
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
So I did
git fetch
git rebase
git describe
v1.7.12-503-g5976753
./configure --prefix=/home/sb
make
make install
GEN perl/PM.stamp
SUBDIR gitweb
SUBDIR ../
SUBDIR perl
make[1]: `perl.mak' is up to date.
make[2]: `GIT-VERSION-FILE' is up to date.
GEN git-instaweb
SUBDIR
Am 9/18/2012 13:20, schrieb Matthieu Moy:
Johannes Sixt j.s...@viscovery.net writes:
From: Johannes Sixt j...@kdbg.org
When the todo sheet of interactive rebase instructs to run a non-existing
command, the operation stops with the following error:
Execution failed: no-such
You can
From: Georgi Chorbadzhiyski [mailto:g...@unixsol.org]
Sent: Tuesday, September 18, 2012 2:06 PM
To: Joachim Schmitz
Cc: git@vger.kernel.org
Subject: Re: Can git pull from a mercurial repository?
Around 09/18/2012 02:22 PM, Joachim Schmitz scribbled:
Is there an easy way to get git to
From: Andreas Ericsson [mailto:a...@op5.se]
Sent: Tuesday, September 18, 2012 1:46 PM
To: Joachim Schmitz
Cc: git@vger.kernel.org
Subject: Re: Can git pull from a mercurial repository?
On 09/18/2012 01:22 PM, Joachim Schmitz wrote:
Is there an easy way to get git to clone/pull from a
On Mon, Sep 17, 2012 at 11:39 PM, Junio C Hamano gits...@pobox.com wrote:
Ralf Thielow ralf.thie...@gmail.com writes:
- install correct refspec if the value of --branch is a tag (test added)
What is the definition of correct? I see the documentation says
--branch can also take tags and
--index-filter git rm --cached -qr -- . git reset -q -- filename
Hmm... I tried as you said, but it seems to lose history.
In the below example, after rewriting there must be two commits for
'b' file but only one exists.
~$ git init filter-branch2
Initialized empty Git repository in
Am 9/18/2012 17:01, schrieb Yi, EungJun:
--index-filter git rm --cached -qr -- . git reset -q -- filename
Hmm... I tried as you said, but it seems to lose history.
I think it should be '... git reset -q $GIT_COMMIT -- filename'
-- Hannes
--
To unsubscribe from this list: send the line
I think it should be '... git reset -q $GIT_COMMIT -- filename'
It works! Thanks to Hannes and Andreas!
On Wed, Sep 19, 2012 at 12:10 AM, Johannes Sixt j.s...@viscovery.net wrote:
Am 9/18/2012 17:01, schrieb Yi, EungJun:
--index-filter git rm --cached -qr -- . git reset -q -- filename
The note that explains that changes introduced by removed commits are
preserved should be placed directly after the paragraph that describes
such commits removal. Otherwise the reference to the commits appears
out of context.
Signed-off-by: Andreas Schwab sch...@linux-m68k.org
---
Ralf Thielow ralf.thie...@gmail.com writes:
IMO if a user uses clone --single-branch --branch tag, then he/she
wants to have this tag only. Why should the next git fetch fetching
something different?
OK, I can buy that.
--
To unsubscribe from this list: send the line unsubscribe git in
the
Joachim Schmitz j...@schmitz-digital.de writes:
From: Junio C Hamano [mailto:gits...@pobox.com]
Sent: Tuesday, September 18, 2012 9:57 AM
To: Joachim Schmitz
Cc: git@vger.kernel.org
Subject: Re: [PATCH/RFC] Port to HP NonStop
Joachim Schmitz j...@schmitz-digital.de writes:
Needs a
From: Junio C Hamano [mailto:gits...@pobox.com]
Sent: Tuesday, September 18, 2012 7:03 PM
To: Joachim Schmitz
Cc: git@vger.kernel.org
Subject: Re: [PATCH/RFC] Port to HP NonStop
Joachim Schmitz j...@schmitz-digital.de writes:
From: Junio C Hamano [mailto:gits...@pobox.com]
Sent:
Michael Haggerty mhag...@alum.mit.edu writes:
If another sort order is needed, then we will either have to audit
existing string_list users to make sure that they don't rely on strcmp()
ordering, or we will have to implement strcmp() ordering *plus* the new
ordering.
What I was envisioning
In particular, sparse complains that ... 'dump_grep_expression'
was not declared. Should it be static?. In order to suppress
the warning, since this function does not need more than file
scope, we simply include the static modifier in it's declaration.
Signed-off-by: Ramsay Jones
Am 18.09.2012 05:12, schrieb Kenny Simpson:
Is there any nice way to get a diff and/or diffstat of both a project and
its submodules between two revisions of the main project?
Something like 'git diff --stat tag_a tag_b' but also including the diffstat
on the submodule from the revision
Jeff King p...@peff.net writes:
But even without that, I still think format-patch is a reasonable time
to do it. It is the time when I proof-read my commit message and patch
in its final form, and think do I really want to send this?.
But it is not like I cannot sign off because I think it is
After running git clone --single, the resulting repository has the
usual default +refs/heads/*:refs/remotes/origin/* wildcard fetch
refspec installed, which means that a subsequent git fetch will
end up grabbing all the other branches.
Update the fetch refspec to cover only the singly cloned ref
On Tue, Sep 18, 2012 at 12:11:58PM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
But even without that, I still think format-patch is a reasonable time
to do it. It is the time when I proof-read my commit message and patch
in its final form, and think do I really want to
Jens Lehmann jens.lehm...@web.de writes:
Am 18.09.2012 05:12, schrieb Kenny Simpson:
Is there any nice way to get a diff and/or diffstat of both a project and
its submodules between two revisions of the main project?
Something like 'git diff --stat tag_a tag_b' but also including the
Hello again,
so two weeks have passed, and I've moved at a glacial pace towards a
method how to measure compatibility of our generated ZIP files. Sorry,
I just keep getting distracted.
Anyway, the idea is to have a bunch of files with names using different
scripts, zip them with several
Ralf Thielow ralf.thie...@gmail.com writes:
After running git clone --single, the resulting repository has the
usual default +refs/heads/*:refs/remotes/origin/* wildcard fetch
refspec installed, which means that a subsequent git fetch will
end up grabbing all the other branches.
Update the
Ralf Thielow ralf.thie...@gmail.com writes:
+ ...
+ # explicit --single with tag
+ git clone --single-branch --branch two . dir_tag
+
+ # advance both master and side branches
+ git checkout side
+ echo five file
+ git commit -a -m five
+ git checkout
Set general purpose flag 11 if we encounter a path that contains
non-ASCII characters. We assume that all paths are given as UTF-8; no
conversion is done.
Signed-off-by: Rene Scharfe rene.scha...@lsrfire.ath.cx
---
Changes from previous version: Stop using has_non_ascii(), which does
slightly
Jeff King p...@peff.net writes:
On Tue, Sep 18, 2012 at 12:11:58PM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
But even without that, I still think format-patch is a reasonable time
to do it. It is the time when I proof-read my commit message and patch
in its final
Ramsay Jones ram...@ramsay1.demon.co.uk writes:
In particular, sparse complains that ... 'dump_grep_expression'
was not declared. Should it be static?. In order to suppress
the warning, since this function does not need more than file
scope, we simply include the static modifier in it's
Andreas Schwab sch...@linux-m68k.org writes:
Junio C Hamano gits...@pobox.com writes:
So something like this instead?
I agree it's even better.
Andreas.
Thanks for proofreading. I'll squash in the differences to your
patch.
--
To unsubscribe from this list: send the line unsubscribe git
The UTF-8 flag seems to be ignored by unzip unless we also mark the
archive entry as coming from a Unix system. This is done by setting the
field creator_version (version made by in the standard[1]) to 0x03NN.
The NN part represents the version of the standard supported by us, and
this patch
From: Junio C Hamano gits...@pobox.com
have anything to do with DCO in any case?
Junio,
What's DCO an abbreviation of?
Philip
--
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
On Tue, Sep 18, 2012 at 12:47:36PM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
But even without that, I still think format-patch is a reasonable time
to do it. It is the time when I proof-read my commit message and patch
in its final form, and think do I really want
Johannes Sixt j.s...@viscovery.net writes:
From: Johannes Sixt j...@kdbg.org
When the todo sheet of interactive rebase instructs to run a non-existing
command, the operation stops with the following error:
Execution failed: no-such
You can fix the problem, and then run
git
On Mon, Sep 10, 2012 at 1:57 PM, Joseph Leong josephcle...@gmail.com wrote:
Hi Everyone,
I've noticed an issue in gitweb where git projects are created with
characters such as:
€酮خد㐁ᠡꀈ༑㘚.git
But in the gitweb page content, URL section, a git project is
rendered incorrectly?
Example
Junio C Hamano gits...@pobox.com writes:
Philip Oakley philipoak...@iee.org writes:
Avoid confusion in compound sentence about the start of the commit set
and the depth measure. Use two sentences.
Dropping the first ',' after positive depth does not seem to make
it any easier to read (I
On Monday, September 17, 2012 17:49:39 Junio C Hamano wrote:
Philip Oakley philipoak...@iee.org writes:
I then applied it (using git am) to a temp branch to see what it
produced, and could repeat the cycle until the patches looked right.
That's another obvious and valid way to prepare your
Ammon Riley ammon.ri...@gmail.com wrote:
Branches passed to 'git-svn init' via the -b/--branches flag
automatically had a /* appended to them. When the branch contained
a fancy glob with a {} pattern, this is incorrect behaviour, and
leads to odd branches being created in the git repository.
Jeff King p...@peff.net writes:
What I think would be much more productive is breaking apart gigantic
includes like cache.h into more reasonable modules, which would mean
less frequent recompilation when an uninteresting part of the header
changes.
Ideally cache.h should cover what
Ramkumar Ramachandra artag...@gmail.com writes:
When tests were run without building git, the following error message
was displayed:
.: 54: Can't open /path/to/git/source/t/../GIT-BUILD-OPTIONS
Does the test stop due to this error, or it just goes on and hit
another error? I am guessing
Ramkumar Ramachandra artag...@gmail.com writes:
Because that emits an ugly
./test-lib.sh: 54: /home/artagnon/src/git/t/../git: not found
Don't you deserve it? ;-)
The full message would read
./test-lib.sh: 54: /home/artagnon/src/git/t/../git: not found
error: you do not seem to
On Mon, Sep 17, 2012 at 04:11:19PM -0400, Jeff King wrote:
On Mon, Sep 17, 2012 at 12:50:37PM +0100, Adam Spiers wrote:
The end result of these changes is that:
- red is _only_ used for things which have gone unexpectedly wrong:
test failures, unexpected test passes, and failures
On Tue, Sep 18, 2012 at 10:59 PM, Jeff King p...@peff.net wrote:
TODO is a special token[1] respected by TAP harnesses like prove. I'm
not sure what practical impact it has, but it should probably remain.
-Peff
[1] http://testanything.org/wiki/index.php/TAP_specification#TODO_tests
Thanks,
On Tue, Sep 18, 2012 at 1:46 PM, Eric Wong normalper...@yhbt.net wrote:
Ammon Riley ammon.ri...@gmail.com wrote:
Branches passed to 'git-svn init' via the -b/--branches flag
automatically had a /* appended to them. When the branch contained
a fancy glob with a {} pattern, this is incorrect
The latest maintenance release Git v1.7.12.1 is now available at
the usual places.
The release tarballs are found at:
http://code.google.com/p/git-core/downloads/list
and their SHA-1 checksums are:
c5227b5202947bba3d63dca72662fad02d208800 git-1.7.12.1.tar.gz
Welcome to the Git development community.
This message is written by the maintainer and talks about how Git
project is managed, and how you can work with it.
* Mailing list and the community
The development is primarily done on the Git mailing list. Help
requests, feature proposals, bug reports
My first patch series, adds small documentation updates covering
points I had noticed or had to research elsewhere.
The small 'git' update applies on top of Junio's changes in 'next'.
V2 changes are in patches 3, 5, 6, and 7
The updated patches incorporate corrections and suggestions from
Junio
Highlight there is a further discussion section later in
git man page
Signed-off-by: Philip Oakley philipoak...@iee.org
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 34d8a1b..d932a3e 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -30,6 +30,7 @@ After you
Use a gitignore link rather than the gitrepository-
layout link.
Signed-off-by: Philip Oakley philipoak...@iee.org
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 9c1d395..fd9e36b 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -155,7 +155,7 @@
'git clean' is controlled by gitignore. Provide See Also link for it.
Use of core.excludesfile is implied.
Signed-off-by: Philip Oakley philipoak...@iee.org
diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt
index 79fb984..9f42c0d 100644
--- a/Documentation/git-clean.txt
+++
Indicate that the -v option can be given twice in the short options.
Without it users pass over the option. Also indicate the alternate
'git remote show' method.
Signed-off-by: Philip Oakley philipoak...@iee.org
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index
Use separate bulleted paragraphs for the three different gitignore
pattern sources.
Signed-off-by: Philip Oakley philipoak...@iee.org
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index c1f692a..96639e0 100644
--- a/Documentation/gitignore.txt
+++
Clarify that 'depth=' specifies the new depth from the remote's
branch tip. It does not add the depth to the existing shallow clone.
(details from pack-protocol.txt).
Clarify that tags are not fetched. (details from shallow.txt)
Signed-off-by: Philip Oakley philipoak...@iee.org
diff --git
From: Michael Haggerty mhag...@alum.mit.edu
Sent: Monday, September 10, 2012 10:53 PM
On 09/10/2012 10:46 PM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
Document some bugs in git fetch-pack:
1. If git fetch-pack is called with --all, --depth, and an
explicit existing
Philip Oakley philipoak...@iee.org writes:
Git URLs can accept bundle files for fetch, pull and clone, include
in that section. Include git clone in the bundle usage description.
Correct the quoting of git-rev-list-args.
Detail the git-rev-list-args '--all' option for cloning.
On Tue, Sep 18, 2012 at 07:57:54AM +0200, Stefan Haller wrote:
Whenever the diff pane scrolls, highlight the corresponding file in the
file list on the right. For a large commit with many files and long
per-file diffs, this makes it easier to keep track of what you're looking
at.
I like this
Ammon Riley ammon.ri...@gmail.com wrote:
I confess that I'd completely forgot about the {} expansion in bash.
Perhaps a note in the CAVEATS section of the documentation would
be sufficient?
I think so, yes. Can you send a patch for that instead? Thanks.
--
To unsubscribe from this list: send
Make note that while the --follow option is accepted by git blame it does
nothing.
Signed-off-by: Drew Northup n1xim.em...@gmail.com
---
Documentation/git-blame.txt | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
Philip Oakley philipoak...@iee.org writes:
Clarify that 'depth=' specifies the new depth from the remote's
branch tip. It does not add the depth to the existing shallow clone.
(details from pack-protocol.txt).
Clarify that tags are not fetched. (details from shallow.txt)
Signed-off-by:
Philip Oakley philipoak...@iee.org writes:
Highlight there is a further discussion section later in
git man page
Signed-off-by: Philip Oakley philipoak...@iee.org
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 34d8a1b..d932a3e 100644
--- a/Documentation/git.txt
+++
Philip Oakley philipoak...@iee.org writes:
Use separate bulleted paragraphs for the three different gitignore
pattern sources.
Signed-off-by: Philip Oakley philipoak...@iee.org
Thanks.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Philip Oakley philipoak...@iee.org writes:
Use a gitignore link rather than the gitrepository-
layout link.
Signed-off-by: Philip Oakley philipoak...@iee.org
Thanks.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
Philip Oakley philipoak...@iee.org writes:
'git clean' is controlled by gitignore. Provide See Also link for it.
Use of core.excludesfile is implied.
Signed-off-by: Philip Oakley philipoak...@iee.org
Thanks.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a
Philip Oakley philipoak...@iee.org writes:
--v::
+-v, -vv::
--verbose::
When in list mode,
show sha1 and commit subject line for each head, along with
relationship to upstream branch (if any). If given twice, print
- the name of the upstream branch, as well.
+
Drew Northup n1xim.em...@gmail.com writes:
Make note that while the --follow option is accepted by git blame it does
nothing.
Signed-off-by: Drew Northup n1xim.em...@gmail.com
---
Documentation/git-blame.txt | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
Hi,
Installing latest stable git on Mac OS X Mountain Lion is blocked by Gatekeeper.
Could you provide an installer for latest stable git that is signed with an
Apple issued developer ID so gatekeeper will let it through?
I upgraded to Mountain Lion and decided to update git as well, but only
71 matches
Mail list logo
