Duy Nguyen pclo...@gmail.com writes:
OK so your question was if there was a git_path() or mkpath() call
earlier in update_refs_for_switch() and the result was expected to
remain stable till the end of update_refs_for_switch(), then this
conversion could ruin it, correct? I didn't think about
Duy Nguyen pclo...@gmail.com writes:
On Thu, Feb 20, 2014 at 3:17 AM, Junio C Hamano gits...@pobox.com wrote:
+ strbuf_setlen(sb, len);
+ strbuf_add(sb, s, strlen(s));
I am not sure addstr_at() gives us a good abstraction, or at least
the name conveys what it does well
Max Horn m...@quendi.de writes:
On 19.02.2014, at 22:41, Junio C Hamano gits...@pobox.com wrote:
* fc/transport-helper-fixes (2013-12-09) 6 commits
- remote-bzr: support the new 'force' option
- test-hg.sh: tests are now expected to pass
- transport-helper: check for 'forced update' message
Junio C Hamano gits...@pobox.com writes:
Duy Nguyen pclo...@gmail.com writes:
On Thu, Feb 20, 2014 at 3:17 AM, Junio C Hamano gits...@pobox.com wrote:
+ strbuf_setlen(sb, len);
+ strbuf_add(sb, s, strlen(s));
I am not sure addstr_at() gives us a good abstraction, or at least
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
@@ -2717,17 +2729,19 @@ static int copy_msg(char *buf, const char *msg)
return cp - buf;
}
-int log_ref_setup(const char *refname, char *logfile, int bufsize)
+int log_ref_setup(const char *refname, struct strbuf *sb_logfile)
{
Duy Nguyen pclo...@gmail.com writes:
But why is it OK to fail in the first place? If we couldn't link,
don't you want to fall back to the lock codepath? After all, the
are we on the same device? check is to cope with the case where
we cannot link and that alternate codepath is supposed to
Junio C Hamano gits...@pobox.com writes:
Junio C Hamano gits...@pobox.com writes:
What is the right mental model the end-user needs to form when
understanding these? Conditions on keys go on the left, and any
other random conditions can come as a modifier after action
e.g
Christian Jaeger chr...@gmail.com writes:
Also, in man git-gc document --aggressive that it leads to slower
*read* performance after the gc, I remember having red that option's
docs when I ran it, and since it didn't mention that it makes reads
slower, I didn't expect it to, and thus didn't
Duy Nguyen pclo...@gmail.com writes:
For old projects, commits older than 1-2 years is probably less often
accessed and could use some aggressive packing.
I used to repack older part of history manually with a deeper depth,
mark the result with the .keep bit, and then repack the whole thing
Duy Nguyen pclo...@gmail.com writes:
Why not reversed order? So its syntax could be
[ - ] FIELD [ : [ version | v ] ]
It fits better to current f-e-r syntax where modifiers are after the
colon. And it avoids the possibility that someone adds field version
and we can't tell what version is
Max Horn m...@quendi.de writes:
Thanks. Let's keep it a bit longer and see how your new
investigation (and possibly help from others) develops to a
solution.
So I had a closer look, and I now believe to now understand what
the right fix is. Simply dropping transport-helper: check for
Jeff King p...@peff.net writes:
On Fri, Feb 21, 2014 at 06:47:47AM +0700, Nguyễn Thái Ngọc Duy wrote:
This delta_stack array can grow to any length depending on the actual
delta chain, but we forget to free it. Normally it does not matter
because we use small_delta_stack[] from stack and
Michael Haggerty mhag...@alum.mit.edu writes:
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
cache.h | 16
1 file changed, 16 insertions(+)
diff --git a/cache.h b/cache.h
index dc040fb..0ecd1c8 100644
--- a/cache.h
+++ b/cache.h
@@ -788,13 +788,29 @@ static
Michael Haggerty mhag...@alum.mit.edu writes:
Give the poor humans some names to help them make sense of things.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Good.
Reviewed-by: me.
replace_object.c | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
Tay Ray Chuan rcta...@gmail.com writes:
In particular, show that --short and --porcelain, while implying
--dry-run, do not return the same exit code as --dry-run. This is due to
the wt_status.commitable flag being set only when a long status is
requested.
I am not sure if --short/--porcelain
Jeff King p...@peff.net writes:
On Sat, Feb 22, 2014 at 10:29:22AM +0700, Nguyễn Thái Ngọc Duy wrote:
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
The new prereq GNULINUX is an ugly workaround until people provide
strverscmp compat implementation. I hope that will happen soon
Max Horn m...@quendi.de writes:
On 21.02.2014, at 19:04, Junio C Hamano gits...@pobox.com wrote:
Isn't it possible for some helpers to _do_ want to
tell us that it did not have to force after all by _not_ saying
forced update and overwrite -forced_update with zero?
Yes to the first part
Junio C Hamano gits...@pobox.com writes:
But I think I was worried too much into the future---I agree that
the code can stay as you proposed until such a remote-helper needs
more support, because overwrite with zero is necessary but is
probably not sufficient---it also may need to be able
Michael Haggerty mhag...@alum.mit.edu writes:
Contrariwise, I thought about it again and believe that it *is*
important for the docstring to mention explicitly that the return value
is architecture-dependent
As it gives an internal hash value which should not leak to the
outside world (e.g.
Jeff King p...@peff.net writes:
On Fri, Feb 21, 2014 at 12:21:13PM -0800, Junio C Hamano wrote:
Tay Ray Chuan rcta...@gmail.com writes:
In particular, show that --short and --porcelain, while implying
--dry-run, do not return the same exit code as --dry-run. This is due
Duy Nguyen pclo...@gmail.com writes:
On Mon, Feb 17, 2014 at 07:15:32PM +0700, Nguyễn Thái Ngọc Duy wrote:
@@ -777,6 +778,8 @@ static int prepare_to_commit(const char *index_file,
const char *prefix,
_(Please enter the commit message for your
changes.
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
definitely better than raw numbers but not really important
I would appreciate if it were an optional feature.
diff --git a/diff.c b/diff.c
index 8e4a6a9..ca2b92a 100644
---
Thomas Rast t...@thomasrast.ch writes:
I spoke too soon; it breaks the test I wrote to cover this case, for a
reason that gives me a headache.
When we hit the conditional
- if (!one-sha1_valid ||
- reuse_worktree_file(name, one-sha1, 1)) {
+ if (!S_ISGITLINK(one-mode)
+
Robin H. Johnson robb...@gentoo.org writes:
The only other clean alternative would be implementing ONLY
--sparse-checkout-from, and letting uses use fds creatively:
--sparse-checkout-from (echo X; echo Y)
Not all POSIX shells have such an abomination that is process
substitution. You can
David Aguilar dav...@gmail.com writes:
Modern versions of git submodule use .git-files to setup the
submodule directory. When run in a git submodule-created
repository git difftool --dir-diff dies with the following
error:
$ git difftool -d HEAD~
fatal: This operation must be
Richard Lowe richl...@richlowe.net writes:
Bitfields need to specify their signedness explicitly or the compiler is
free to default as it sees fit. With compilers that default 'unsigned'
(SUNWspro 12 seems to do this) the tri-state nature of is_binary
vanishes and all files are treated as
Jeff King p...@peff.net writes:
Yes, with a few exceptions, we usually try to make the ordering in the
config file irrelevant. This is a bug. The patch below should fix it.
Looks good. Thanks.
-- 8 --
Subject: remote: handle pushremote config in any order
The remote we push can be
Thomas Gummerer t.gumme...@gmail.com writes:
previous round was at $gmane/242198.
Since then I've squashed the fixes suggested by Junio, added a test
showing what should happen if an index file is present and
GIT_INDEX_VERSION is set and fixed the typo found by Eric.
Looks good; thanks.
--
John Marshall j...@sanger.ac.uk writes:
Document --keep-index's short form -k in both main synopsis and
the save synopsis in the Options section.
Signed-off-by: John Marshall j...@sanger.ac.uk
---
Looks good; thanks.
A very small documentation patch: I'd not read the main synopsis
Michael Haggerty mhag...@alum.mit.edu writes:
I was reading around in the neighborhood of fsck, objects, and packs
and I had the familiar and discouraging experience of having to read
code all the way up and down the callstack to understand *anything*.
Please let's all make more of an effort
Michael Haggerty mhag...@alum.mit.edu writes:
Junio, what would be easiest for you? I suggest that I rebase this
patch series back on top of mh/replace-refs-variable-rename when re-rolling.
Hmph, I suspect I do not care too deeply either way, as a mismerge
would be fairly obvious (nobody
Jeff King p...@peff.net writes:
Sorry, this one slipped through the cracks. Here's a re-roll addressing
your comments.
...
- In the context of pack-objects, the name --honor-pack-keep
makes sense; it is understood that pack-objects will _not_ remove
kept packfile, so honoring can
Junio C Hamano gits...@pobox.com writes:
Thomas Gummerer t.gumme...@gmail.com writes:
previous round was at $gmane/242198.
Since then I've squashed the fixes suggested by Junio, added a test
showing what should happen if an index file is present and
GIT_INDEX_VERSION is set and fixed
Jeff King p...@peff.net writes:
If an ident line has a ridiculous date value like (2^64)+1,
we currently just pass ULONG_MAX along to the date code,
which can produce nonsensical dates.
On systems with a signed long time_t (e.g., 64-bit glibc
systems), this actually doesn't end up too bad.
Phillip Susi ps...@ubuntu.com writes:
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 #:?
I think applypatch-msg hook is your friend in a case like
Jeff King p...@peff.net writes:
On Mon, Feb 24, 2014 at 11:50:00AM -0800, Junio C Hamano wrote:
We also recognize overflow in the timezone field, which
could produce nonsensical results. In this case we show the
parsed date, but in UTC.
Both are good measures to fallback to sanity
Junio C Hamano gits...@pobox.com writes:
Jeff King p...@peff.net writes:
Yes, with a few exceptions, we usually try to make the ordering in the
config file irrelevant. This is a bug. The patch below should fix it.
Looks good. Thanks.
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch
Jeff King p...@peff.net writes:
On Mon, Feb 24, 2014 at 12:32:32PM -0800, Junio C Hamano wrote:
+test_expect_success 'branch.*.pushremote config order is irrelevant' '
+ mk_test one_repo heads/master
+ mk_test two_repo heads/master
+ test_config remote.one.url one_repo
Jeff King p...@peff.net writes:
On Mon, Feb 24, 2014 at 12:21:33PM -0800, Junio C Hamano wrote:
+ if (date_overflows(date))
+ date = 0;
+ else {
+ if (ident-tz_begin ident-tz_end)
+ tz = strtol(ident-tz_begin, NULL
Thomas Gummerer t.gumme...@gmail.com writes:
Something along this line, perhaps?
Sorry about this, I didn't run the test suite without
TEST_GIT_INDEX_VERSION in config.mak which I obviously should have.
Yes, this looks good to me, thanks!
OK, will squash it (but using VAR:+isset instead of
Duy Nguyen pclo...@gmail.com writes:
I think I described it incorrectly as conflict message while it's
not. This is the part to be cut out by the patch
# It looks like you may be committing a merge.
# If this is not correct, please remove the file.
# MERGE_HEAD
# and try again.
Robin H. Johnson robb...@gentoo.org writes:
On Mon, Feb 24, 2014 at 09:47:16AM -0800, Junio C Hamano wrote:
Robin H. Johnson robb...@gentoo.org writes:
The only other clean alternative would be implementing ONLY
--sparse-checkout-from, and letting uses use fds creatively:
--sparse
Just a quick heads-up.
As the first wave for the post-1.9.0 development cycle, these topics
will be merged to 'master' (unless there are serious last minute
issues found) shortly:
+ kb/fast-hashmap 02-24/01-03
#18
+ nv/commit-gpgsign-config
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
versioncmp() is copied from string/strverscmp.c in glibc commit
ee9247c38a8def24a59eb5cfb7196a98bef8cfdc, reformatted to Git coding
style. The implementation is under LGPL-2.1 and according to [1] I can
relicense it to GPLv2.
I'd propose this
David Kastrup d...@gnu.org writes:
The region end can be looked up just like its beginning.
Signed-off-by: David Kastrup d...@gnu.org
---
builtin/blame.c | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
Yay, code reduction! Thanks.
diff --git a/builtin/blame.c
Jens Lehmann jens.lehm...@web.de writes:
Am 24.02.2014 17:55, schrieb Junio C Hamano:
David Aguilar dav...@gmail.com writes:
Modern versions of git submodule use .git-files to setup the
submodule directory. When run in a git submodule-created
repository git difftool --dir-diff dies
Matthieu Moy matthieu@grenoble-inp.fr writes:
Holger Hellmuth hellm...@ira.uka.de writes:
Am 24.02.2014 17:21, schrieb Matthieu Moy:
$ git add foo.txt
$ git status
On branch master
Changes to be committed:
(use git reset HEAD file... to unstage)
modified: foo.txt
Joel Nothman joel.noth...@gmail.com writes:
Git help --all had listed all git commands, but no configured aliases.
This includes aliases as a separate listing, after commands in the main
git directory and other $PATH directories.
... and why is this a good thing?
Signed-off-by: Joel
lost this feature. Resurrect it.
Signed-off-by: Junio C Hamano gits...@pobox.com
---
git-request-pull.sh | 4 +++-
t/t5150-request-pull.sh | 8 +++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/git-request-pull.sh b/git-request-pull.sh
index 93b4135..b67513a 100755
Joel Nothman joel.noth...@gmail.com writes:
arguments to git help. They are also like commands in that it is
possible to forget their name, or whether they are defined on a
particular workstation, and to hence want a listing.
I did envision that it would be useful for the last case, but then
Jens Lehmann jens.lehm...@web.de writes:
+test_expect_success PERL 'difftool properly honours gitlink and
core.worktree' '
+ git submodule add ./. submod/ule
+ (
+ cd submod/ule
+ git difftool --tool=echo --dir-diff --cached
In the context of this fix,
Stephen Leake stephen_le...@stephe-leake.org writes:
One _could_ argue that stashed changes are what could be reflected
to the working tree and form the source of the latter, but my gut
feeling is that it is a rather weak argument. At that point you are
talking about what you could
Stephen Leake stephen_le...@stephe-leake.org writes:
Dropping the stash on a git add operation would be really, really
weird...
Why? That is when the merge conflicts are resolved, which is what
logically indicates that the stash is no longer needed,...
Not necessarily. Imagine a case where
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
git_path() soon understands the path given to it. Some paths abc may
become def while other ghi may become ijk. We don't want
git_path() to interfere with .lock path construction. Concatenate
.lock after the path has been resolved by git_path()
Joel Nothman joel.noth...@gmail.com writes:
Git help --all had listed all git commands, but no configured aliases.
This includes aliases as a separate listing, after commands in the main
git directory and other $PATH directories.
Signed-off-by: Joel Nothman joel.nothman at gmail.com
---
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 'next' has been rewound. There are healthy number of
topics in there that have been well-cooked during the 1.9.0
development cycle
Matthieu Moy matthieu@grenoble-inp.fr writes:
Omar Othman omar.oth...@booking.com writes:
Though I don't know why you think this is important:
Now, the real question is: when would Git stop showing this advice. I
don't see a real way to answer this, and I'd rather avoid doing just a
Michael Haggerty mhag...@alum.mit.edu writes:
See my branch on GitHub [1] or read the appended text below.
Very nice.
## Introduction
It is strongly recommended that students who want to apply to the Git
project for the Summer of Code 2014 should submit a small code-related
patch to the
Jeff King p...@peff.net writes:
On Wed, Feb 26, 2014 at 09:04:30AM +0100, Michael Haggerty wrote:
It would be nice to support more flexibility in the todo-list commands
by allowing the commands to take options. Maybe
* Convert a commit into a merge commit:
pick -p c0ffeee -p
Jacopo Notarstefano jacopo.notarstef...@gmail.com writes:
Does this make sense? Did I overlook some details?
How does this solve the labels shown in git bisect visualize?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
Matthieu Moy matthieu@grenoble-inp.fr writes:
Junio C Hamano gits...@pobox.com writes:
I'd however have to say that even please resolve the conflicts
manually is over-assuming.
I understand your point, but in a short hint message, I still find it
reasonable. Fixing conflicts
Jeff King p...@peff.net writes:
On Mon, Feb 24, 2014 at 11:10:49AM -0800, Junio C Hamano wrote:
The best name I could come up with is --pack-keep-objects, since that
is literally what it is doing. I'm not wild about the name because it is
easy to read keep as a verb (and pack as a noun
Matthieu Moy matthieu@grenoble-inp.fr writes:
Andrew Wong andrew.k...@gmail.com writes:
If the user wants to do git reset during a merge, the user most likely
wants to do a git reset --merge. This is especially true during a
merge conflict and the user had local changes, because git
David Kastrup d...@gnu.org writes:
All that verbosity...
$ git stash pop
Auto-merging foo.txt
CONFLICT (content): Merge conflict in foo.txt
Cowardly refusing to drop stash.
$
Actually, modulo Cowardly, that may be the most harmless phrasing,
as apply_stash may try to signal an error for
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
Note that logs/refs/.tmp-renamed-log is used to prepare new reflog
entry and it's supposed to be on the same filesystem as the target
reflog file. This is not guaranteed true for logs/HEAD when it's
mapped to repos/xx/logs/HEAD because the user
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
If $GIT_COMMON_DIR is set, $GIT_OBJECT_DIRECTORY should be
$GIT_COMMON_DIR/objects, not $GIT_DIR/objects. Just let rev-parse
--git-path handle it.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
git-sh-setup.sh | 2 +-
1 file
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
If the file $GIT_DIR/commondir exists, it contains the value of
$GIT_COMMON_DIR.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
Documentation/gitrepository-layout.txt | 4
setup.c| 38
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
Nice.
--
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
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
It is a good thing to do to read config from the real repository we
are borrowing from when we have .git/commondir, but it makes me
wonder if we should signal some kind of error if we find
Thomas Rast t...@thomasrast.ch writes:
diff --git a/log-tree.c b/log-tree.c
index 30b3063..9b831e9 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -11,6 +11,8 @@
#include gpg-interface.h
#include sequencer.h
#include line-log.h
+#include cache-tree.h
+#include merge-recursive.h
Duy Nguyen pclo...@gmail.com writes:
On Thu, Feb 27, 2014 at 7:22 AM, Junio C Hamano gits...@pobox.com wrote:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
It is a good thing to do to read config from the real repository we
Jeff King p...@peff.net writes:
Of all of them, I think --pack-kept-objects is probably the best. And I
think we are hitting diminishing returns in thinking too much more on
the name. :)
True enough.
I wonder if it makes sense to link it with pack.writebitmaps more
tightly, without even
Jeff King p...@peff.net writes:
From: Scott J. Goldman scot...@github.com
In commit ee27ca4, we started restricting remote git-archive
invocations to only accessing reachable commits. This
matches what upload-pack allows, but does restrict some
useful cases (e.g., HEAD:foo). We loosened
Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru writes:
Refactor binary search in commit_graft_pos function: use
generic sha1_pos function.
Signed-off-by: Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru
---
Looks trivially correct; thanks.
Looking at this patch makes me wonder why we have
Michael Haggerty mhag...@alum.mit.edu writes:
Sounds good. I suggest we make your blob a paragraph before the list of
bullet points rather than part of the list. Please suggest some TBD*
then I'll add it to the text. Would we also fill in X with the name
of the actual student involved in
Faiz Kothari faiz.of...@gmail.com writes:
From: Faiz Kothari faiz.of...@gmail.com
Notice that this matches From: in your e-mail message, which means
it is unnecessary. Drop it.
Signed-off-by: Faiz Kothari django@dj-pc.(none)
And make sure this matches how you call yourself above.
---
Sun He sunheeh...@gmail.com writes:
Signed-off-by: Sun He sunheeh...@gmail.com
---
git-compat-util.h |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-compat-util.h b/git-compat-util.h
index cbd86c3..4daa6cf 100644
--- a/git-compat-util.h
+++
Sun He sunheeh...@gmail.com writes:
Signed-off-by: Sun He sunheeh...@gmail.com
---
bulk-checkin.c | 10 +-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/bulk-checkin.c b/bulk-checkin.c
index 118c625..8c47d71 100644
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@
Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru writes:
Change install_branch_config() to use skip_prefix()
for getting the short name of the remote branch.
Signed-off-by: Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru
---
branch.c | 4 ++--
1 file changed, 2 insertions(+), 2
Sun He sunheeh...@gmail.com writes:
Signed-off-by: Sun He sunheeh...@gmail.com
---
The subject reads:
Subject: [PATCH] GSoC2014 microprojects #6 Change bundle.c:add_to_ref_list()
to use ALLOC_GROW()
I do not think we want to see the leading part of it in our git
shortlog output.
Lee Hopkins leer...@gmail.com writes:
Last week I ran across a potential bug with branch names on case
insensitive file systems, the complete scenario can be found here:
https://groups.google.com/forum/#!topic/msysgit/ugKL-sVMiqI
The tldr is because refs are stored as plain text files
Carlos Martín Nieto c...@elego.de writes:
From: Carlos Martín Nieto c...@dwim.me
We need to consider that a remote-tracking branch may match more than
one rhs of a fetch refspec.
Hmph, do we *need* to, really?
Do you mean fetching one ref on the remote side and storing that in
multiple
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
The repo setup procedure is updated to detect $GIT_DIR/commondir and
set $GIT_COMMON_DIR properly.
The core.worktree is ignored when $GIT_DIR/commondir presents. This is
because commondir repos are intended for separate/linked checkouts
and
Michael Haggerty mhag...@alum.mit.edu writes:
On 02/27/2014 08:19 PM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
Sounds good. I suggest we make your blob a paragraph before the list of
bullet points rather than part of the list. Please suggest some TBD*
then I'll
Junio C Hamano gits...@pobox.com writes:
Carlos Martín Nieto c...@elego.de writes:
From: Carlos Martín Nieto c...@dwim.me
We need to consider that a remote-tracking branch may match more than
one rhs of a fetch refspec.
Hmph, do we *need* to, really?
Do you mean fetching one ref
David Kastrup d...@gnu.org writes:
Junio C Hamano gits...@pobox.com writes:
Sun He sunheeh...@gmail.com writes:
Signed-off-by: Sun He sunheeh...@gmail.com
---
git-compat-util.h |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-compat-util.h b/git-compat
Junio C Hamano gits...@pobox.com writes:
Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru writes:
Change install_branch_config() to use skip_prefix()
for getting the short name of the remote branch.
Signed-off-by: Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru
---
branch.c | 4 ++--
1
Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru writes:
diff --git a/dir.c b/dir.c
index b35b633..72f6e2a 100644
--- a/dir.c
+++ b/dir.c
@@ -1329,13 +1329,10 @@ static struct path_simplify *create_simplify(const
char **pathspec)
for (nr = 0 ; ; nr++) {
const char
Thomas Rast t...@thomasrast.ch writes:
The directory hash (for fast checks if the index already has a
directory) was only used in ignore_case mode and so depended on that
flag.
Make it generally available on request.
Signed-off-by: Thomas Rast t...@thomasrast.ch
---
I somehow had an
Stephen Leake stephen_le...@stephe-leake.org writes:
Matthieu Moy matthieu@grenoble-inp.fr writes:
li...@haller-berlin.de (Stefan Haller) writes:
Your intention was clearly to drop the stash, it just wasn't dropped
because of the conflict. Dropping it automatically once the conflict
is
Jeff King p...@peff.net writes:
On Thu, Feb 27, 2014 at 10:37:30AM -0800, Junio C Hamano wrote:
Signed-off-by: Jeff King p...@peff.net
Thanks.
Do GitHub people have general aversion against signing off (or
sending out, for that matter) their own patches, unless they were
already
Jeff King p...@peff.net writes:
Here's a series to handle this; I think the end result is much nicer. I
ended up calling the option uploadarchive.allowUnreachable. By moving
it there instead of under archive, it is more clear that this is about
the _serving_ end of the remote connection, and
Carlos Martín Nieto c...@elego.de writes:
... However, we now
have 'origin/master' and 'origin/pr/5' both of which match the
'refs/remotes/origin/*' pattern. The current behaviour is to stop at the
first match, which would mark it as stale as there is no
'refs/heads/pr/5' branch in the
Jeff King p...@peff.net writes:
On Thu, Feb 27, 2014 at 10:04:44AM -0800, Junio C Hamano wrote:
I wonder if it makes sense to link it with pack.writebitmaps more
tightly, without even exposing it as a seemingly orthogonal knob
that can be tweaked, though.
I think that is because I do
Karsten Blees karsten.bl...@gmail.com writes:
If you are on a case-insensitive filesystem, or work on a cross-platform
project, ensure that you avoid ambiguous refs. Problem solved.
So its OK to lose data if you accidentally use an ambiguous ref? I
cannot believe you actually meant that.
Michael Haggerty mhag...@alum.mit.edu writes:
So my vote is that the patches are OK the way Dmitry wrote them (mind, I
have only read through 05/11 so far).
Seconded ;-)
By the way, I do not like these long subjects. change is a
redundant word when one sends a patch---as all patches are
Duy Nguyen pclo...@gmail.com writes:
On Fri, Feb 28, 2014 at 4:46 PM, Dmitry S. Dolzhenko
dmitrys.dolzhe...@yandex.ru wrote:
Affected functions: read_one_reflog(), add_commit_info()
We can usually see this from @@ line so it's not really needed to
describe. Same comment for a few other
Michael Haggerty mhag...@alum.mit.edu writes:
On 02/28/2014 10:07 AM, Sun He wrote:
Signed-off-by: Sun He sunheeh...@gmail.com
---
parse-options.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parse-options.c b/parse-options.c
index 7b8d3fa..59a52b0 100644
---
Michael Haggerty mhag...@alum.mit.edu writes:
I just wrote up another double-idea that has been stewing in my head for
a while:
* Allow configuration values to be unset via a config file
* Fix git config --unset to clean up detritus from sections that are
left empty.
The former is *way*
Duy Nguyen pclo...@gmail.com writes:
Way too long subject line. Keep it within 70-75 chars. The rest could
be put in the body.
On Fri, Feb 28, 2014 at 9:32 PM, 孙赫 sunheeh...@gmail.com wrote:
I am not sure if this is a bug.
I need your help to find out it.
Tip:git has a wonderful history
501 - 600 of 27729 matches
Mail list logo
