The policy objects don't care about --dry-run. So move it to
expire_reflog()'s flags parameter.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
builtin/reflog.c | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/builtin/reflog.c b/builtin/reflog.c
index
From: Ronnie Sahlberg sahlb...@google.com
unlock|close|commit_ref can be made static since there are no more external
callers.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
Signed-off-by: Stefan Beller sbel...@google.com
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
refs.c | 24
Michael Haggerty wrote:
It was called unused, so at least it was self-consistent.
The missing context is that this was a callback function that had to
match the each_ref_fn signature (where that parameter is 'flags')
until v1.5.4~14 (reflog-expire: avoid creating new files in a
directory inside
Jonathan Nieder jrnie...@gmail.com writes:
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
---
Junio C Hamano wrote:
Jonathan Nieder jrnie...@gmail.com writes:
-extern int copy_fd(int ifd, int ofd);
+extern int copy_fd(int ifd, int ofd, struct strbuf *err);
It is not limited to this
Michael Haggerty wrote:
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -349,7 +349,7 @@ static int push_tip_to_list(const char *refname, const
unsigned char *sha1, int
return 0;
}
-static int expire_reflog(const char *ref, const unsigned char *sha1, int
unused, void
Hi, I'm trying find a solution where I can change file in a devel
environment , and not commit it into git .
git update-index --assume-unchanged file
is one solution , not the best solution but one solution.
I add 2 files that I want ignore on commits
git update-index --assume-unchanged
Hi,
Junio C Hamano wrote:
Jonathan Nieder jrnie...@gmail.com writes:
Here's a draft for documentation on that.
Thanks; looks reasonable; even if the discussion between you and
Peff took us to a slightly different direction than what you
described here, the earlier description of long
Junio C Hamano wrote:
Jonathan Nieder jrnie...@gmail.com writes:
Here's a draft for documentation on that.
Thanks; looks reasonable; even if the discussion between you and
Peff took us to a slightly different direction than what you
described here, the earlier description of long
Michael Haggerty wrote:
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
builtin/reflog.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
--
To unsubscribe from this list: send the line unsubscribe git in
the
On Thu, Dec 04, 2014 at 03:41:47PM -0800, Jonathan Nieder wrote:
Junio C Hamano wrote:
Jonathan Nieder jrnie...@gmail.com writes:
Here's a draft for documentation on that.
Thanks; looks reasonable; even if the discussion between you and
Peff took us to a slightly different direction
Michael Haggerty mhag...@alum.mit.edu writes:
I propose this patch series as an alternative to Ronnie's reflog
transactions series.
After coasting my eyes over individual patches, it was delightful to
look at the endgame state of the expiry codepath in builtin/reflog.c
that is left ;-)
--
To
Michael Haggerty wrote:
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -368,9 +368,11 @@ static int expire_reflog(const char *refname, const
unsigned char *sha1, void *c
lock = lock_any_ref_for_update(refname, sha1, 0, NULL);
if (!lock)
return error(cannot lock
Yeah, that is what I meant. The earlier part will not go to waste no matter
what happens to the discussion.
I am not a fan of char[1024], if only because our error message may have
to mention things whose length is not under our control, e.g. a filename
in the working tree, but I do share your
Michael Haggerty wrote:
[Subject: expire_reflog(): exit early if the reference has no reflog]
The caller moves on to expire other reflogs, so it's not exiting.
return early, maybe?
Except the function already returned early. I think the purpose of
this patch is to simplify the no-reflog case
I'm installing Git 2.2.0 from source distribution on NetBSD 6.1.5
(amd64) and when I specify --mandir=/usr/local/man, it still installs
man pages in the default /usr/local/share/man directory. Is there a fix
available for this?
--
To unsubscribe from this list: send the line unsubscribe git in
On Thu, Dec 04, 2014 at 03:52:45PM -0800, Junio C Hamano wrote:
Yeah, that is what I meant. The earlier part will not go to waste no matter
what happens to the discussion.
I am not a fan of char[1024], if only because our error message may have
to mention things whose length is not under
Michael Haggerty wrote:
We don't actually need the locking functionality, because we already
hold the lock on the reference itself, which is how the reflog file is
locked. But the lock_file code still does some of the bookkeeping for
us and is more careful than the old code here was.
As you
On Thu, Dec 04, 2014 at 02:14:50PM -0800, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
I think the bug is in the reverse-reflog reader in
for_each_reflog_ent_reverse. It reads BUFSIZ chunks of the file in
reverse order, and then parses them individually. If the trailing
On Thu, Dec 04, 2014 at 08:28:54PM -0500, Jeff King wrote:
The minimal fix here would be to add this special case to
the conditional that checks whether we found a newline.
But we can make the flow a little clearer by rearranging a
bit: we first handle lines that we are going to show, and
On Fri, Dec 5, 2014 at 3:06 AM, Jens Lehmann jens.lehm...@web.de wrote:
Wow, so the .git/config is shared between all worktrees? I
suspect you have very good reasons for that,
most of config vars are at repo-level, not worktree-level, except
maybe submodule.* and something else. Technically we
Hi Junio,
Please pull l10n update to maint branch.
The following changes since commit b260d265e189728b26e50506ac6ffab6a7d588da:
Git 2.2 (2014-11-26 13:18:34 -0800)
are available in the git repository at:
git://github.com/git-l10n/git-po maint
for you to fetch changes up to
On Thu, Dec 04, 2014 at 04:23:31PM -0800, Jonathan Nieder wrote:
Michael Haggerty wrote:
We don't actually need the locking functionality, because we already
hold the lock on the reference itself, which is how the reflog file is
locked. But the lock_file code still does some of the
Jeff King p...@peff.net wrote:
Some of the discussion has involved mixing config options into this
kitchen sink, but that does not make any sense to me (and is why I
find git var -l so odd). Config options are fundamentally different, in
that they are set and retrieved, not computed (from
On Thu, Dec 4, 2014 at 3:08 PM, Michael Haggerty mhag...@alum.mit.edu wrote:
We don't actually need the locking functionality, because we already
hold the lock on the reference itself,
No. You do need the lock.
The ref is locked only during transaction_commit()
If you don't want to lock the
Hi,
There seems to be problems with the checks in the git code for conflicts
between config values of core.autocrlf and core.eol. Because the various
config files are read in separate passes, and the conflict check happens
on the fly, it creates a situation where the order of the config file
Hi,
I add 2 files that I want ignore on commits
git update-index --assume-unchanged configurations/local.defs
git update-index --assume-unchanged processor/default.defs
git diff -a
is clean
git diff .
is clean
git commit -a
nothing added to commit
but
git commit .
# Changes to be
On Thu, Dec 4, 2014 at 10:06 PM, Jens Lehmann jens.lehm...@web.de wrote:
But I'd need to have separate settings for
our CI server, e.g. to checkout the sources without the
largish documentation submodule in one test job (=worktree)
while checking out the whole documentation for another job
Am 05.12.2014 07:12, schrieb Sérgio Basto:
Hi,
I add 2 files that I want ignore on commits
git update-index --assume-unchanged configurations/local.defs
git update-index --assume-unchanged processor/default.defs
git diff -a
is clean
git diff .
is clean
git commit -a
nothing added to commit
101 - 128 of 128 matches
Mail list logo
