On Mon, May 05, 2014 at 04:50:58PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
Having said all that, there is one caveat.
Since the remote helper interface is stable and the remote helpers do
not use any of the Git internals, I consider the risks of including
On Mon, May 5, 2014 at 11:46 PM, Jeff King p...@peff.net wrote:
On Sun, May 04, 2014 at 08:13:15AM +0200, Torsten Bögershausen wrote:
1. Tell everyone that NFD in the git repo is wrong, and
they should make a new commit to normalize all their
in-repo files to be precomposed.
Hi,
There has been a lot of discussion about why `git pull` is broken for so
many many workflows: [1][2][3][4][5], even as far back as [6].
Many issues has been brought up, and many proposed solutions, probably
too many for most people properly digest them, so here I'll try to
synthesize them.
Chris Packham judge.pack...@gmail.com writes:
On Tue, Apr 29, 2014 at 2:56 PM, Chris Packham judge.pack...@gmail.com wrote:
Hi Pat,
I'm running git 2.0.0-rc0 (haven't got round to pulling down rc1 yet)
which includes gitgui-0.19.0 and I'm getting a new error when I run
'git gui' in a
Hello!
I have some troubles with git command ³read-tree².
I have big project and I try to add shared library to subdirectory. So I
made the following in my project (on master)
git remote add g...@bitbucket.org:ijin1984/groundwork.git
git fetch groundwork
git checkout b gwbranch
On 6 May 2014 08:01, Jeff King p...@peff.net wrote:
[fixed David's address in cc list]
Ah, right. Wasn't sure what was going on there.
On Tue, May 06, 2014 at 07:54:30AM +1000, James Denholm wrote:
Given that subtree subtree doesn't really generate a lot of discussion,
would it be advisable
git:Documentation/Makefile and others establish RM ?= rm -f as a
convention for rm calls in clean rules, hence follow this convention
instead of simply forcing clean to use rm.
subproj and mainline no longer need to be removed in clean, as they are
no longer created in git:contrib/subtree by make
GVF is already being used in most/all other makefiles in the project,
and has been for _quite_ a while. Hence, drop file-unique gitver and
replace with GIT_VERSION.
Reviewed-by: Jeff King p...@peff.net
Signed-off-by: James Denholm nod.h...@gmail.com
---
contrib/subtree/Makefile | 11 ---
$(libexecdir) isn't used anywhere else in the project, while
$(gitexecdir) is the standard in the other appropriate makefiles. Hence,
replace the former with the latter.
Reviewed-by: Jeff King p...@peff.net
Signed-off-by: James Denholm nod.h...@gmail.com
---
contrib/subtree/Makefile | 6 +++---
git:Documentation/Makefile establishes asciidoc/xmlto calls as being
handled through their appropriate variables, Hence, change to bring into
congruency with.
Similarly, MANPAGE_XSL exists in git:Documentation/Makefile, while
MANPAGE_NORMAL_XSL does not outside contrib/subtree. Hence, replace
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.
The main issues are that calls are made to git itself in the build
process, and that a subtree-exclusive variable is used for specifying
the
In 7ff8463dba0d74fc07a766bed457ae7afcc902b5, the references to gitdir
were removed but the assignment itself wasn't. Hence, drop the gitdir
assignment.
Reviewed-by: Jeff King p...@peff.net
Signed-off-by: James Denholm nod.h...@gmail.com
---
contrib/subtree/Makefile | 1 -
1 file changed, 1
Some more info:
If I use in 5-th command “—prefix=--prefix=mb/trunk/src/libs“ - issue is
reproduced
If “—prefix=--prefix=mb/libs“ - all work fine
With “—prefix=--prefix=mb/trunk/libs“ I haven’t tried, if it is desired
to check this case, just let me know.
On
On 05/03/2014 10:12 PM, brian m. carlson wrote:
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
bundle.c | 38 +++---
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/bundle.c b/bundle.c
index 1222952..798ba28 100644
---
On 05/03/2014 10:12 PM, brian m. carlson wrote:
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
builtin/commit.c | 2 +-
builtin/fsck.c | 4 ++--
cache-tree.c | 30 +++---
cache-tree.h | 3 ++-
merge-recursive.c
On 05/03/2014 10:12 PM, brian m. carlson wrote:
[...]
diff --git a/cache-tree.c b/cache-tree.c
index 7fa524a..b7b2d06 100644
--- a/cache-tree.c
+++ b/cache-tree.c
In this file I also found a couple other 20 that could be converted to
GIT_OID_RAWSZ:
Around line 369:
On 05/03/2014 10:12 PM, brian m. carlson wrote:
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
combine-diff.c | 54 +++---
diff-lib.c | 10 +-
diff.h | 5 +++--
3 files changed, 35 insertions(+), 34
Commit e208f9c introduced a macro to turn error() calls
into:
(error(), -1)
to make the constant return value more visible to the
calling code (and thus let the compiler make better
decisions about the code).
This works well for code like:
return error(...);
but the -1 is superfluous in
Commit e208f9c converted error() into a macro to make its
constant return value more apparent to calling code. Commit
5ded807 prevents us using this macro with clang, since
clang's -Wunused-value is smart enough to realize that the
constant -1 is useless in some contexts.
However, since the last
On 05/06/2014 12:57 AM, Ronnie Sahlberg wrote:
This is a single patch that adds two new functions to try to hide the reflog
implementation details from the callers in checkout.c and reflog.c.
It adds new functions to test if a reflog exists and to delete it, thus
allowing checkout.c to perform
On 05/06/2014 12:57 AM, Ronnie Sahlberg wrote:
Add two new functions, reflog_exists and delete_reflog to hide the internal
Need comma after delete_reflog.
reflog implementation (that they are files under .git/logs/...) from callers.
Update checkout.c to use these functions in
David Turner dtur...@twopensource.com writes:
On a case-insensitive filesystem, when merging, a file would be
wrongly deleted from the working tree if an incoming commit had
renamed it changing only its case. When merging a rename, the file
with the old name would be deleted -- but since the
Matthieu Moy matthieu@grenoble-inp.fr writes:
By default, Git used to set $LESS to -FRSX if $LESS was not set by the
user. The FRX flags actually make sense for Git (F and X because Git
sometimes pipes short output to less, and R because Git pipes colored
output). The S flag (chop
On Tue, 2014-05-06 at 10:07 -0700, Junio C Hamano wrote:
David Turner dtur...@twopensource.com writes:
On a case-insensitive filesystem, when merging, a file would be
wrongly deleted from the working tree if an incoming commit had
renamed it changing only its case. When merging a rename,
John Keeping j...@keeping.me.uk writes:
And it is now probably too late for that to make Git 2.0,...
Anything with end-user visible changes in the core part that is not
a fix to a regression introduced between v1.9.0..master is too late
for the upcoming release. We are way past -rc1.
So I
Junio C Hamano gits...@pobox.com writes:
I still find the output from git blame disturbing, though. The
first thing I do in git blame output is to scroll to the right in
order to identify the the area I am interested in, and this first
step is not negatively affected, because the right
Nathan Collins nathan.coll...@gmail.com writes:
Hmmm. Maybe a warning that the patch is expected to be in '-p1'
format, and that setting 'diff.noprefix=true' makes some commands
generate '-p0' patches?
some? Do you have exceptions in mind?
But I worry this would just confuse / distract
Thanks.
On Tue, May 6, 2014 at 8:55 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
On 05/06/2014 12:57 AM, Ronnie Sahlberg wrote:
Add two new functions, reflog_exists and delete_reflog to hide the internal
Need comma after delete_reflog.
Done. And the other typos too.
reflog
On Mon, May 05, 2014 at 04:51:43PM -0700, Jonathan Nieder wrote:
test_write_lines carefully quotes its arguments as $@, so
test_write_lines a b c
writes two lines as requested, not three.
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
Acked-by: Michael S. Tsirkin
On Sun, Mar 23, 2014 at 10:13:53PM +0100, Per Cederqvist wrote:
On Sun, Mar 23, 2014 at 9:07 PM, Jeff Sipek jef...@josefsipek.net wrote:
On Sun, Mar 23, 2014 at 08:57:08PM +0100, Per Cederqvist wrote:
On Sun, Mar 23, 2014 at 6:04 PM, Jeff Sipek jef...@josefsipek.net wrote:
On Fri, Mar
Michael Haggerty mhag...@alum.mit.edu writes:
It would be pretty annoying to spend a lot of time fetching a big pack,
only to have the fetch fail because one reference out of many couldn't
be updated. This would force the user to download the entire pack
again,...
Is that really true?
David Kastrup d...@gnu.org writes:
Junio C Hamano gits...@pobox.com writes:
I still find the output from git blame disturbing, though. The
first thing I do in git blame output is to scroll to the right in
order to identify the the area I am interested in, and this first
step is not
Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
And it is now probably too late for that to make Git 2.0,...
Anything with end-user visible changes in the core part that is not
a fix to a regression introduced between v1.9.0..master is too late
for the upcoming release. We
On Sun, Mar 23, 2014 at 10:03:48PM +0100, Per Cederqvist wrote:
On Sun, Mar 23, 2014 at 6:09 PM, Jeff Sipek jef...@josefsipek.net wrote:
On Fri, Mar 21, 2014 at 08:31:44AM +0100, Per Cederqvist wrote:
When extracting the patch, we only want the actual patches. We don't
want the ---
Ronnie Sahlberg sahlb...@google.com writes:
It currently has a hard assumption that the loose ref file must exist at this
stage or else it would end up deleting the reflog which is true today, as far
as I can tell, but would break if git would change such that we could have
a branch checked
Timo Teras timo.te...@iki.fi writes:
I'm trying to script a setup that would periodically import a tarball
to git with fast-import. But things do not always change, so I'd like
fast-import to be able to not do the commit in case there is no change.
That is, I'm constructing the commit with
On Tue, May 6, 2014 at 12:15 PM, Junio C Hamano gits...@pobox.com wrote:
Ronnie Sahlberg sahlb...@google.com writes:
It currently has a hard assumption that the loose ref file must exist at this
stage or else it would end up deleting the reflog which is true today, as far
as I can tell, but
John Keeping j...@keeping.me.uk writes:
On Mon, May 05, 2014 at 04:50:58PM -0700, Junio C Hamano wrote:
...
At the same
time, however, the interface the remote helpers use to talk to Git
has not been as stable as you seem to think, I am afraid. For
example, a recent remote-hg/bzr series
On Tue, May 6, 2014 at 11:10 AM, Junio C Hamano gits...@pobox.com wrote:
Nathan Collins nathan.coll...@gmail.com writes:
Hmmm. Maybe a warning that the patch is expected to be in '-p1'
format, and that setting 'diff.noprefix=true' makes some commands
generate '-p0' patches?
some? Do you
On Fri, Mar 21, 2014 at 08:31:45AM +0100, Per Cederqvist wrote:
Test that we can combine any combination of patches with empty and
non-empty messages, both with and without guilt.diffstat. (All
patches are empty.)
I feel like we should have *some* content there - most of the time, I care
more
Junio C Hamano wrote:
Having said that, I agree with the conclusion of your message:
There is a different level of urgency between you cannot use this
new feature until you update Git and if you update Mercurial then
the remote helper will stop working, and that's why I think the
remote
David Turner dtur...@twopensource.com writes:
Would you prefer that I add it to t6022-merge-rename.sh? Or I could
add it to t7062-wtstatus-ignorecase.sh and rename that file to
t7062-ignorecase.sh.
If I had only these two choices, t6022 would be it, as 6xxx series
is where we have other
On Fri, Mar 21, 2014 at 08:31:48AM +0100, Per Cederqvist wrote:
There were two problems with the old code:
- Since set -e is in effect (that is set in scaffold) the run-test
script exited immediately if a t-*.sh script failed. This is not
nice, as we want the error report that
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
On Fri, Mar 21, 2014 at 08:31:49AM +0100, Per Cederqvist wrote:
The shouldfail function already redirects stderr to stdout, so there
is no need to do the same in t-028.sh and t-021.sh.
Signed-off-by: Per Cederqvist ced...@opera.com
---
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
On Fri, Mar 21, 2014 at 08:31:55AM +0100, Per Cederqvist wrote:
Give an error message if no patches are applied. Added a test case
that never terminates unless this fix is applied.
Signed-off-by: Per Cederqvist ced...@opera.com
---
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
On Fri, Mar 21, 2014 at 08:31:56AM +0100, Per Cederqvist wrote:
This fix relies on the fact that git branch names can not contain :.
Signed-off-by: Per Cederqvist ced...@opera.com
---
guilt-graph | 2 +-
1 file changed, 1
On Fri, Mar 21, 2014 at 08:31:57AM +0100, Per Cederqvist wrote:
git branch names can contain commas. Check that guilt graph works
even in that case.
Signed-off-by: Per Cederqvist ced...@opera.com
---
regression/t-033.out | 62
On Fri, Mar 21, 2014 at 03:57:37AM -0400, Eric Sunshine wrote:
On Fri, Mar 21, 2014 at 3:31 AM, Per Cederqvist ced...@opera.com wrote:
Quote quotes with a backslash in the guitl graph output. Otherwise,
s/guitl/guilt/
Yep.
the dot file could contain syntax errors.
Added a test case.
Felipe Contreras wrote in message
5366db742d494_18f9e4b308aa@nysa.notmuch:
== git update ==
Another proposed solution is to have a new command: `git update`. This
command would be similar to `git pull --ff-only` by default, but it
could be configured to do merges instead, and when doing so
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
On Fri, Mar 21, 2014 at 08:31:59AM +0100, Per Cederqvist wrote:
Use --no-decorate in the call to git log that tries to read the commit
message to produce patch names. Otherwise, if the user has set
log.decorate to short or full, the
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
On Fri, Mar 21, 2014 at 08:32:00AM +0100, Per Cederqvist wrote:
Signed-off-by: Per Cederqvist ced...@opera.com
---
guilt-patchbomb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guilt-patchbomb b/guilt-patchbomb
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
On Fri, Mar 21, 2014 at 08:32:01AM +0100, Per Cederqvist wrote:
Signed-off-by: Per Cederqvist ced...@opera.com
---
guilt-rebase | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guilt-rebase b/guilt-rebase
index
On 05/06/2014 08:40 PM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
It would be pretty annoying to spend a lot of time fetching a big pack,
only to have the fetch fail because one reference out of many couldn't
be updated. This would force the user to download the
Ilya Bobyr ilya.bo...@gmail.com writes:
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 ilya.bo...@gmail.com
---
A number of minor
Junio C Hamano gits...@pobox.com writes:
The need to explain better with longer description will reduce the
likelyhood that the feature is understood and correctly used. When
you can write 1-2,4-, why accept 1-4 !3 and force yourself to
explain to people why that is different from !3 1-4?
Nathan Collins nathan.coll...@gmail.com writes:
But 'git apply' could be much more helpful than 'patch' even, since
the presence or absence of the 'a/' and 'b/' prefixes in the patch,
and the 'diff.noprefix' setting, give Git enough info to be very
helpful to the user.
The prefix would be
James Denholm nod.h...@gmail.com writes:
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.
The main issues are that calls are made to git itself in the build
process, and that a
Junio C Hamano gits...@pobox.com wrote:
It is funny to see sign-off on 0/5 ;-)
Yeah, I wasn't quite sure of exact protocol, and sort-of defaulted to
sign-all-the-things mode.
By the way, this is v3, not v2, no? It was somewhat confusing to
see Peff saying filfre to add my reviewed-by on v2,
On Tue, May 06, 2014 at 08:49:22PM +0200, Matthieu Moy wrote:
Exactly. I personally never use git blame outside git gui blame for
this reason.
I'd recommend tig blame for this, too, which behaves like less -S
with respect to long lines (and also makes it easy to jump to the full
diff, or
On Tue, May 06, 2014 at 12:17:14AM +, Eric Wong wrote:
Users may already store sensitive data such as imap.pass in
.git/config; making the file world-readable when git config
is called to edit means their password would be compromised
on a shared system.
Makes sense, and the patch looks
Jeff King p...@peff.net writes:
I realize this has veered off into talking about an update command,
and not necessarily pull, but since there a lot of proposals floating
around, I wanted to make one point: if we are going to do such a switch,
let's please make it something the user explicitly
dtur...@twopensource.com writes:
From: David Turner dtur...@twitter.com
Signed-off-by: David Turner dtur...@twitter.com
Ehh, why?
---
builtin/grep.c | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/builtin/grep.c b/builtin/grep.c
index
Hi Felipe,
Jordan McCullough here from the GitHub Training team. I noticed you were kind
enough to open a Pull Request (linked below for reference) addressing this. We
really do appreciate the contribution.
I'll review the PR just as soon as I can, so anticipate a merge with your
changes to
Jeff King p...@peff.net writes:
Commit e208f9c introduced a macro to turn error() calls
into:
(error(), -1)
to make the constant return value more visible to the
calling code (and thus let the compiler make better
decisions about the code).
This works well for code like:
return
Junio C Hamano wrote:
But recording the merge to have parents Z C does not give us
the first-parent is the trunk worldview, in the presense of B.
We would prefer to end up with a history more like this:
-A O
\ \
X---Y---Z---B'--C'
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 has passed v2.0.0-rc1. Last minute
fixes to newly added code keep flowing in, which is good. I've
picked up
This is a series adds two new functions to try to hide the reflog
implementation details from the callers in checkout.c and reflog.c.
It adds new functions to test if a reflog exists and to delete it, thus
allowing checkout.c to perform this if-test-then-delete operation without
having to know the
Change checkout.c to check if a ref exists instead of checking if a loose ref
file exists when deciding if to delete an orphaned log file. Otherwise, if a
ref only exists as a packed ref without a corresponding loose ref for the
currently checked out branch, we risk that the reflog will be deleted
Add two new functions, reflog_exists and delete_reflog, to hide the internal
reflog implementation (that they are files under .git/logs/...) from callers.
Update checkout.c to use these functions in update_refs_for_switch instead of
building pathnames and calling out to file access functions.
From: David Turner dtur...@twitter.com
Make it possible to change the case of a filename on a
case-insensitive filesystem using git mv. Change git mv to allow
moves where the destination file exists if either the destination file
has the same inode as the source file (for Mac) or the same name
From: David Turner dtur...@twitter.com
On a case-insensitive filesystem, when merging, a file would be
wrongly deleted from the working tree if an incoming commit had
renamed it changing only its case. When merging a rename, the file
with the old name would be deleted -- but since the filesystem
Junio C Hamano wrote:
* fc/remote-helpers-hg-bzr-graduation (2014-04-29) 11 commits
- remote-hg: trivial cleanups
- remote-hg: make sure we omit multiple heads
- git-remote-hg: use internal clone's hgrc
- t: remote-hg: split into setup test
- remote-hg: properly detect missing contexts
Felipe Contreras felipe.contre...@gmail.com writes:
Therefore the release notes are still lying to the users:
* git push via transport-helper interface (e.g. remote-hg) has
been updated to allow ref deletion in a way similar to the natively
supported transports.
That is not true.
Junio C Hamano wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
Plus this one which has been completely ignored:
completion: move out of contrib
It is not about ignored. It is about running out of time before
concluding the day's integration.
A comment doesn't require
John Keeping j...@keeping.me.uk writes:
I'd like to register my opposition to moving git-remote-{bzr,hg} out of
contrib/.
I am not convinced that tools for interoperating with other VCSs need to
be part of core Git; as Junio has pointed out previously, while contrib/
was necessary ...
On Tue, 2014-05-06 at 15:24 -0700, Junio C Hamano wrote:
dtur...@twopensource.com writes:
From: David Turner dtur...@twitter.com
Signed-off-by: David Turner dtur...@twitter.com
Ehh, why?
Briefly, because otherwise ./t7811-grep-open.sh fails when run under
watchman.
This is actually
Junio C Hamano wrote:
I _think_ it probably is OK for git-imerge.git/Makefile to peek into
our Makefile, e.g.
$ cd git-imerge.git
$ make GIT_SOURCE_DIR=../git.git install
to learn where imerge should install its subcommand implementation and
documentation. It might even want to
Felipe Contreras felipe.contre...@gmail.com writes:
These have been stable and widely used for quite a long time, they even
have tests outside of the contrib area, and most distributions ship
them, so they can be considered part of the core already.
Let's move them out of contrib and install
On Tue, May 6, 2014 at 2:12 PM, Junio C Hamano gits...@pobox.com wrote:
Nathan Collins nathan.coll...@gmail.com writes:
But 'git apply' could be much more helpful than 'patch' even, since
the presence or absence of the 'a/' and 'b/' prefixes in the patch,
and the 'diff.noprefix' setting, give
Junio C Hamano wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
These have been stable and widely used for quite a long time, they even
have tests outside of the contrib area, and most distributions ship
them, so they can be considered part of the core already.
Let's move
I would recommend Kitchen Design Lancashire any day of the week.
-
Kitchen Design Lancashire Reviews
--
View this message in context:
http://git.661346.n2.nabble.com/Kitchen-Design-Lancashire-Reviews-tp7609861.html
Sent from the git mailing list archive at Nabble.com.
--
To unsubscribe
On Tue, May 06, 2014 at 05:06:51PM -0700, David Turner wrote:
On Tue, 2014-05-06 at 15:24 -0700, Junio C Hamano wrote:
dtur...@twopensource.com writes:
From: David Turner dtur...@twitter.com
Signed-off-by: David Turner dtur...@twitter.com
Ehh, why?
Briefly, because
On Tue, May 06, 2014 at 03:29:37PM -0700, Junio C Hamano wrote:
We can work around this by encapsulating the constant return
value in a static inline function, as gcc specifically
avoids complaining about unused function returns unless the
function has been specifically marked with the
This causes my test to pass and generally seems correct to me.
On Tue, 2014-05-06 at 23:00 -0400, Jeff King wrote:
...
That being said, this really seems like something that the run-command
interface should be doing, since it can handle the chdir in the forked
child. And indeed, it seems to
On Tue, 06 May 2014 12:18:16 -0700
Junio C Hamano gits...@pobox.com wrote:
Timo Teras timo.te...@iki.fi writes:
I'm trying to script a setup that would periodically import a
tarball to git with fast-import. But things do not always change,
so I'd like fast-import to be able to not do the
When applying binary patches a full index is required. format-patch
already handles this, but diff-tree needs '--full-index' argument
to always output full index. When git-p4 runs git-apply to test
the patch, git-apply rejects the patch due to abbreviated blob
object names. This is the error
86 matches
Mail list logo
