Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
Documentation/config.txt | 6 ++
1 file changed, 6 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index bf8f911..ee64846 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -735,6
find_branch_name() fails to detect format-patch --cover-letter -3
where no command line arguments are given and HEAD is automatically
added. Detect branch name in this case so we can pick up the branch's
description in cover letter.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
I don't see the value of having an empty branch description. But I
may be missing something.
builtin/branch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index
Minor typo
On 12/29/2012 05:20 AM, Eric S. Raymond wrote:
The parsecvs code has been neglected for a long time, and the only
public version does not even build correctly. I have been handed
control of the project and intend to fix this, but until I do it
cannot be recommended.
Also, the
On Tue, Jan 1, 2013 at 11:15 AM, Duy Nguyen pclo...@gmail.com wrote:
Fix pack-objects to behave the way JGit does, cluster commits first in
the pack stream. Now you have a dense space of commits. If I remember
right this has a tiny positive improvement for most rev-list
operations with very
Am 31.12.2012 17:24, schrieb Grégory Pakosz:
Please disregard the previous email that contains an incorrect fix
suggestion. I wish my first contribution was flawless.
Here is what's happening.
git-filter-branch let git-update-ref -d verify that the value for $ref
matches $sha1.
However,
Thanks. A few comments.
At the design level. Where does this $sha1 come from in the first
place?
actually, sha1=$(git rev-parse $ref^0)
(please remember that I'm discovering git internals while figuring out
how to make git filter-branch work in my use case)
in my use case, $ref is
Without use branche option repository restory without files:
$ git clone pr.bundle q/
Cloning into 'q'...
Receiving objects: 100% (619/619), 13.52 MiB | 18.74 MiB/s, done.
Resolving deltas: 100% (413/413), done.
warning: remote HEAD refers to nonexistent ref, unable to checkout.
$ ls -aF q/
./
Without use branche option repository restory without files:
$ git clone pr.bundle q/
Cloning into 'q'...
Receiving objects: 100% (619/619), 13.52 MiB | 18.74 MiB/s, done.
Resolving deltas: 100% (413/413), done.
warning: remote HEAD refers to nonexistent ref, unable to checkout.
$ ls -aF q/
./
* ap/status-ignored-in-ignored-directory (2012-12-26) 1 commit
- wt-status: Show ignored files in untracked dirs
A topic still in flux; will be redone.
I've already redone this part sending two patches (one with the fix,
and one with some tests for each individual use-case) that you
On Tue, Jan 1, 2013 at 4:10 AM, Duy Nguyen pclo...@gmail.com wrote:
On Tue, Jan 1, 2013 at 11:15 AM, Duy Nguyen pclo...@gmail.com wrote:
Fix pack-objects to behave the way JGit does, cluster commits first in
the pack stream. Now you have a dense space of commits. If I remember
right this has a
I was testing some patches against the latest gitk, and noticed that when I
click the mouse on the lines that connect the commits in the history graph,
I get an error popup with:
Error: can't read cflist_top: no such variable
Looks like this was introduced in gitk commit b967135d89e8d8461d059
Jason Holden jason.k.holden.sw...@gmail.com wrote:
I was testing some patches against the latest gitk, and noticed that when I
click the mouse on the lines that connect the commits in the history graph,
I get an error popup with:
Error: can't read cflist_top: no such variable
Looks like
Grégory Pakosz gpak...@visionobjects.com writes:
in my use case, $ref is refs/tags/4.0 which is an annotated tag
$ git rev-parse refs/tags/4.0
e941b106c17b59320f776d58b71fc2fcdb72
Yeah, but in that case it appears to me that you told the command to
rewrite the tag itself and the history
Antoine Pelisse apeli...@gmail.com writes:
* ap/status-ignored-in-ignored-directory (2012-12-26) 1 commit
- wt-status: Show ignored files in untracked dirs
A topic still in flux; will be redone.
I've already redone this part sending two patches (one with the fix,
and one with some tests
Duy Nguyen pclo...@gmail.com writes:
On Tue, Jan 1, 2013 at 11:15 AM, Duy Nguyen pclo...@gmail.com wrote:
Fix pack-objects to behave the way JGit does, cluster commits first in
the pack stream. Now you have a dense space of commits. If I remember
right this has a tiny positive improvement for
Yeah, but in that case it appears to me that you told the command to
rewrite the tag itself and the history behind the commit the tag
refers to, but the end result did not rewrite the tag itself and
left the tag pointing at the original history.
The problem exhibits at the point git
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
find_branch_name() fails to detect format-patch --cover-letter -3
where no command line arguments are given and HEAD is automatically
added.
Nicely spotted.
That is not the only case that takes this codepath, though.
$ git format-patch
Kirill Brilliantov brillian...@inbox.ru writes:
-machineB$ git clone /home/me/tmp/file.bundle R2
+machineB$ git clone /home/me/tmp/file.bundle R2 -b master
I think the command line should follow the convention that is
suggested in git clone -h output, i.e.
git clone -b
Adam Spiers g...@adamspiers.org writes:
diff --git a/Documentation/technical/api-directory-listing.txt
b/Documentation/technical/api-directory-listing.txt
index 0356d25..944fc39 100644
--- a/Documentation/technical/api-directory-listing.txt
+++
Grégory Pakosz gpak...@visionobjects.com writes:
Are you suggesting $sha1 should be obtained differently before
entering case $rewritten ?
That would mean changing sha1=$(git rev-parse $ref^0) at line 376 to
something like $(git cat-file -t $ref) = 'tag' sha1=$(git
rev-parse $ref) ||
Not necessarily every bundle file can be cloned from. Only the ones
that do not need prerequisites can.
When 1d52b02 (Documentation: minor grammatical fixes and rewording
in git-bundle.txt, 2009-03-22) reworded this paragraph, it lost a
critical hint to tell readers why thhis particular bundle
t/3600-rm was using the -a option to cp. This option is a GNU extention
and is not portable. Instead, use just -R (no -p necessary).
Signed-off-by: Ben Walton bdwal...@gmail.com
---
t/t3600-rm.sh |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t3600-rm.sh
David A. Greene gree...@obbligato.org writes:
From: James Nylen jny...@gmail.com
Teach git-subtree about --unannotate. This option strips a prefix
from a commit message when doing a subtree split.
Hrm. This looks like a workaround for a short-sighted misdesign of
the annotate option that
David A. Greene gree...@obbligato.org writes:
From: David A. Greene gree...@obbligato.org
Check refspecs for validity before passing them on to other commands.
This lets us generate more helpful error messages.
Signed-off-by: David A. Greene gree...@obbligato.org
---
Add the perl script check-non-portable-shell.pl to detect non-portable
shell syntax
Many systems use gnu tools which accept an extended syntax in shell scripts,
which is not portable on all systems and causes the test suite to fail.
To prevent contributors using e.g. Linux to add non-portable
David A. Greene gree...@obbligato.org writes:
From: David A. Greene gree...@obbligato.org
Fix the documentation of add to show that a repository can be
specified along with a commit.
Change commit to refspec in the synopsis for add.
Suggested by Yann Dirson dir...@bertin.fr.
sed -i is not portable on all systems.
Use sed with different input and output files.
Utilize a tmp file whenever needed
Signed-off-by: Torsten Bögershausen tbo...@web.de
---
t/t9810-git-p4-rcs.sh | 24 ++--
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git
echo -n is not portable on all systems.
Use printf instead
Signed-off-by: Torsten Bögershausen tbo...@web.de
---
t/t4014-format-patch.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 6cfad13..f460930 100755
---
Use type instead
Signed-off-by: Torsten Bögershausen tbo...@web.de
---
t/t9020-remote-svn.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t9020-remote-svn.sh b/t/t9020-remote-svn.sh
index 4f2dfe0..dbaecbc 100755
--- a/t/t9020-remote-svn.sh
+++ b/t/t9020-remote-svn.sh
Use type instead
Signed-off-by: Torsten Bögershausen tbo...@web.de
---
t/t9020-remote-svn.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t9020-remote-svn.sh b/t/t9020-remote-svn.sh
index 4f2dfe0..dbaecbc 100755
--- a/t/t9020-remote-svn.sh
+++ b/t/t9020-remote-svn.sh
David A. Greene gree...@obbligato.org writes:
From: Jesper L. Nielsen lya...@gmail.com
Before install git-subtree documentation, make sure the manpage
directory exists.
Author:Jesper L. Nielsen lya...@gmail.com
Signed-off-by:Jesper L. Nielsen lya...@gmail.com
Signed-off-by:
David A. Greene gree...@obbligato.org writes:
From: Michael Schubert msc...@elegosoft.com
Add the git-subtree command executable to .gitignore.
Author:Michael Schubert msc...@elegosoft.com
Signed-off-by:Michael Schubert msc...@elegosoft.com
Signed-off-by: David A. Greene
Eric S. Raymond e...@thyrsus.com writes:
The combination of git-cvsimport and cvsps had serious problems.
Among these were:
(1) Analysis of branchy repos was buggy in multiple ways in both
programs, leading to incorrect repo translations.
(2) Even after a correct branch analysis, extra
Thanks; I think I already have 2d3ac9a (t3600: Avoid cp -a, which
is a GNUism, 2012-12-18)
--
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
Torsten Bögershausen tbo...@web.de writes:
Add the perl script check-non-portable-shell.pl to detect non-portable
shell syntax
Many systems use gnu tools which accept an extended syntax in shell scripts,
which is not portable on all systems and causes the test suite to fail.
To prevent
On Tue, Jan 01, 2013 at 01:07:05PM -0800, Junio C Hamano wrote:
critical hint to tell readers why thhis particular bundle can be
s/thhis/this/
signature.asc
Description: OpenPGP digital signature
Torsten Bögershausen tbo...@web.de writes:
sed -i is not portable on all systems.
Use sed with different input and output files.
Utilize a tmp file whenever needed
Signed-off-by: Torsten Bögershausen tbo...@web.de
---
t/t9810-git-p4-rcs.sh | 24 ++--
1 file changed,
Jeff King p...@peff.net writes:
So I think we need to update twoway_merge to recognize unmerged entries,
which gives us two options:
1. Reject the merge.
2. Throw away the current unmerged entry in favor of the new entry
(when old and new are the same, of course; otherwise we
Junio C Hamano gits...@pobox.com writes:
David A. Greene gree...@obbligato.org writes:
From: Techlive Zheng techlivezh...@gmail.com
Use %B to format the commit message and body to avoid an extra newline
if a commit only has a subject line.
Is this an unconditional improvement, or is it
Junio C Hamano gits...@pobox.com writes:
Also, please be careful about the subject line. I doubt that these
8 patches will stand out as relating to contrib/subtree, when mixed
in 200 line output of git shortlog --no-merges.
Ah, ok. I'll be more careful next time.
Junio C Hamano gits...@pobox.com writes:
David A. Greene gree...@obbligato.org writes:
Subject: Re: [PATCH 1/8] Use %B for Split Subject/Body
This needs to say contrib/subtree somewhere (applies to all
patches in this series).
Ok. Shall I re-send everything?
From: Techlive Zheng
Junio C Hamano gits...@pobox.com writes:
David A. Greene gree...@obbligato.org writes:
From: James Nylen jny...@gmail.com
Teach git-subtree about --unannotate. This option strips a prefix
from a commit message when doing a subtree split.
Hrm. This looks like a workaround for a
Junio C Hamano gits...@pobox.com writes:
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 7ceb413..b8a807a 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -509,8 +509,20 @@ cmd_add()
ensure_clean
if [ $#
Junio C Hamano gits...@pobox.com writes:
-git subtree add --prefix=prefix commit
+git subtree add --prefix=prefix refspec
Again, this is not refspec but commit.
Ok, I need to study the terminology. :)
+git subtree add --prefix=prefix repository refspec
This is given to fetch and
Junio C Hamano gits...@pobox.com writes:
David A. Greene gree...@obbligato.org writes:
From: Adam Tkac at...@redhat.com
Teach git-subtree's Makefile to honor DESTDIR.
Author:Adam Tkac at...@redhat.com
Signed-off-by:Adam Tkac at...@redhat.com
Signed-off-by: David A. Greene
Junio C Hamano gits...@pobox.com writes:
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 36ae3e4..52d6fb9 100644
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -35,6 +35,7 @@ install: $(GIT_SUBTREE)
install-doc: install-man
install-man:
sed -i is not portable on all systems.
Use sed with different input and output files.
Utilize a tmp file whenever needed
Added missing at 2 places
Signed-off-by: Torsten Bögershausen tbo...@web.de
---
Changes since v1:
Use sed infile outfile
Added missing at 2 places (thanks for catching)
The main thing this series wants to do is the second one, but I
wanted to reduce the clutter in this document while at it.
Junio C Hamano (3):
SubmittingPatches: who am I and who cares?
SubmittingPatches: mention subsystems with dedicated repositories
SubmittingPatches: remove overlong
The introductory text in the long version talks about the origin
of this document with I started ..., but it is unclear who that I
is, and more importantly, it is not interesting how it was started.
Just state the purpose of the document to help readers decide if it
is releavant to them.
These were only mentioned in periodical A note from the maintainer
posting and not in the documentation suite. SubmittingPatches has a
section to help contributors decide on what commit to base their
changes, which is the most suitable place for this information.
Signed-off-by: Junio C Hamano
The section is no longer a concise checklist. It also talks about
things that are not covered in the Long version text, which means
people need to read both, covering more or less the same thing in
different phrasing.
Fold the details into the main text and remove the section.
Signed-off-by:
Shawn Pearce spea...@spearce.org writes:
How blobs are written is very different, Junio's
implementation is strictly better than JGit's[1].
I do not think there can be a single ordering that is strictly
better than any other one. The clump all objects in a delta family
and write them
On 01.01.13 23:07, Junio C Hamano wrote:
[snip]
What it checks looks like a good start, but the indentation of it
(and the log message) seems very screwed up.
OK
I also have to wonder what's the false positive rate of this. When
you are preparing a new test, you would ideally want a mode that
gree...@obbligato.org writes:
Ack, of course. I don't know how I missed that.
# 15
test_expect_success 'add main6' '
create main6
Why?
It was in the original testsuite from Avery. I didn't add or remove any
tests when I first integrated git-subtree.
The question was about
gree...@obbligato.org writes:
In the meantime, will you apply the patch or do you prefer a new design?
The --unannotate option will become a baggage you will have to keep
working until the end of time, if we applied it. I think it is not
too uch a baggage, so it probably is OK.
--
To
Junio C Hamano gits...@pobox.com:
So..., is this a flag-day patch?
After this is merged, users who have been interoperating with CVS
repositories with the older cvsps have to install the updated cvsps
before using a new version of Git that ships with it?
Yes, they must install an updated
Eric S. Raymond e...@thyrsus.com writes:
Junio C Hamano gits...@pobox.com:
So..., is this a flag-day patch?
After this is merged, users who have been interoperating with CVS
repositories with the older cvsps have to install the updated cvsps
before using a new version of Git that ships
Hi,
I use autoconf with git.git. I have noticed lately, especially when
doing things like git rebase -i --exec make, that ./configure is run
every time. If I understand correctly, this is because of 8242ff4
(build: reconfigure automatically if configure.ac changes,
2012-07-19). Just a few days
Torsten Bögershausen tbo...@web.de writes:
echo -n is not portable on all systems.
Use printf instead
Signed-off-by: Torsten Bögershausen tbo...@web.de
---
Brandon, this comes from 932581b (Unify appending signoff in
format-patch, commit and sequencer, 2012-11-25). Please make sure
to
On Wed, Jan 2, 2013 at 3:38 AM, Junio C Hamano gits...@pobox.com wrote:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
find_branch_name() fails to detect format-patch --cover-letter -3
where no command line arguments are given and HEAD is automatically
added.
Nicely spotted.
That is not
On Tue, Jan 01, 2013 at 06:54:23PM +0100, Stefan Haller wrote:
Jason Holden jason.k.holden.sw...@gmail.com wrote:
I was testing some patches against the latest gitk, and noticed that when I
click the mouse on the lines that connect the commits in the history graph,
I get an error popup
(1) Only print out the names of the files and directories that got
actually deleted.
(2) Show warning message for ignored untracked git repositories
Consider the following repo layout:
test.git/
|-- tracked_dir/
| |-- some_tracked_file
| |-- some_untracked_file
|--
On Tue, Jan 01, 2013 at 03:24:54PM -0800, Junio C Hamano wrote:
+Subsystems with dedicated maintainers
+
+Some parts of the system have dedicated maintainers with their own
+repositories.
+
+ - git-gui/ comes from git-gui project,
Jason Holden jason.k.holden.sw...@gmail.com writes:
Any reason to leave out the maintainers email addresses?
Nothing particular, other than that I did not find anywhere in the
file that does not break the flow.
My only other suggestion for this series might be to augment the file with
a
gree...@obbligato.org writes:
If you want to make sure you give a comit to add_commit, you can
probably say something like this:
git rev-parse -q --verify $1^{commit} /dev/null ||
die '$1' does not refer to a commit
What does $1^{commit} mean?
$thing^{type} tells Git to
Torsten Bögershausen tbo...@web.de writes:
The suggestion is to run it every time the test suite is run, at the begining.
And it seems to be fast enough:
$ time ./check-non-portable-shell.pl ../../git.master/t/t[0-9]*.sh
real0m0.263s
user0m0.239s
sys 0m0.021s
Hmph. OK.
--
To
On Wed, Jan 2, 2013 at 12:17 AM, Shawn Pearce spea...@spearce.org wrote:
And I was wrong. At least since 1b4bb16 (pack-objects: optimize
recency order - 2011-06-30) commits are spread out and can be mixed
with trees too. Grouping them back defeats what Junio did in that
commit, I think.
I
A test case snuck in this release that assumes /usr/bin/python is
python2 and causes test failures. Unlike all other tests and code
depending on python, this one does not respect PYTHON_PATH, which we
explicitly set when building git on Arch Linux due to python2 vs
python3 differences.
-Dan
Dan McGee d...@archlinux.org writes:
A test case snuck in this release that assumes /usr/bin/python is
python2 and causes test failures. Unlike all other tests and code
depending on python, this one does not respect PYTHON_PATH, which we
explicitly set when building git on Arch Linux due to
Junio C Hamano gits...@pobox.com:
Dan McGee d...@archlinux.org writes:
A test case snuck in this release that assumes /usr/bin/python is
python2 and causes test failures. Unlike all other tests and code
depending on python, this one does not respect PYTHON_PATH, which we
explicitly set
On Tue, Jan 01, 2013 at 09:19:13PM -0800, Junio C Hamano wrote:
Dan McGee d...@archlinux.org writes:
A test case snuck in this release that assumes /usr/bin/python is
python2 and causes test failures. Unlike all other tests and code
depending on python, this one does not respect
On Sun, Nov 25, 2012 at 08:05:45PM +0100, Leon KUKOVEC wrote:
Right clicking on a tag pops up a menu, which allows
tag to be renamed or deleted.
Nice idea, but I am concerned that renaming a tag that refers to a tag
object will turn it into a lightweight tag, which would be surprising
for
On Sat, Dec 01, 2012 at 06:16:25PM -0800, Junio C Hamano wrote:
Łukasz Stelmach stl...@poczta.fm writes:
Enable hiding of tags displayed in the tree as yellow labels.
If a repository is used together with a system like Gerrit
there may be quite a lot of tags used to control building
and
Jeff King p...@peff.net writes:
[1] This symlink is doubly wrong, because any use of symbolic links
in the test scripts needs to depend on the SYMLINKS prereq, and this
does not.
Yeah, I think we have discussed this once already in
Hi Martin,
Martin von Zweigbergk wrote:
I use autoconf with git.git. I have noticed lately, especially when
doing things like git rebase -i --exec make, that ./configure is run
every time. If I understand correctly, this is because of 8242ff4
(build: reconfigure automatically if configure.ac
Paul Mackerras pau...@samba.org writes:
On Sat, Dec 01, 2012 at 06:16:25PM -0800, Junio C Hamano wrote:
Łukasz Stelmach stl...@poczta.fm writes:
Enable hiding of tags displayed in the tree as yellow labels.
If a repository is used together with a system like Gerrit
there may be quite a
On Tue, Jan 1, 2013 at 11:21 PM, Jonathan Nieder jrnie...@gmail.com wrote:
How about this patch (untested)?
Looks good. Thanks!
--- a/Makefile
+++ b/Makefile
@@ -2267,12 +2267,9 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)): % :
unimplemented.sh
mv $@+ $@
endif # NO_PYTHON
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
The tip of the 'master' branch is at 1.8.1; the tip of 'next' will
be rewound soonish to reorder topics that are already well cooked
during the
79 matches
Mail list logo
