Hi,
This patch series comes from
https://github.com/jlehmann/git-submod-enhancements branch
recursive_submodule_checkout. It needed some tiny tweaks to apply to
current master and build without warnings, but nothing major, and I
haven't sanity checked it much beyond that and letting the kind
() to remove the directories of those submodules which
are scheduled for removal. Also teach verify_clean_submodule() to check
that a submodule configured to be removed is not modified before scheduling
it for removal.
Signed-off-by: Jens Lehmann jens.lehm...@web.de
Signed-off-by: Jonathan Nieder
From: Jens Lehmann jens.lehm...@web.de
Date: Mon, 18 Jun 2012 22:11:45 +0200
Signed-off-by: Jens Lehmann jens.lehm...@web.de
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
---
Neat. Would probably be clearer with some of the corresponding tests
squashed in to illustrate the intended behavior
From: Jens Lehmann jens.lehm...@web.de
Date: Fri, 5 Apr 2013 18:35:27 +0200
Signed-off-by: Jens Lehmann jens.lehm...@web.de
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
---
Also neat, also would benefit from documentation or tests.
entry.c| 15 --
submodule.c| 86
From: Jens Lehmann jens.lehm...@web.de
Date: Wed, 13 Jun 2012 18:50:10 +0200
Signed-off-by: Jens Lehmann jens.lehm...@web.de
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
---
This is the patch that actually introduces the --recurse-submodules
option, which makes the rest work.
The tests
the tests come in chronological
order instead of logical order and simultaneous patches to the same
test script become more likely to conflict.
How about something like the following, for squashing in?
With or without the tweaks below,
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
diff --git i
.
The error handling looks right.
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
--
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
Roman Kagan wrote:
Subversion serf backend in versions 1.8.5 and below has a bug that the
function creating the descriptor of a file change -- add_file() --
doesn't make a copy of its 3d argument when storing it on the returned
3d makes me think of 3-dimensional. ;-) I think you mean third
Michael Haggerty wrote:
[Subject: safe_create_leading_directories(): modernize format of if
chaining]
Trivia: it's not so much modernizing as following KR style, which git
more or less followed since day 1. Linux's Documentation/CodingStyle
explains:
Note that the closing brace is empty
Michael Haggerty wrote:
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
sha1_file.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sha1_file.c b/sha1_file.c
index c9245a6..cc9957e 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -108,9 +108,10 @@ int
Michael Haggerty wrote:
[Subject: safe_create_leading_directories(): add slash pointer]
Is this a cleanup or improving the (internal) functionality of the
function somehow? The above one-liner doesn't sum up for me in an
obvious way why this is a good change.
Keep track of the position of
Hi,
Michael Haggerty wrote:
It could be that some other process is trying to clean up empty
directories at the same time that safe_create_leading_directories() is
attempting to create them. In this case, it could happen that
directory a/b was present at the end of one iteration of the loop
'else if' here).
This patch doesn't depend on any of the others from the series. For
what it's worth, with or without the following squashed in,
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
Thanks.
diff --git i/refs.c w/refs.c
index 3ab1491..ea62395 100644
--- i/refs.c
+++ w/refs.c
@@ -2574,14
sense. Perhaps also worth mentioning that this is fixed by
r1553376, but no need to reroll just for that.
Cc: Benjamin Pabst benjamin.pabs...@gmail.com
Cc: Eric Wong normalper...@yhbt.net
Cc: Jonathan Nieder jrnie...@gmail.com
No need for these lines --- the mail header already keeps track
Hi,
Johannes Schindelin wrote:
While regular commit histories hardly win comprehensibility in general
if they merge more than twenty-two branches in one go, it is not Git's
business to limit grafts in such a way.
Fun. :) Makes sense.
[...]
---
builtin/blame.c | 8
commit.c
Johannes Schindelin wrote:
it returns EOF only if ch == EOF *and* sb-len == 0, i.e. if no characters
have been read before hitting EOF.
Yep. api-strbuf.txt even says so. Sorry for the nonsense.
For what it's worth,
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
--
To unsubscribe from
Johannes Schindelin wrote:
On Fri, 27 Dec 2013, Jonathan Nieder wrote:
Is this easy to reproduce so some interested but lazy person could
write a test?
Yep. Make 25 orphan commits, add a graft line to make the first a merge of
the rest.
Thanks. Here's a pair of tests doing that.
Signed
Jeff King wrote:
I am not _that_ bothered by the known breakage, but AFAICT there is
zero benefit to keeping this redundant test.
Devil's advocate: it ensures that anyone wrapping git's tests (like
the old smoketest infrastructure experiment) is able to handle an
expected failure.
But in
Hi,
Jeff King wrote:
Once upon a time, the test-lib library would create trash
directories in the current working directory, unless we were
explicitly told to put it elsewhere via --root. As a result,
t created the sub-test trash directories inside its own
trash directory.
However, we
Jeff King wrote:
--- a/t/t-basic.sh
+++ b/t/t-basic.sh
@@ -50,11 +50,11 @@ run_sub_test_lib_test () {
shift 2
mkdir $name
(
- # Pretend we're a test harness. This prevents
- # test-lib from writing the counts to a file that will
-
Jonathan Nieder wrote:
- git used to only use TEST_OUTPUT_DIRECTORY to decide where test
results go. You'd have to use --root to set a custom location for
trash directories.
- in that old setup, t leaves around extra trash directories with
--root, since the sub-tests inherit
Jeff King wrote:
When I want to debug a failing test, I often end up doing:
cd t
./t4107-tab -v -i
cd tratab
The test names are long, so tab-completing on the trash directory is
very helpful. Lately I've noticed that there are a bunch of crufty trash
directories in my t/ directory,
Junio C Hamano wrote:
Jonathan Nieder jrnie...@gmail.com writes:
Jeff King wrote:
When I want to debug a failing test, I often end up doing:
cd t
./t4107-tab -v -i
cd tratab
The test names are long, so tab-completing on the trash directory is
very helpful. Lately I've noticed
Hi,
Sebastian Schuberth wrote:
[...]
--- a/Documentation/technical/api-builtin.txt
+++ b/Documentation/technical/api-builtin.txt
@@ -14,7 +14,7 @@ Git:
. Add the external declaration for the function to `builtin.h`.
-. Add the command to `commands[]` table in
Jeff King wrote:
On Mon, Dec 30, 2013 at 10:51:25AM -0800, Jonathan Nieder wrote:
These scratch areas for sub-tests should be under the t
trash directory, but because the TEST_OUTPUT_DIRECTORY
setting from the toplevel test leaks
[...]
This is not exactly true
Hi,
Thomas Ackermann wrote:
In repo_b your ref for origin/master
has not moved. It has remotely (meaning refs/heads/master in repo_a
has moved), but git status is not hitting the remote to find out; it
only looks at the local state.
[...]
But for the simple
Hi,
Ramkumar Ramachandra wrote:
a plain
$ git format-patch -o outgoing
is a no-op on a topic branch, and the user has to remember to specify
'master' explicitly everytime. Save the user the extra keystrokes by
introducing format.defaultTo
Not excited. Two reasons:
John Szakmeister wrote:
I think in a
typical, feature branch-based workflow @{u} would be nearly useless.
I thought the idea of @{u} was that it represents which ref one
typically wants to compare the current branch to. It is used by
'git
-by: Jonathan Nieder jrnie...@gmail.com
---
Olaf Meeuwissen wrote[1]:
Yes, it's called LV and documented in the lv(1) manual page. Simply
search for 'env' ;-)
Ah, thanks. How about this patch?
[1] http://bugs.debian.org/730527
Documentation/config.txt | 4
git-sh-setup.sh | 3
Hi,
Ryan Biesemeyer wrote:
In this case it was not immediately clear to me how to add cleanup to an
existing
test that dirtied the state of the test repository by leaving behind an
in-progress
merge. I see `test_cleanup` defined in the test lib related functions, but
see no
examples
Matthieu Moy wrote:
Jonathan's answer is an option. Another one is
[...]
So if the cleanup goes wrong, one can notice.
test_when_finished also makes the test fail if the cleanup failed.
Another common strategy is
test_expect_success 'my exciting test' '
# this test
Hi Dan,
Dan Kaplan wrote:
My environment is probably different from most. I'm using cygwin.
This makes it very difficult to use different versions of
git/svn/git-svn, but I'm interested in learning git more so I'm
willing to try whatever it takes.
$ git version
git version 1.8.3.4
$
Dan Kaplan wrote:
Do you think it'll still work?
Yes, that's why I suggested it. ;-)
You might need to install the gcc-core, libcurl-devel, openssl-devel,
and subversion-perl packages first.
Regards,
Jonathan
--
To unsubscribe from this list: send the line
on
these systems, causing t4056.5 orderfile is a directory to fail.
On some weird OS it might even make sense to pass a directory to the
-O option and this is not a common user mistake that needs catching.
Remove the test.
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
---
Hi,
t4056 is failing
Hi,
Philip Oakley wrote:
The Everyday GIT With 20 Commands Or So guide is not accessible
via the git help system. Fix that.
Neat. :)
Junio covered everything I'd want to say about patch 1/6.
After fixing that, I'd suggest squashing all 6 patches into a single
patch. They all are part of
Hi,
Nguyễn Thái Ngọc Duy wrote:
If an entry is watched, git lets an external program decide if the
entry is modified or not. It's more like --assume-unchanged, but
designed to be controlled by machine.
We are running out of on-disk ce_flags, so instead of extending
on-disk entry format
Hi,
Lianheng Tong wrote:
git clone W1:path to A on W1/.git path to A on W2
Interesting.
Thoughts:
* More typical usage is to clone from a bare repository (A.git), which
wouldn't have this problem. But I think your case is worth
supporting, too.
* What would you think of putting
(just cc-ing some area experts)
Hi Benoît,
Benoît Bourbié wrote:
git gui crashes on my Linux machin since I updated it to 1.8.5.2.
I assume you mean master and not 1.8.5.2, since v1.8.5.2 doesn't
include the change 918dbf58 (git-gui: right half window is paned,
2013-08-21).
I had the message
Junio C Hamano wrote:
Ruben Kerkhof ru...@rubenkerkhof.com writes:
As a last check, I set smtpsslcertpath = /etc/pki/tls/cert.pem in
~/.gitconfig and git-send-email works fine now.
Which would mean that the existing code, by blindly defaulting to
/etc/ssl/certs/ and misdiagnosing that the
uninteresting twice --- once by setting in the
UNINTERESTING flag in handle_revision_arg() and a second attempted
time in mark_tree_uninteresting()? Makes sense.
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message
.
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
---
Documentation/gitignore.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index f971960..37c9470 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation
is the (*) above. With that change,
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
--
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
Junio C Hamano wrote:
Jonathan Nieder jrnie...@gmail.com writes:
Shouldn't this use write_in_full() to avoid a silently truncated result? (*)
Meaning this? If so, I think it makes sense.
[...]
- if (xwrite(fd, out.buf, out.len) 0)
+ if (write_in_full(fd, out.buf, out.len
Hi,
Strainu wrote:
strainu@emily:~/core git review -f
Creating a git remote called gerrit that maps to:
ssh://stra...@gerrit.wikimedia.org:29418/pywikibot/core.git
Your change was committed before the commit hook was installed.
Amending the commit to add a gerrit change id.
At
Hi,
Yuri wrote:
Timezone here doesn't help the log reader at all. It doesn't even
reflect the actual location of the submitter. Instead, it should be
converted to the local TZ of the client. This will make it easier to
read and understand the time.
Does git log --date=local or git log
David Kastrup wrote:
Now I might have sent at an unopportune time: blame.c is mostly
attributed to Junio who seems to have been a few days absent now.
I also have seen quite a few mails and patch submissions on the list go
basically unanswered in the last few days.
In the U.S., yesterday
David Kastrup wrote:
So my understanding is that when we are talking about _significant_
additions to builtin/blame.c (the current patches don't qualify as such
really) that
a) builtin/blame.c is licensed under GPLv2
b) significant contributions to it will not be relicensed under
different
David Kastrup wrote:
Jonathan Nieder jrnie...@gmail.com writes:
Any idea how this could be made more clear? E.g., maybe we should
bite the bullet and add a line to all source files that don't already
state a license:
/*
* License: GPLv2. See COPYING for details
David Kastrup wrote:
The combination of the SubmittingPatches text with the file notices in
builtin/blame.c is not really painting a full picture of the situation.
BTW, thanks for bringing this up. It last came up at [1]. Perhaps we
can do better by adding a note to README or some similar
David Kastrup wrote:
and contrib. The README file states
Git is an Open Source project covered by the GNU General Public
License version 2 (some parts of it are under different licenses,
compatible with the GPLv2). It was originally written by Linus
Torvalds with help of a
Hi,
salmansheikh wrote:
I
downloaded and installed the latest libz (1.2.8) but i installed it under a
local directory under my user name (i.e. /home/ssheikh/local). The problem
is that git only looks in the locations below.
Hi,
Jeff King wrote:
EWAH is a word-aligned compressed variant of a bitset (i.e. a data
structure that acts as a 0-indexed boolean array for many entries).
I suspect that for some callers it's not word-aligned.
Without the following squashed in, commits 212f2ffb and later fail t5310
on some
Jeff King wrote:
Commit d60c49c (read-cache.c: allow unaligned mapping of the
index file, 2012-04-03) introduced helpers to access
unaligned data. Let's factor them out to make them more
widely available.
While we're at it, we'll give the helpers more readable
names, add a helper for the
Jeff King wrote:
Here's a patch series (on top of jk/pack-bitmap, naturally) that lets
t5310 pass there. I assume the ARM problem is the same, though seeing
the failure in realloc() is unexpected. Can you try it on both your
platforms with these patches?
Thanks. Trying it out now.
[...]
Jeff King wrote:
I think it was a bug waiting to surface if index v4 ever got wide use.
Ah, ok.
In that case I think git-compat-util.h should include something like
what block-sha1/sha1.c has:
#if !defined(__i386__) !defined(__x86_64__) \
!defined(_M_IX86)
Jeff King wrote:
On Thu, Jan 23, 2014 at 11:56:43AM -0800, Jonathan Nieder wrote:
In that case I think git-compat-util.h should include something like
what block-sha1/sha1.c has:
#if !defined(__i386__) !defined(__x86_64__) \
!defined(_M_IX86) !defined(_M_X64
Jeff King wrote:
On Thu, Jan 23, 2014 at 11:52:06AM -0800, Jonathan Nieder wrote:
My main worry about the patches is that they will probably run into
an analagous problem to the one that v1.7.12-rc0~1^2~2
[...]
I think this probably works in practice because align_ntohl is inlined,
and any
Jeff King wrote:
[1/2]: compat: move unaligned helpers to bswap.h
[2/2]: ewah: support platforms that require aligned reads
After setting NEEDS_ALIGNED_ACCESS,
Tested-by: Jonathan Nieder jrnie...@gmail.com # ARMv5
--
To unsubscribe from this list: send the line unsubscribe git in
the body
Jeff King wrote:
If we
change the signature of align_ntohl, we can do this:
uint32_t align_ntohl(void *ptr)
{
uint32_t x;
memcpy(x, ptr, sizeof(x));
return ntohl(x);
}
...
foo =
Jeff King wrote:
On Thu, Jan 23, 2014 at 09:53:26PM +, brian m. carlson wrote:
Yes, it will. SPARC requires all loads be naturally aligned (4-byte to
an address that's a multiple of 4, 8-byte to a multiple of 8, and so
on). In general, architectures that do not support unaligned access
Jeff King wrote:
On Thu, Jan 23, 2014 at 02:17:55PM -0800, Jonathan Nieder wrote:
I don't think that's a big issue. A pair of 4-byte reads would not be
too slow.
The header is actually two separate 4-byte values, so that's fine. But
between the header and trailer are a series of 8-byte
Jeff King wrote:
Here it is again, fixing the issues we've discussed.
Thanks! Passes all tests.
Tested-by: Jonathan Nieder jrnie...@gmail.com # ARMv5
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info
Jeff King wrote:
These short names might not be descriptive enough now that they are
globals. However, they make sense to me.
Yeah, I think they're clear. And they match the Linux kernel's
get_unaligned_be32() / put_unaligned_be32().
--
To unsubscribe from this list: send the line unsubscribe
Jeff King wrote:
This _might_ still suffer from the issue fixed in 5f6a112 (block-sha1:
avoid pointer conversion that violates alignment constraints,
2012-07-22), as we are taking the pointer of a uint32 in a struct.
No conversion, so no issue there.
Line 1484 looks more problematic:
to guard with something like
if (ntohl(1) != 1) {
...
}
The optimizer can tell if this is true or false at compile time, so
it shouldn't slow anything down.
With that change,
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
Thanks for the quick fix.
diff --git i/ewah
Vicent Martí wrote:
On Fri, Jan 24, 2014 at 12:44 AM, Jonathan Nieder jrnie...@gmail.com wrote:
+#if __BYTE_ORDER != __BIG_ENDIAN
Is this portable?
We explicitly set the __BYTE_ORDER macros in `compat/bswap.h`. In
fact, this preprocessor conditional is the same one that we use when
Hi,
Brad King wrote:
Add test cases that use 'merge-recursive' plumbing with a temporary
index and empty work tree. Populate the index using 'read-tree' and
'update-index --ignore-missing --refresh' to prepare for merge without
actually checking all files out to disk. Verify that each
in the source above the GIT (part of the git suite) section. I
don't think that matters.
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
--
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
Matthieu Moy wrote:
Robert Dailey wrote:
Are there any dedicated mailing lists for git releases, or RSS feeds?
Not sure if there's a Windows-dedicated list, but there's this:
http://gitrss.q42.co.uk/
It filters the mailing-list posts starting with eg. [ANNOUNCE] and turns it
into an
Hi,
Kacper Kornet wrote:
The change in release numbering also breaks down gitolite v2 setups. One
of the gitolite commands, gl-compile-conf, expects the output of git
--version
to match /git version (\d+)\.(\d+)\.(\d+)/.
I have no idea how big problem it is, as I don't know how many
and LV envvars are set for pagination
Noticed on Ubuntu PPA builders, where the race was lost about half the
time. Compare v1.7.0.2~6^2 (tests: Fix race condition in t7006-pager,
2010-02-22).
Reported-by: Anders Kaseorg ande...@mit.edu
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
---
Anders
Hi,
Erez Zilber wrote:
Writing perl.mak for Git
Writing perl.mak for Git
rename MakeMaker.tmp = perl.mak: No such file or directory at
/usr/share/perl5/ExtUtils/MakeMaker.pm line 1024.
make[3]: perl.mak: No such file or directory
make[3]: perl.mak: No such file or directory
make[3]: ***
systems realize it's a noop.
In any event, in the real world your patch looks like the right thing
to do.
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
--
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
Hi,
Jeff King wrote:
I do find the failure mode interesting. The endian-swapping code kicked
in when it did not
Odd --- wouldn't the #if condition expand to '0 != 0'?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
Hi,
David Kastrup wrote:
builtin/blame.c merely states
/*
* Blame
*
* Copyright (c) 2006, Junio C Hamano
*/
I think you planned to make substantial changes, so
/*
* Blame
*
* Copyright (c) 2006--2014, Junio C Hamano and others
* Licensed under GPLv2. See Git's
Hi,
David Kastrup wrote:
Also whether or not this implies an assignment of copyright, it is a
reasonable assumption for
[...]
Since I think we've completely gone off the rails:
I assume the problem you're trying to solve is that files don't have
clear enough notices of their licensing. That
Jens Lehmann wrote:
This commit adds the functions and files needed for configuration,
documentation, setting the default behavior and determining if a
submodule path should be updated automatically.
Yay!
[...]
Documentation/recurse-submodules-update.txt | 8 +
submodule.c
(new +x) | 46
t/t7104-reset.sh (gone) | 46
Hm, summary incorporated in the diffstat. Neat. :)
format-patch -M tells me that this indeed just renamed the files, so
fwiw
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
Hi,
Miklos Vajna wrote:
git clone git://anongit.freedesktop.org/libreoffice/core
cd core
git log --full-history -p -S'mnTitleBarHeight ='
sd/source/ui/dlg/PaneDockingWindow.cxx
Here the first output I get from git-log is
b390fae1706b9c511158a03e4fd61f263be4e511, where you can see that
Junio C Hamano wrote:
Moving to some other directory and letting the remainder of the test
pieces to expect that they start there is a bad practice.
I agree with the above, and I like the patch...
The test
that contains chdir itself
Hi,
Junio C Hamano wrote:
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -94,6 +94,9 @@ int cmd_check_attr(int argc, const char **argv, const char
*prefix)
struct git_attr_check *check;
int cnt, i, doubledash, filei;
+ if (!is_bare_repository())
+
Hi again,
Jonathan Nieder wrote:
Junio C Hamano wrote:
+if (!is_bare_repository())
+setup_work_tree();
Hm. Shouldn't check-attr error out when run without a worktree and
without --cached?
That would mean something like
diff --git i/builtin/check-attr.c w/builtin
Junio C Hamano wrote:
Jonathan Nieder jrnie...@gmail.com writes:
The test
that contains chdir itself may fail (or by mistake skipped via the
GIT_SKIP_TESTS mechanism) in which case the remainder may operate on
files in unexpected
Duy Nguyen wrote:
Don't take it the wrong way. I was just summarizing the last round. It
surprised me though that this went under my radar. Perhaps a bug
tracker is not a bad idea after all (if Jeff went missing, this bug
could fall under the crack)
I'm happy to plug
-
David Kastrup wrote:
Duy Nguyen pclo...@gmail.com writes:
Likely because --aggressive passes --depth=250 to pack-objects. Long
delta chains could reduce pack size and increase I/O as well as zlib
processing signficantly.
[...]
Compression should reduce rather than increase the total amount
Hi,
Guido Günther wrote:
Without this when maintaining stable branches it's easy to forget to use
-x to track where a patch was cherry-picked from.
[...]
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -215,6 +215,14 @@ the working tree.
spending extra
Hi Phillip,
Phillip Susi wrote:
git am already ignores the [PATCH X/Y] prefix that format-patch
adds. Is it possible to get it to ignore any additional prefix that a
bug tracker mangles into the subject line? i.e. bug #:?
builtin/mailinfo.c is the place to start (see git-mailinfo(1)).
Hi,
Michael Haggerty wrote:
No, this hasn't changed. I've been documenting public functions in the
header files above the declaration, and private ones where they are
defined. So I moved the documentation for this function to cache.h:
+/*
+ * Return the name of the file in the local
subject-mangling
strategy (e.g., removing a bug #: prefix introduced by a bug
tracker).
Reported-by: Phillip Susi ps...@ubuntu.com
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
---
Documentation/git-am.txt | 5 +
1 file changed, 5 insertions(+)
diff --git a/Documentation/git-am.txt b
Hi,
Andrew Wong wrote:
The first two patches are just about rewording a message, and adding messages
to tell users to use git merge --abort to abort a merge.
Sounds like a good idea. I look forward to reading the patches.
We could stop here and hope that the users would read the messages,
Hi,
Andrew Wong wrote:
[Subject: wt-status: Make conflict hint message more consistent with other
hints]
Thanks for working on this.
Could you include a little more detail? What other hints is this
making the message more consistent with?
Ideally the commit message would include a quick
Andrew Wong wrote:
Yeah, this breaks compatibility, but like I said, during a merge, I don't
see a good reason to do git reset --mixed, and not git reset --merge.
Yeah, in principle if it had a different behavior, then plain git
reset could be useful during a merge, but as is, I tend to use
Hi,
Sandy Carter wrote:
Add missing leading dash to proposed commands in french output when
using the command:
Thanks!
[...]
--- a/po/fr.po
+++ b/po/fr.po
@@ -3266,7 +3266,7 @@ msgstr git branch -d %s\n
#: builtin/branch.c:1027
#, c-format
msgid git branch --set-upstream-to
Hi,
Some quick thoughts.
Heiko Voigt wrote:
This submodule configuration cache allows us to lazily read .gitmodules
configurations by commit into a runtime cache which can then be used to
easily lookup values from it. Currently only the values for path or name
are stored but it can be
.
Looks obviously correct, so for what it's worth,
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
Thanks,
Jonathan
--
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
Hi,
Nemina Amarasinghe wrote:
Signed-off-by: Nemina Amarasinghe nemi...@gmail.com
The above is a place to explain why this is a good change. For example:
When it prints a message indicating what it has done,
install_branch_config() treats the (!remote_is_branch origin)
Uwe Storbeck wrote:
Backslash sequences are interpreted as control characters
by the echo command of some shells (e.g. dash).
This has bothered me for a while but never enough to do anything about
it. Thanks for fixing it.
Signed-off-by: Uwe Storbeck u...@ibr.ch
Reviewed-by: Jonathan
this easier to remember, and tweak 'say'
and 'die_with_status' to illustrate how it is used.
No functional change intended.
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
---
git-sh-setup.sh | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git i/git-sh-setup.sh w/git-sh
Junio C Hamano wrote:
Jonathan Nieder jrnie...@gmail.com writes:
We currently use echo all over the place (e.g., 'echo $path' in
git-sh-setup), and every time we fix it there is a chance of making
mistakes. I wonder if it would make sense to add a helper to make the
echo calls easier
Hi,
yun sheng wrote:
these two files have the same timestamp, the same size, bug slightly
different contents.
How did they get the same timestamp?
[...]
Git I'm using is msysgit 1.9.0 on windows 7
Unixy operating systems have other fields like inode number and ctime
that make it possible
1 - 100 of 2895 matches
Mail list logo