Christian Couder chrisc...@tuxfamily.org writes:
Many entries with the same key but distinct values can be configured
using:
if_exists = add_if_different
if_missing = add
Many entries with the same key but values that can be the same can be
configured using:
if_exists = add
if_missing
Thanks.
--
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
Thansk.
--
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
Albert L. Lash, IV albert.l...@gmail.com writes:
Current text claims optimization, implying the use of
hardlinks, when this option ratchets down the level of
efficiency. This change explains the difference made by
using this option, namely copying instead of hardlinking,
and why it may be
Albert L. Lash, IV albert.l...@gmail.com writes:
We state that the following paragraph mentions the pickaxe
interface, but the term pickaxe is not then used. This
change clarifies that the example command uses the pickaxe
interface and what it is searching for.
Signed-off-by: Albert L.
Kirill Smelkov k...@mns.spb.ru writes:
Here I'm preparing tree-diff.c to be ready for the new tree-walker, so that
the
final change is tractable and looks good and non noisy. Some small speedups
are gained along the way. The final bits are almost ready, but I don't want to
release them in a
Duy Nguyen pclo...@gmail.com writes:
On Tue, Feb 11, 2014 at 1:46 AM, Junio C Hamano gits...@pobox.com wrote:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
diff --git a/setup.c b/setup.c
index 6c3f85f..b09a412 100644
--- a/setup.c
+++ b/setup.c
@@ -787,3 +787,27 @@ void sanitize_stdfds
Christian Couder christian.cou...@gmail.com writes:
Even if we assume, for the sake of discussion, that it *is* a good
idea to separate under this condition part and do this part, I
do not think the above is the only or the best way to express
distinct values allowed for the same key. How do
Jeff King p...@peff.net writes:
- Branch rename breaks local downstream branches
http://article.gmane.org/gmane.comp.version-control.git/241228
If you have a branch B that builds on A, if you are renaming A to C,
you may want B to automatically set to build on C in some cases, and
in other
Signed-off-by: Junio C Hamano gits...@pobox.com
---
contrib/completion/git-completion.bash | 19 ++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 8aaf214..c044a68 100644
--- a/contrib
Shawn Pearce spea...@spearce.org writes:
Why would you do this? Perhaps you need more time in your day
to consume tea or coffee. Set GIT_RTT and enjoy a beverage.
So the conclusion is that it is not practical to do a lazy fetch if
it is done extremely naively at we want this object --- wait a
Yoshihiro Sugi sugi1...@gmail.com writes:
Signed-off-by: Yoshihiro Sugi sugi1...@gmail.com
diff-highlight split each hunks and compare them as byte sequences.
it causes problems when diff hunks include multibyte characters.
This change enable to work on such cases by decoding inputs and
Junio C Hamano gits...@pobox.com writes:
Jeff King p...@peff.net writes:
- Branch rename breaks local downstream branches
http://article.gmane.org/gmane.comp.version-control.git/241228
If you have a branch B that builds on A, if you are renaming A to C,
you may want B to automatically
Jeff King p...@peff.net writes:
I dug in the history to see if there was any reasoning given for the
current off by default setting. It looks like Junio asked for it when
the original http-push tests were added, and everything else just
followed that. The reasoning there was basically they're
Kirill Smelkov k...@mns.spb.ru writes:
Sorry for the confusion. Could you please do the following:
Patches should be applied over to ks/tree-diff-walk
(74aa4a18). Before applying the patches, please cherry-pick
c90483d9(tree-diff: no need to manually verify that there is no
Jeff King p...@peff.net writes:
On Tue, Feb 11, 2014 at 11:51:18AM -0800, Junio C Hamano wrote:
Those who run buildfarms may want to disable the networking test if
the buildfarms are not isolated well, for example. They have to be
told somewhere that now they need to explicitly disable
Johan Herland jo...@herland.net writes:
There is currently no way the git notes commands will allow you to
store the 3d7de37 commit object directly as a note. There is also
(AFAICS) no easy workaround (git fast-import could've been a
workaround if it did not already require the first
Junio C Hamano gits...@pobox.com writes:
Kirill Smelkov k...@mns.spb.ru writes:
Sorry for the confusion. Could you please do the following:
Patches should be applied over to ks/tree-diff-walk
(74aa4a18). Before applying the patches, please cherry-pick
c90483d9(tree-diff: no need
Duy Nguyen pclo...@gmail.com writes:
On Tue, Feb 11, 2014 at 2:11 AM, Junio C Hamano gits...@pobox.com wrote:
On Mon, Feb 10, 2014 at 10:43 AM, Junio C Hamano gits...@pobox.com wrote:
If --quiet is set, we should not be printing anyway. If not, I thinkg
we could only print auto packing
Jeff King p...@peff.net writes:
Agreed, but I think the only way to know the size of those fallouts is
to try it and see who complains. I would not normally be so cavalier
with git itself, but I think for the test infrastructure, we have a
small, tech-savvy audience that can help us iterate
Stefan Zager sza...@google.com writes:
If anyone has a recommendation for a less labor-intensive way to do
this in emacs, I'd be very grateful.
This is not do this in emacs, but here is a possible approach.
You can ask git diff about what you changed, and actually apply
the change while
David Kastrup d...@gnu.org writes:
Making a single preparation run for counting the lines will avoid memory
fragmentation. Also, fix the allocated memory size which was wrong
when sizeof(int *) != sizeof(int), and would have been too small
for sizeof(int *) sizeof(int), admittedly unlikely.
Stefan Zager sza...@chromium.org writes:
... I used the Very Sleepy profiler
to see where all the time was spent on Windows: 55% of the time was
spent in OpenFile, and 25% in CloseFile (both in win32).
This is somewhat interesting.
When we check things out, checkout_paths() has a list of
I'll locally fix up these style issues before commenting on the patch.
Thanks.
ERROR: space required after that ',' (ctx:VxV)
#78: FILE: builtin/count-objects.c:111:
+ struct pack_data pd = {0,0,0};
^
ERROR: space required after that ',' (ctx:VxV)
#78:
sza...@chromium.org writes:
From 0a59547f3e95ddecf7606c5f259ae6177c5a104f Mon Sep 17 00:00:00 2001
Please drop this line.
From: Stefan Zager sza...@chromium.org
Please drop this line and instead have it in your e-mail header.
Date: Mon, 10 Feb 2014 16:55:12 -0800
The date in your e-mail
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
As a workaround to make life easier for third-party tools, the
upcoming major release will be called Git 1.9.0 (not Git 1.9).
The first
Jeff King p...@peff.net writes:
test_normalize_tristate GIT_TEST_DAEMON
Heh, great minds think alike. This is what I am playing with,
without committing (because I do like your ask config if this is a
kind of various boolean 'false' representations, which I haven't
managed to add to it).
On Wed, Feb 12, 2014 at 12:27 PM, Stefan Zager sza...@chromium.org wrote:
On Wed, Feb 12, 2014 at 12:06 PM, Junio C Hamano gits...@pobox.com wrote:
Stefan Zager sza...@chromium.org writes:
Calls to write (and preparation of data to be written) will then
remain single-threaded, but it sounds
Kirill Smelkov k...@mns.spb.ru writes:
+static void show_path(struct strbuf *base, struct diff_options *opt,
+ struct tree_desc *t1, struct tree_desc *t2)
{
unsigned mode;
const char *path;
- const unsigned char *sha1 = tree_entry_extract(desc, path,
Junio C Hamano gits...@pobox.com writes:
Jeff King p...@peff.net writes:
test_normalize_tristate GIT_TEST_DAEMON
Heh, great minds think alike. This is what I am playing with,
without committing (because I do like your ask config if this is a
kind of various boolean 'false
Kirill Smelkov k...@mns.spb.ru writes:
+ /* until we go to it next round, .next holds how many bytes we
+ * allocated (for faster realloc - we don't need copying old
data).
+ */
+ p-next = (struct combine_diff_path *)alloclen;
I am getting
Kirill Smelkov k...@mns.spb.ru writes:
+ if (need_generic_pathscan) {
+ /* NOTE generic case also handles --stat, as it computes
+ * diff(sha1,parent_i) for all i to do the job, specifically
+ * for parent0.
+ */
+ paths =
Øystein Walle oys...@gmail.com writes:
On to the patch itself: I contemplated putting '\n' in the default format and
removing it if -n was given, which would get rid of the need to pass an exta
argument to show_ref(). But that means we would need to *insert it* when a
format is given and -n
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
start_httpd is supposed to be at the beginning of the test file, not
the middle of it. The test_seq line in no shallow lines.. test is
updated to compensate missing refs that are there in t5537, but not in
the new t5539.
Signed-off-by: Nguyễn
Michael J Gruber g...@drmicha.warpmail.net writes:
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Just a few things I spotted while trying to keep myself informed :)
Thanks. Very much appreciated.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a
option
repack: make parsed string options const-correct
repack: propagate pack-objects options as strings
Junio C Hamano (5):
merge-base: separate --independent codepath into its own helper
merge-base --octopus: reduce the result from get_octopus_merge_bases()
revision
Thomas Rast t...@thomasrast.ch writes:
Downside: not listing code merged as a goal may not make the project
as shiny, neither for Git nor for the student.
I'd actually view that as an upside. This sounds like a good first
step for a feasibility study that is really necessary.
I wonder why the
Jeff King p...@peff.net writes:
- We may want to do something similar in cvsserver and git-gui to
make them more robust.
$ git grep -e true --and -e 1 --and -e yes
I assume the something here is to respect bool options more
consistently?
Yeah, mostly by employing your 'git -c
Eric Sunshine sunsh...@sunshineco.com writes:
+ if (type != OBJ_BLOB) {
+ free(buf);
+ die(_(Cannot read note data from non-blob object '%s'.),
arg);
The way this diagnostic is worded, it sound as if the 'read' failed
rather than that the user specified
Øystein Walle oys...@gmail.com writes:
However, when specifying a format string it's just a matter of ending
the format string in '%00' and you're good to go. But then you get the
null byte *and* a newline. And with your proposal there would be no way
of saying you want neither.
I very well
Duy Nguyen pclo...@gmail.com writes:
On Fri, Feb 14, 2014 at 7:45 PM, Andreas Schwab sch...@linux-m68k.org wrote:
Josef Wolf j...@raven.inka.de writes:
Notice the refs/heads _within_ refs/heads!
Now I wonder how I managed to get into this situation and what's the best
way
to recover?
Kirill Smelkov k...@mns.spb.ru writes:
8
From: Kirill Smelkov k...@mns.spb.ru
Subject: [PATCH v2 1/2] tree-diff: rework diff_tree() to generate diffs for
multiparent cases as well
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The last
Kirill A. Shutemov kir...@shutemov.name writes:
The patch extends git config --file interface to allow read config from
stdin.
Thanks. The external interface proposed by this change that behaves
the way your new test expects is a good addition to the system. I
would describe it as:
David Kastrup d...@gnu.org writes:
Junio C Hamano gits...@pobox.com writes:
...
A. Because it will confuse you.
B. I know what I am doing.
A. ???
A. But maybe Git will no longer know what you are doing. Its standard
way of resolving references will mean that once a branch
refs/heads
brian m. carlson sand...@crustytoothpaste.net writes:
Changes to some scripted Porcelains use unsafe variable
substitutions and still need to be tightened.
Will merge to 'next'.
Junio, did you want a reroll with that fixed commit message, or will you
fix it up yourself?
I haven't
Dario Bertini berda...@gmail.com writes:
git clone g...@github.com:ansible/ansible.git
git revert 3616dffb68badb2b8d56
manually solve the conflict (you can look at the commit here:
https://github.com/ansible/ansible/commit/3616dffb68badb2b8d56ef34391d7aae8de79cd6
)
git diff will output:
Andrew Eikum aei...@codeweavers.com writes:
On Wed, Feb 12, 2014 at 01:59:41PM -0800, Junio C Hamano wrote:
As a workaround to make life easier for third-party tools, the
upcoming major release will be called Git 1.9.0 (not Git 1.9).
The first maintenance release for it will be Git 1.9.1
Kirill A. Shutemov kir...@shutemov.name writes:
On Fri, Feb 14, 2014 at 10:27:11AM -0800, Junio C Hamano wrote:
...
I recall that an earlier implementation of git diff --no-index
that made - read one side to be compared from the standard input
had exactly the same issue of comparing filename
Andrew Eikum aei...@codeweavers.com writes:
My worry is having 2. hang around for another decade or longer. I'd
rather see X.0.0 denote a major feature release (currently represented
as 1.X.0), with X.Y.0 for minor enhancements and X.Y.Z for bugfix.
We need three categories: (1) potentially
Christian Couder chrisc...@tuxfamily.org writes:
For example some people might want:
if_exists = overwrite
if_missing = add
while others might want:
if_exists = overwrite
if_missing = do_nothing
and I don't see how we can say that with just:
action =
The latest feature release Git v1.9.0 is now available at the
usual places.
The release tarballs are found at:
http://code.google.com/p/git-core/downloads/list
and their SHA-1 checksums are:
e60667fc16e5a5f1cde46616b0458cc802707743 git-1.9.0.tar.gz
65eb3f411f4699695c7081a7c716cabb9ce23d75
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 'master' is v1.9.0. The first maintenance release for it
will be Git 1.9.1, and the major release after Git 1.9.0 will
either be
Øystein Walle oys...@gmail.com writes:
Maybe it's all subjective... I'm okay with just leaving things as they
are.
Lack of -z in for-each-ref can be called an inconsistency that
already exists you may want to fix in any case.
As an extension to that, I would not be fundamentally against a new
For example, how would you express something like this only with
if-exists vs if-missing?
if_exists_exactly = ignore
if_exists_with_different_value = append
if_missng = prepend_to_the_beginning
First, previously in the discussion you said that you didn't want us
to
Christian Couder chrisc...@tuxfamily.org writes:
but we also want to say:
action = do_Y_if_X_and_Z AND do_U_if_V
For example some people might want:
if_exists = overwrite
if_missing = add
while others might want:
if_exists = overwrite
if_missing = do_nothing
and
Junio C Hamano gits...@pobox.com writes:
That is, you are saying with the above
if_exists = add_if_different AND ignore_if_same
So you already have to support more than one actions depending on
the condition, ...
of conditions, I think. Which is essentially the same as saying
Duy Nguyen pclo...@gmail.com writes:
On Sat, Feb 15, 2014 at 8:15 AM, Zachary Turner ztur...@chromium.org wrote:
...
2) Use TLS as you suggest and have one fd per pack thread. Probably
the most complicated code change (at least for me, being a first-time
contributor)
It's not so
Duy Nguyen pclo...@gmail.com writes:
Prevent is a strong word. I meant we only do it if they force
it. Something like this..
-- 8 --
diff --git a/branch.c b/branch.c
index 723a36b..3f0540f 100644
--- a/branch.c
+++ b/branch.c
@@ -251,6 +251,11 @@ void create_branch(const char *head,
Dario Bertini berda...@gmail.com writes:
On 02/14/2014 09:03 PM, Junio C Hamano wrote:
This is a combined diff, and yaml-related lines are added relative
to your _other_ branch you are merging (notice these + are indented
by one place). Relative to what you had at the tip of your branch
Jeff King p...@peff.net writes:
+} else {
+if (cf-name)
+return error(bad config file line %d in %s,
+cf-linenr, cf-name);
+else
+return error(bad config file line %d, cf-linenr);
+}
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
Long story short, we wanted globbing wildcard ** so I ripped
wildmatch library from rsync to do it. And it opened a possibility
to replace fnmatch completely, which would provide consistent behavior
across platforms (native fnmatch behaves
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
Patterns in .gitattributes are separated by whitespaces, which makes
it impossible to specify exact spaces in the pattern. '?' can be used
as a workaround, but it matches other characters too. This patch makes
a space following a backslash part
John Keeping j...@keeping.me.uk writes:
There's already the arbitrary set of prefixes in
refs.c::prettify_refname() and refs.c::ref_rev_parse_rules(). I can see
how a user might think that since git log refs/heads/name is
equivalent to git log master then git branch refs/heads/name should
Jeff King p...@peff.net writes:
In that sense, publish is not the best word, either, as it describes
only the first two, but not the third case (and those are just examples;
there may be other setups beyond that, even).
Perhaps @{push} would be the most direct word.
Hmph, then the other one
Philip Oakley philipoak...@iee.org writes:
diff --git a/Documentation/gituser-manual.txt
b/Documentation/gituser-manual.txt
new file mode 100644
index 000..9fd4744
--- /dev/null
+++ b/Documentation/gituser-manual.txt
@@ -0,0 +1,34 @@
+gituser-manual(7)
+=
+
+NAME
Roberto Tyley roberto.ty...@gmail.com writes:
Turns out that putting 'link:' before the 'http' is actually superfluous
in AsciiDoc, as there's already a predefined macro to handle it.
http, https, [etc] URLs are rendered using predefined inline macros.
John Keeping j...@keeping.me.uk writes:
There are two problems here:
1) If no argument is provided, then the command segfaults
2) The argument is not consumed, so there will be excess output
Fix both of these in one go by restructuring the handler for this
option.
Reported-by: Daniel
Jonathan Nieder jrnie...@gmail.com writes:
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
Thomas Rast t...@thomasrast.ch writes:
The GIT_EXTERNAL_DIFF calling code attempts to reuse existing worktree
files for the worktree side of diffs, for performance reasons.
However, that code also tries to do the same with submodules. This
results in calls to $GIT_EXTERNAL_DIFF where the
Kirill Smelkov k...@navytux.spb.ru writes:
2) alloca(), for small arrays, is used for the same reason - if we change
it to xmalloc()/free() the timings get worse
Do you see any use of it outside compat/?
I thought we specifically avoid alloca() for portability. Also we
do not use
Michael Haggerty mhag...@alum.mit.edu writes:
The semantics of this flag was changed in commit
ecef23 inline lookup_replace_object() calls
but wasn't renamed at the time to minimize code churn. Rename it now,
and add a comment explaining its use.
Signed-off-by: Michael Haggerty
David Kastrup d...@gnu.org writes:
Junio C Hamano gits...@pobox.com writes:
Duy Nguyen pclo...@gmail.com writes:
+ if (!force dwim_ref(name, strlen(name), sha1, real_ref))
+ die(_(creating ref refs/heads/%s makes %s ambiguous.\n
+ Use -f to create it anyway
Philip Oakley philipoak...@iee.org writes:
A few days too late for the 1.9.0 release cycle :(
This responds to Stefan Nwe's request for a 'git help' command that would
access the release notes. ($gmane/240595 17 Jan 2014).
I've used the full name release-notes for the help guide rather than
Junio C Hamano gits...@pobox.com writes:
I think I preferred the earlier version where you had stdin in the
name field, and this hunk could just go away. I know you switched it to
NULL here to avoid making bogus relative filenames in includes.
Exactly the same comment here. I really like
Junio C Hamano gits...@pobox.com writes:
Philip Oakley philipoak...@iee.org writes:
A few days too late for the 1.9.0 release cycle :(
This responds to Stefan Nwe's request for a 'git help' command that would
access the release notes. ($gmane/240595 17 Jan 2014).
I've used the full name
lar...@gullik.org (Lars Gullik Bjønnes) writes:
If a line in a patch starts with --- it will be deemed
malformed unless it also contains the proper diff header
format. This situation can happen with a valid patch if
it has a line starting with -- and that line is removed.
This patch just
John Keeping j...@keeping.me.uk writes:
We are guaranteed that 'nst' is non-null because it is allocated with
xmalloc(), and in fact we rely on this three lines later by
unconditionally dereferencing it.
The intent of the original code is for attach_stream_filter() to
detect an error
Junio C Hamano gits...@pobox.com writes:
John Keeping j...@keeping.me.uk writes:
We are guaranteed that 'nst' is non-null because it is allocated with
xmalloc(), and in fact we rely on this three lines later by
unconditionally dereferencing it.
The intent of the original code
Duy Nguyen pclo...@gmail.com writes:
Lower depth than default (50) does not sound aggressive to me, at
least from disk space utilization. I agree it should be configurable
though.
Do you mean you want to keep --aggressive to mean too aggressive
in resulting size, to the point that it is not
Junio C Hamano gits...@pobox.com writes:
John Keeping j...@keeping.me.uk writes:
There are two problems here:
1) If no argument is provided, then the command segfaults
2) The argument is not consumed, so there will be excess output
Fix both of these in one go by restructuring the handler
Thomas Gummerer t.gumme...@gmail.com writes:
diff --git a/Documentation/git.txt b/Documentation/git.txt
index aec3726..bc9eeea 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -712,6 +712,11 @@ Git so take care if using Cogito etc.
index file. If not specified, the
Thomas Gummerer t.gumme...@gmail.com writes:
Allow adding a TEST_GIT_INDEX_VERSION variable to config.mak to set the
index version with which the test suite should be run.
...
diff --git a/Makefile b/Makefile
index 287e6f8..c98d28f 100644
--- a/Makefile
+++ b/Makefile
@@ -342,6 +342,10 @@
Philip Oakley philipoak...@iee.org writes:
RelNotes are incremental and only useful for those who know what the
immediately previous release contained, but for most people who get
their Git from distros, I have this impression that the versions of
Git they get skip versions, and seeing the
Philippe Vaucher philippe.vauc...@gmail.com writes:
fwiw this is the thread that added --depth=250
http://thread.gmane.org/gmane.comp.gcc.devel/94565/focus=94626
This post is quite interesting:
http://article.gmane.org/gmane.comp.gcc.devel/94637
Yes, it most clearly says that --depth=250
Andrew Keller and...@kellerfarm.com writes:
When displaying a blob in gitweb, if it's an image, specify constraints for
maximum display width and height to prevent the image from overflowing the
frame of the enclosing page_body div.
This change assumes that it is more desirable to see the
Guido Günther a...@sigxcpu.org writes:
Without this when maintaining stable branches it's easy to forget to use
-x to track where a patch was cherry-picked from.
---
Documentation/config.txt | 4
Documentation/git-cherry-pick.txt | 8
builtin/revert.c
Jan Engelhardt jeng...@inai.de writes:
The release notes for 1.9.0 read:
* The --tags option to git fetch no longer tells the command to
fetch _only_ the tags. It instead fetches tags _in addition to_
what are fetched by the same command line without the option.
I think the release
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
(Only minor nits first during this round of review)
diff --git a/strbuf.h b/strbuf.h
index 73e80ce..aec9fdb 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -116,6 +116,10 @@ extern void
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
(Only nitpicks during this round of review).
diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh
index 8f36aa9..d8bdaf4 100755
--- a/t/t1501-worktree.sh
+++ b/t/t1501-worktree.sh
@@ -346,4 +346,80 @@ test_expect_success 'relative
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
The normal rule is anything outside refs/heads/ is detached. This
strictens the rule a bit more: if the branch is checked out (either in
$GIT_COMMON_DIR/HEAD or any $GIT_DIR/repos/.../HEAD) then it's
detached as well.
A hint is given so the
(Only nitpicks during this round of review).
@@ -274,6 +284,7 @@ int cmd_gc(int argc, const char **argv, const char
*prefix)
argv_array_pushl(reflog, reflog, expire, --all, NULL);
argv_array_pushl(repack, repack, -d, -l, NULL);
argv_array_pushl(prune, prune, --expire, NULL
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
(Only nitpicks during this round of review).
-static char *get_pathname(void)
+static struct strbuf *get_pathname()
static struct strbuf *get_pathname(void)
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
(Only nitpicks during this round of review).
+ if (get_device_or_die(path) != get_device_or_die(get_git_dir())) {
+ strbuf_reset(sb);
+ strbuf_addf(sb, %s/locked, sb_repo.buf);
+ write_file(sb.buf, 1,
Junio C Hamano gits...@pobox.com writes:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
(Only nitpicks during this round of review).
+if (get_device_or_die(path) != get_device_or_die(get_git_dir())) {
+strbuf_reset(sb);
+strbuf_addf(sb, %s/locked, sb_repo.buf
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
In short you can attach multiple worktrees to the same git repository
with git checkout --to somewhere. This is basically what
git-new-workdir is for.
This is exciting.
I'll be pushing this out on 'pu' (with trivial fix-ups squashed in
and/or
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' hasn't been rewound, and none of the topics that
have been cooking there has graduated, yet. Hopefully that can
start
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
We've been avoiding PATH_MAX whenever possible. This patch makes
get_pathname() return a strbuf and updates the callers to take
advantage of this. The code is simplified as we no longer need to
worry about buffer overflow.
Signed-off-by:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
@@ -651,14 +653,10 @@ static void update_refs_for_switch(const struct
checkout_opts *opts,
new-name);
}
}
- if (old-path old-name) {
-
Duy Nguyen pclo...@gmail.com writes:
- }
+ if (old-path old-name
+ !file_exists(git_path(%s, old-path))
+ file_exists(git_path(logs/%s, old-path)))
+ remove_path(git_path(logs/%s, old-path));
Hmph. Is this
Michael Haggerty mhag...@alum.mit.edu writes:
I wonder whether we could give a way to specify a reference in an
unambiguous, canonical fashion like I expected, for example by using a
leading slash: /refs/heads/mybranch. This could be a way for the user
to ask for DWIMming to be turned off
401 - 500 of 27729 matches
Mail list logo
