Update the git reflog usage documentation in the manpage and the
command help to match the current reality.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Documentation/git-reflog.txt | 6 --
builtin/reflog.c | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
If a reference is missing, its SHA-1 will be null_sha1, which can't
possibly match a new value that ref_transaction_commit() is trying to
update it to. So there is no need to set force_write in this scenario.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
refs.c | 15 ++-
1
Currently, if --updateref is specified and the very last reflog entry
is expired or deleted, the reference's value is set to 0{40}. This is
an invalid state of the repository, and breaks, for example, git
fsck and git for-each-ref.
The only place we use --updateref in our own code is when
Rearrange the git reflog manpage to list more common operations
earlier.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Documentation/git-reflog.txt | 56 ++--
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git
Ön nyert kilencszázezer dolláros Microsoft, küldje nevet, országot és a tel
--
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
In addition to a few cleanups, this patch series fixes some problems
that I noticed when working on mh/reflog-expire:
* Ignore '--updateref' when expiring the reflog of a symbolic
reference, because the alternatives are all pretty silly. See the
log message for commit 6/8 for more
If we are expiring reflog entries for a symbolic reference, then how
should --updateref be handled if the newest reflog entry is expired?
Option 1: Update the referred-to reference. (This is what the current
code does.) This doesn't make sense, because the referred-to reference
has its own
None of the callers pass NULL to this function, and there doesn't seem
to be any usefulness to allowing them to do so.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
refs.c | 4
1 file changed, 4 deletions(-)
diff --git a/refs.c b/refs.c
index c5fa709..d1130e2 100644
--- a/refs.c
When processing the reflog of a symbolic ref, hold the lock on the
symbolic reference itself, not on the reference that it points to.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
refs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/refs.c b/refs.c
index
write_ref_sha1() previously skipped the write if the reference already
had the desired value, unless lock-force_write was set. Instead,
perform that test at the callers.
Two of the callers (in rename_ref()) unconditionally set force_write
just before calling write_ref_sha1(), so they don't need
On Mon, Feb 9, 2015 at 12:36 AM, Jens Lehmann jens.lehm...@web.de wrote:
I wonder if it's worth all the hassle to invent new names. Wouldn't
it be much better to just keep a list of per-worktree configuration
value names and use that inside the config code to decide where to
find them for
Hello
По Вашему желанию направляю наше предложение
praic-list.doc
Description: MS-Word document
On Feb 8, 2015, at 17:15, Jeff King wrote:
[...]
Signed-off-by: Jonathon Mah m...@jonathonmah.com
Helped-by: Kyle J. McKay mack...@gmail.com
Signed-off-by: Jeff King p...@peff.net
---
I think the S-O-B should still stand, as the code is now a mix of our
work, and the tests are still Jonathon's.
On 02/09/2015 11:22 PM, Piotr Krukowiecki wrote:
Any other suggestions?
My, somewhat personally, suggestion:
If there is more than one developer, don't use core.autocrlf at all-
it is a local setting, which doesn't travel through the repo, and
is slightly different in Git Egit, depending on the
Below is the output from my index-pack/clone over git://
This is with the recent memory patch applied but testing some less crazy tuning.
--
The corruption of the signal number shows up in google from other
people so I guess it's a lingering bug.
*
git-tests $ git clone
On Sun, Feb 8, 2015 at 8:13 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
Instead, if old_sha1 is non-NULL, verify it; otherwise, don't.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
Reviewed-by: Stefan Beller sbel...@google.com apart from the commit message.
--
To unsubscribe from
On Sun, Feb 8, 2015 at 8:14 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
Creating a reference requires a new_sha1 that is not NULL and not
null_sha1.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
Reviewed-by: Stefan Beller sbel...@google.com
--
To unsubscribe from this list: send
On Mon, Feb 09, 2015 at 11:33:39AM +0100, Dilyan Palauzov wrote:
the point is that with exactly the same configuration on one
computer there is crash and on another one things work just fine.
I found out that line builtin/blame.c:1675 makes the problems:
if (len) {
printf(blame.c:1676,
Jeff King p...@peff.net writes:
However, the first thing for_each_loose_file_in_objdir is going to do is
stick the path into a strbuf. So perhaps the most sensible thing is to
just teach it to take a strbuf from the caller. I'll work up a patch.
It looks like a1b47246 isn't even in next yet,
Hello,
this patch fixes the problem for me.
Thanks
Dilyan
On 09.02.2015 19:46, Eric Sunshine wrote:
On Mon, Feb 09, 2015 at 11:33:39AM +0100, Dilyan Palauzov wrote:
the point is that with exactly the same configuration on one
computer there is crash and on another one things work just
Ævar Arnfjörð Bjarmason ava...@gmail.com writes:
On Mon, Feb 9, 2015 at 2:24 AM, Junio C Hamano gits...@pobox.com wrote:
In case I was not clear, I do not think it is likely for us to accept
a patch that mucks with object header fields with this information.
Have them in the log text and let
Hello!
I need to be able to put the following Cc in a git commit:
Cc: sta...@vger.kernel.org
Yet I cannot allow git-send-email to actually send email to that address,
lest I get an automated nastygram in response. I found the --to-cmd=
option to git-send-email, but it looks to only add email
On Sun, Feb 8, 2015 at 8:14 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
It makes no sense to delete a reference that is already known not to
exist.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
Reviewed-by: Stefan Beller sbel...@google.com
--
To unsubscribe from this list: send
On Sun, Feb 8, 2015 at 8:14 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
Add a docstring for update_ref(), emphasizing its similarity to
ref_transaction_update(). Rename its parameters to match those of
ref_transaction_update().
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
On Sun, Feb 8, 2015 at 8:13 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
It is only used internally now. Document it a little bit better, too.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
Reviewed-by: Stefan Beller sbel...@google.com
--
To unsubscribe from this list: send the line
On Sun, Feb 8, 2015 at 8:14 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
diff --git a/t/t7516-commit-races.sh b/t/t7516-commit-races.sh
new file mode 100755
index 000..5efa351
--- /dev/null
+++ b/t/t7516-commit-races.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# Copyright (c) 2014 Michael
On Sun, Feb 8, 2015 at 8:14 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
If, during the initial check, HEAD doesn't point at anything, then we
Maybe
If HEAD doesn't point at anything during the initial check, then... ?
(Being a non native speaker is hard. These commas look so confusing,
so
On Mon, Feb 9, 2015 at 1:12 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
By the way, both of these patch series conflict with
sb/atomic-push-fix, which is in pu. My understanding is that Stefan
wants to rework that patch series anyway, but if not I would be happy
to show how to resolve
On Sun, Feb 8, 2015 at 8:13 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
There is no reason to reserve a gap between the public and private
flags values.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
refs.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
Christian Couder christian.cou...@gmail.com writes:
It is not designed like this because you only asked me to design it
like this after the facts, when there was another email thread about
conflicts blocks and one function you created could be used by the
trailer code too.
If you had asked
Michael Haggerty mhag...@alum.mit.edu writes:
The main purpose of this series is to simplify the interface to
reference transactions as follows:
* Remove the need to supply an explicit have_old parameter to
ref_transaction_update() and ref_transaction_delete(). Instead,
check the
On Sun, Feb 8, 2015 at 8:14 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
/*
- * Add a reference update to transaction. new_sha1 is the value that
- * the reference should have after the update, or null_sha1 if it should
- * be deleted. If old_sha1 is non-NULL, then it the value
- *
On Sun, Feb 8, 2015 at 8:13 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
Instead, if old_sha1 is non-NULL, verify it; otherwise, don't.
parsing error on that commit message. I needed to read the code to understand
what you want to say here.
The code itself is
Reviewed-by: Stefan Beller
On Tue, Feb 10, 2015 at 08:03:19AM +0800, Greg KH wrote:
On Mon, Feb 09, 2015 at 03:35:37PM -0800, Paul E. McKenney wrote:
On Mon, Feb 09, 2015 at 01:53:50PM -0800, Jonathan Nieder wrote:
Hi,
Paul E. McKenney wrote:
Cc: sta...@vger.kernel.org
Yet I cannot allow
When an import has finished, we run end_packfile() to
finalize the data and move the packfile into place. If this
process fails, we call die() and end up in our die_nicely()
handler. Which unfortunately includes running end_packfile
to save any progress we made. We enter the function again,
and
Hi,
Quoting Junio C Hamano gits...@pobox.com:
Matt Korostoff mkorost...@gmail.com writes:
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 2fece98..72251cc 100644
--- a/contrib/completion/git-completion.bash
+++
On Mon, Feb 9, 2015 at 12:40 PM, Michael Haggerty mhag...@alum.mit.edu wrote:
I am not sure what advantages this would bring. A better history
for bisection? I cannot speak for Michael, but my understanding was
to have mh/reflog-expire and sb/atomic-push-fix merged now that 2.3
is out and
Can I submit this as a bug report, that sending something from the
gmail client results in this response?
Delivery to the following recipient failed permanently:
git@vger.kernel.org
Technical details of permanent failure:
Google tried to deliver your message, but it was rejected by the
I find that preview 1.8 is bluescreening on about 1 of 3 ssh pushes.
1.9 preview 12-17-2014 doesn't even bluescreen, the windows gui locks
until reset.
Sample command:
git push omv master\r
config. =
[core]
repositoryformatversion = 0
filemode = false
bare =
Michael Haggerty mhag...@alum.mit.edu writes:
On 02/09/2015 08:05 PM, Stefan Beller wrote:
On Mon, Feb 9, 2015 at 10:41 AM, Junio C Hamano gits...@pobox.com wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
[...]
This patch series applies on top of master merged together with
On Mon, Feb 9, 2015 at 4:12 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
Currently, if --updateref is specified and the very last reflog entry
is expired or deleted, the reference's value is set to 0{40}. This is
an invalid state of the repository, and breaks, for example, git
fsck and git
Paul E. McKenney paul...@linux.vnet.ibm.com writes:
I need to be able to put the following Cc in a git commit:
Cc: sta...@vger.kernel.org
Yet I cannot allow git-send-email to actually send email to that address,
lest I get an automated nastygram in response. I found the --to-cmd=
option
Here are some screen shots demonstrating the issue I'm describing here:
before this patch:
https://cloud.githubusercontent.com/assets/1197335/6108333/1f3b10fa-b040-11e4-9164-3c7769dae110.gif
after this patch:
Matt Korostoff mkorost...@gmail.com writes:
In some system configurations there is a bug with the
__git_remotes function. Specifically, there is a problem
with line 415, `test -d $d/remotes ls -1 $d/remotes`.
While `test -d` is meant to prevent listing the remotes
directory if it does not
Paul E. McKenney paul...@linux.vnet.ibm.com writes:
On Mon, Feb 09, 2015 at 12:57:11PM -0800, Junio C Hamano wrote:
No, I do not think we have a way to blacklist certain recipient
addresses from getting passed to the MTA, and I do not object to
addition of such a mechanism if there is a valid
Eric Sunshine sunsh...@sunshineco.com writes:
There is a bit of suspicious code in builtin/blame.c where it is
destroying the commit_info without ever initializing it,...
Good eyes. I wonder why the compiler does not notice it.
It seems that this came from ea02ffa3 (mailmap:
simplify
In some system configurations there is a bug with the
__git_remotes function. Specifically, there is a problem
with line 415, `test -d $d/remotes ls -1 $d/remotes`.
While `test -d` is meant to prevent listing the remotes
directory if it does not exist, in some system, `ls` will
run regardless.
Since ea02ffa3 (mailmap: simplify map_user() interface, 2013-01-05),
find_alignment() has been invoking commit_info_destroy() on an
uninitialized auto 'struct commit_info' (when METAINFO_SHOWN is not
set). commit_info_destroy() calls strbuf_release() for each of
'commit_info' strbuf member, which
On 02/09/2015 08:05 PM, Stefan Beller wrote:
On Mon, Feb 9, 2015 at 10:41 AM, Junio C Hamano gits...@pobox.com wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
[...]
This patch series applies on top of master merged together with
sb/atomic-push, which in turn depends on mh/reflog-expire.
On Mon, Feb 09, 2015 at 12:57:11PM -0800, Junio C Hamano wrote:
Paul E. McKenney paul...@linux.vnet.ibm.com writes:
I need to be able to put the following Cc in a git commit:
Cc: sta...@vger.kernel.org
Yet I cannot allow git-send-email to actually send email to that address,
lest I
On Sun, Feb 8, 2015 at 11:53 PM, Aleksander Boruch-Gruszecki
aleksander.boruchgrusze...@gmail.com wrote:
run_setup_gently() is called before merge-file. This may result in changing
current working directory, which wasn't taken into account when opening a file
for writing.
Fix by prepending
A more final version of the tuning exercise I did is here:
http://mail-index.netbsd.org/tech-repository/2015/01/08/msg000520.html
I did try some of these setting on the server and it made the repo much much
larger so I guess I am looking for ways to just reduce client memory usage/the
best
On Sun, Feb 01, 2015 at 08:28:28PM +0100, Dennis Kaarsemaker wrote:
On zo, 2015-02-01 at 19:42 +0100, Hans Ginzel wrote:
Hello!
Suppose following git history:
A–M–C
/
B
How to achieve this with commits metadata preserving?
A–M'–C'
/
B'
I did
git checkout B
git add
Hello,
the point is that with exactly the same configuration on one computer
there is crash and on another one things work just fine.
I found out that line builtin/blame.c:1675 makes the problems:
if (len) {
printf(blame.c:1676, subject: %s, len: %i\n, subject, len);
--
On Thu, Jan 8, 2015 at 11:10 PM, matthew sporleder msporle...@gmail.com wrote:
I am attempting to clone this repo: https://github.com/jsonn/src/
and have been successful on some lower memory systems, but i'm
interested in continuing to push down the limit.
I am getting more success running
On Mon, Feb 9, 2015 at 2:24 AM, Junio C Hamano gits...@pobox.com wrote:
In case I was not clear, I do not think it is likely for us to accept
a patch that mucks with object header fields with this information.
Have them in the log text and let UI interpret them.
We've already told clients for
Alex Henrie alexhenri...@gmail.com writes:
This is just a friendly reminder that this patch has been sitting in
the mailing list archives for a couple of weeks, and it has not yet
been accepted or commented on.
I think that is because the message was not sent to the right
people, and also
Hi,
This is just a friendly reminder that this patch has been sitting in
the mailing list archives for a couple of weeks, and it has not yet
been accepted or commented on.
-Alex
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
On Mon, Feb 09, 2015 at 01:46:10PM -0800, Junio C Hamano wrote:
Paul E. McKenney paul...@linux.vnet.ibm.com writes:
Hence the desire to have a Cc that doesn't actually send any email,
but that is visible in mainline for the benefit of the scripts that
handle the stable workflow.
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
+ if (show_dirs strchr(ce-name, '/')
Oops. Will fix it up locally.
--
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
On Mon, Feb 9, 2015 at 4:28 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
Since ea02ffa3 (mailmap: simplify map_user() interface, 2013-01-05),
find_alignment() has been invoking commit_info_destroy() on an
uninitialized auto 'struct commit_info' (when METAINFO_SHOWN is not
set).
Hi Erik,
this is not a bug but a feature. ;) Actually rejecting HTML is one of
the easiest ways to avoid 95 % of spam mails. If you want email to
send via gmail, you can do so by enabling text only mode for sending
mails.
That is good for general discussion. But if you intend to send a
patch,
On Mon, Feb 09, 2015 at 01:17:05PM -0800, Junio C Hamano wrote:
Paul E. McKenney paul...@linux.vnet.ibm.com writes:
On Mon, Feb 09, 2015 at 12:57:11PM -0800, Junio C Hamano wrote:
No, I do not think we have a way to blacklist certain recipient
addresses from getting passed to the MTA, and
Hi,
Paul E. McKenney wrote:
Cc: sta...@vger.kernel.org
Yet I cannot allow git-send-email to actually send email to that address,
lest I get an automated nastygram in response.
Interesting. Last time this came up, the result seemed to be
different[*].
Thanks,
Jonathan
[*]
Paul E. McKenney paul...@linux.vnet.ibm.com writes:
Hence the desire to have a Cc that doesn't actually send any email,
but that is visible in mainline for the benefit of the scripts that
handle the stable workflow.
So a configuration variable that you can set once and forget, e.g.
Hi,
in short: how to do svn-git conversion, or how to configure git/EGit
so that Windows/Linux users are happy with EOLs?
Long story:
recently I converted (with git-svn) an svn repository to git. This
created git repository with Windows (CRLF) end of line files. I
suppose the original svn
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
+static int read_one_dir(struct untracked_cache_dir **untracked_,
+ struct read_data *rd)
+{
+#define NEXT(x) \
+ next = data + (x); \
+ if (next rd-end) \
+ return -1;
Please do not do this, and
On Thu, Jan 8, 2015 at 11:10 PM, matthew sporleder msporle...@gmail.com wrote:
I am attempting to clone this repo: https://github.com/jsonn/src/
This repo has 3.4M objects. Basic book keeping would cost 200MB (in
practice it'll be higher because I'm assuming no deltas in my
calculation). On my
Am 09.02.2015 um 13:53 schrieb Sergey Organov:
Johannes Sixt j...@kdbg.org writes:
Am 07.02.2015 um 22:32 schrieb Sebastian Schuberth:
On 06.02.2015 22:28, Sergey Organov wrote:
# Now rebase my work.
git rebase -f HEAD~1
# What? Where is my Precious change in a???
cat a
/SCRIPT
I.e.,
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
For each object in the input pack, we need one struct object_entry. On
x86-64, this struct is 64 bytes long. Although:
- The 8 bytes for delta_depth and base_object_no are only useful when
show_stat is set. And it's never set unless someone
On Mon, Feb 9, 2015 at 4:33 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Mon, Feb 9, 2015 at 4:28 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
Since ea02ffa3 (mailmap: simplify map_user() interface, 2013-01-05),
find_alignment() has been invoking commit_info_destroy() on an
On Mon, Feb 09, 2015 at 03:35:37PM -0800, Paul E. McKenney wrote:
On Mon, Feb 09, 2015 at 01:53:50PM -0800, Jonathan Nieder wrote:
Hi,
Paul E. McKenney wrote:
Cc: sta...@vger.kernel.org
Yet I cannot allow git-send-email to actually send email to that address,
lest I get an
Thank you for your detailed reply Junio. I'll try to address your
concerns individually, but let me also offer a general thought that
this is probably a good use case to handle even if the root cause is
solvable outside of git. That is to say, I would think we'd still
want git autocompletion
Johannes Sixt j...@kdbg.org writes:
Am 07.02.2015 um 22:32 schrieb Sebastian Schuberth:
On 06.02.2015 22:28, Sergey Organov wrote:
# Now rebase my work.
git rebase -f HEAD~1
# What? Where is my Precious change in a???
cat a
/SCRIPT
I.e., the modification marked [!] was silently lost
For each object in the input pack, we need one struct object_entry. On
x86-64, this struct is 64 bytes long. Although:
- The 8 bytes for delta_depth and base_object_no are only useful when
show_stat is set. And it's never set unless someone is debugging.
- The three fields hdr_size, type
On Mon, Feb 09, 2015 at 04:28:07PM -0500, Eric Sunshine wrote:
Since ea02ffa3 (mailmap: simplify map_user() interface, 2013-01-05),
find_alignment() has been invoking commit_info_destroy() on an
uninitialized auto 'struct commit_info' (when METAINFO_SHOWN is not
set). commit_info_destroy()
On Mon, Feb 09, 2015 at 01:53:50PM -0800, Jonathan Nieder wrote:
Hi,
Paul E. McKenney wrote:
Cc: sta...@vger.kernel.org
Yet I cannot allow git-send-email to actually send email to that address,
lest I get an automated nastygram in response.
Interesting. Last time this came up,
On Mon, Feb 09, 2015 at 06:24:35PM -0500, Jeff King wrote:
Clang's address sanitizer has compiler support, so it does get to see
this memory and could put a canary value in for each loop iteration. But
it doesn't. Instead, you're supposed to use the memory sanitizer to
catch uninitialized
On Mon, Feb 9, 2015 at 10:41 AM, Junio C Hamano gits...@pobox.com wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
The main purpose of this series is to simplify the interface to
reference transactions as follows:
* Remove the need to supply an explicit have_old parameter to
79 matches
Mail list logo
