Junio C Hamano venit, vidit, dixit 02.03.2015 20:43:
Anders Kaseorg ande...@mit.edu writes:
Signed-off-by: Anders Kaseorg ande...@mit.edu
---
t/t5516-fetch-push.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index
now it works like cd which silently succeeds
Signed-off-by: Karthik Nayak karthik@gmail.com
---
git.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/git.c b/git.c
index 8c7ee9c..f4c2285 100644
--- a/git.c
+++ b/git.c
@@ -204,7 +204,9 @@ static int
Hi all,
git is one of the projects that I wish to contribute to for Google
Summer of Code 2015 as it's an integral part of my workflow. I'm from
Singapore, and have been accepted to the National University of
Singapore for Computer Engineering, and will only matriculate on 3 Aug
2015. I have
On Tue, 03 Mar 2015 15:55:48 +0100, Michael J Gruber
g...@drmicha.warpmail.net wrote:
H.Merijn Brand venit, vidit, dixit 19.02.2015 19:56:
On Thu, 19 Feb 2015 14:21:11 +0100, Michael J Gruber
g...@drmicha.warpmail.net wrote:
Jeff, you got it wrong. You should do the hard part and leave
Second version of the patch submitted to add -literlly option
to cat-file
http://article.gmane.org/gmane.comp.version-control.git/264383
Thanks to Eric, Junio and David for suggesting changes on my
first version.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a
add sha1_object_info_literally() which is to be used when
the literally option is given to get the type of object
and print it, using sha1_object_info_extended().
add unpack_sha1_header_literally() to unpack sha headers
which may be greater than 32 bytes, which is the threshold
for a regular
made changes to cat-file to include a --literally
option which prints the type of the object without any
complaints.
Signed-off-by: Karthik Nayak karthik@gmail.com
---
builtin/cat-file.c | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git
Am 02.03.2015 um 13:02 schrieb Alexander Kuleshov:
'was_alias' variable does not need to store it's value on each
iteration in the loop, anyway this variable changes it's value with run_argv.
s/it's/its/
'done_help' variable does not need to be static variable too if we'll move it
out the
Add a struct strbuf *typename to object_info to hold the
typename when the literally option is used. Add a flag to
notify functions when literally is used.
Signed-off-by: Karthik Nayak karthik@gmail.com
---
cache.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/cache.h b/cache.h
index
H.Merijn Brand venit, vidit, dixit 03.03.2015 16:30:
On Tue, 03 Mar 2015 15:55:48 +0100, Michael J Gruber
g...@drmicha.warpmail.net wrote:
H.Merijn Brand venit, vidit, dixit 19.02.2015 19:56:
On Thu, 19 Feb 2015 14:21:11 +0100, Michael J Gruber
g...@drmicha.warpmail.net wrote:
Jeff, you
Karthik Nayak karthik@gmail.com writes:
now it works like cd which silently succeeds
Missing . at end of sentence.
git.c | 4 +++-
That would probably also deserve a test.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line unsubscribe git
Hi all,
First, many thanks for all your work on git. It has been an
invaluable tool.
I believe I've found a bug. Submodules break when I use ``git mv``
to rename a directory, which contains a submodule as one of its
_sub_directories.
Here's the script I've been using to reproduce:
Paul Tan pyoka...@gmail.com writes:
Hi all,
git is one of the projects that I wish to contribute to for Google
Summer of Code 2015 as it's an integral part of my workflow. I'm from
Singapore, and have been accepted to the National University of
Singapore for Computer Engineering, and will
Duy Nguyen pclo...@gmail.com writes:
Junio pointed out in private that I didn't address the packet length
limit (64k). I thought I could get away with a new capability
(i.e. not worry about it now) but I finally admit that was a bad
hack. So perhaps this on top.
No, I didn't ;-) but I tend
On Tue, Mar 3, 2015 at 8:22 AM, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
Karthik Nayak karthik@gmail.com writes:
now it works like cd which silently succeeds
Missing . at end of sentence.
And lack of capitalization at the beginning.
More importantly, lack of justification--why
Junio C Hamano gits...@pobox.com writes:
Duy Nguyen pclo...@gmail.com writes:
Junio pointed out in private that I didn't address the packet length
limit (64k). I thought I could get away with a new capability
(i.e. not worry about it now) but I finally admit that was a bad
hack. So perhaps
Michael J Gruber g...@drmicha.warpmail.net writes:
Junio C Hamano venit, vidit, dixit 02.03.2015 20:43:
Anders Kaseorg ande...@mit.edu writes:
Signed-off-by: Anders Kaseorg ande...@mit.edu
---
t/t5516-fetch-push.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
Hi Matthieu,
On Wed, Mar 4, 2015 at 12:20 AM, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
Be carefull: a GSoC is a full-time job. The GSoC itself ends on August
21st, so there would be a substantial (too big?) overlap between the
GSoC and your studies.
I understand. I will have to try my
Paul Tan pyoka...@gmail.com writes:
Also, quick question, where should the XDG tests go for
git-credential-store? I see t1306-xdg-files.sh and
t0302-credentials-store.sh.
I think both could make sense, but it will probably be more natural in
t1306-xdg-files.sh. See what the other tests took
On 2015-03-03 18.37, Anton Trunov wrote:
[]
Signed-off-by: Anton Trunov anton.a.trunov at gmail.com
Should we use the real email here (with the '@') ?
---
t/t3032-merge-recursive-options.sh | 43
++
xdiff/xmerge.c | 10 -
2
Ernesto Alonso Montaño Ramírez ernestoalonso...@gmail.com writes:
I've a question about Git, can I use this application for design
(architecture, no programming)? for example, controlling the versions
of designs on AUTOCAD, PHOTOSHOP, ILLUSTRATOR, etc; management of
documents...
Yes you can
Hello,
I'm seeing unexpected behavior between git pull --rebase and git
rebase commands, which are supposed to be (and always described as)
synonymous:
git pull --rebase upstream our-branch-name
and
git fetch upstream
git rebase upstream/our-branch-name
We have a situation where the
From: SudShekhar sudshekha...@gmail.com
Teach reset the same shorthand as checkout and merge. - means the
previous commit.
Signed-off-by: Sudhanshu Shekhar sudshekha...@gmail.com
---
This is done as a microproject for gsoc purposes. I am looking forward to your
feedback/comments. Thanks
Michael J Gruber g...@drmicha.warpmail.net writes:
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t7508-status.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 8ed5788..4989e98 100755
--- a/t/t7508-status.sh
+++
On Tue, 03 Mar 2015 17:05:53 +0100, Michael J Gruber
g...@drmicha.warpmail.net wrote:
H.Merijn Brand venit, vidit, dixit 03.03.2015 16:30:
On Tue, 03 Mar 2015 15:55:48 +0100, Michael J Gruber
g...@drmicha.warpmail.net wrote:
H.Merijn Brand venit, vidit, dixit 19.02.2015 19:56:
On Thu,
Keller, Jacob E jacob.e.kel...@intel.com writes:
I am wondering whether it is possible to read from a format-patch input
and add notes when we generate the applied patch.
I would think post-applypatch hook is the right place to do this.
The hook has access to the incoming message in
Teach git-credential-store to read/write credentials from
$XDG_CONFIG_HOME/git/credentials and ~/.git-credentials where
appropriate:
* get: call lookup_credential() on the XDG file first if it exists. If
the credential can't be found, call lookup_credential() on the HOME
file.
* erase: Call
Anton Trunov anton.a.tru...@gmail.com writes:
The git-merge manual says that the ignore-space-change,
ignore-all-space, ignore-space-at-eol options preserve our version
if their version only introduces whitespace changes to a line.
So far if there is whitespace-only changes to both sides
in
On Tue, Mar 03, 2015 at 01:31:39PM -0800, Mike Botsko wrote:
I'm using git 2.2.1 on Mac OS X Yosemite.
I just tried the git rebase with --fork-point added, and it works properly:
$ git rebase upstream/our-branch-name --fork-point
First, rewinding head to replay your work on top of it...
Junio C Hamano gits...@pobox.com writes:
Michael J Gruber g...@drmicha.warpmail.net writes:
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t7508-status.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index
Hello!
I've a question about Git, can I use this application for design
(architecture, no programming)? for example, controlling the versions
of designs on AUTOCAD, PHOTOSHOP, ILLUSTRATOR, etc; management of
documents...
Thank you.
Atte: Ernesto
--
To unsubscribe from this list: send the line
Paul Tan pyoka...@gmail.com writes:
+# Tests for when $XDG_CONFIG_HOME/git/credentials exists but
+# ~/.git-credentials does not.
As much as possible, put text in the $1 of test_expect_success instead
of comments.
+rm $HOME/.git-credentials
+mkdir -p ${XDG_CONFIG_HOME:-$HOME/.config}/git
On Mon, Mar 02, 2015 at 10:48:24AM +0100, Francis Moreau wrote:
Hi,
git remote add has --no-tags/--tags option, but I can't find in the man
page which one is the default.
Could anybody tell me the default option ?
Neither is default. This option has three states, set, unset and
On Tue, Mar 03, 2015 at 12:39:31PM -0800, Mike Botsko wrote:
I'm seeing unexpected behavior between git pull --rebase and git
rebase commands, which are supposed to be (and always described as)
synonymous:
git pull --rebase upstream our-branch-name
and
git fetch upstream
git rebase
Paul Tan pyoka...@gmail.com writes:
Teach git-credential-store to read/write credentials from
$XDG_CONFIG_HOME/git/credentials and ~/.git-credentials where
appropriate:
Thanks for your patch. Below is a partial review. Don't take my comments
as negative criticisms, they are all directions for
Sudhanshu Shekhar sudshekha...@gmail.com writes:
From: SudShekhar sudshekha...@gmail.com
Please, set your configuration to have the same identity for commit and
send-email. It seems your commiter ID (user.name) does not contain your
last name.
builtin/reset.c | 2 ++
Doesn't this deserve a
-Original Message-
From: Junio C Hamano [mailto:gits...@pobox.com]
Sent: Tuesday, March 03, 2015 12:14 PM
To: Keller, Jacob E
Cc: git@vger.kernel.org
Subject: Re: git notes from incoming patch
Keller, Jacob E jacob.e.kel...@intel.com writes:
I am wondering whether it is
Michael J Gruber g...@drmicha.warpmail.net writes:
+diff --git INDEX=staged-for-commit/dir1/modified
WORKTREE=not-staged-for-commit/dir1/modified
+index e69de29..d00491f 100644
+--- INDEX=staged-for-commit/dir1/modified
WORKTREE=not-staged-for-commit/dir1/modified
This might be OK for
* helper_test store is run for when $XDG_CONFIG_HOME/git/credentials
exists and ~/.git-credentials does not and the other way around.
* Test that credentials are stored in XDG file if both XDG and HOME
files exist.
* Test that credentials from XDG file are used if matching credentials
are
Hi all,
This is my initial implementation for the GSoC15 microproject for
supporting both ~/.git-credentials and the XDG standard
$XDG_CONFIG_HOME/git/credentials.
I wrote the XDG tests in t0302-credential-store.sh in the end because it
depends on the helper_test and check functions defined in
I'm using git 2.2.1 on Mac OS X Yosemite.
I just tried the git rebase with --fork-point added, and it works properly:
$ git rebase upstream/our-branch-name --fork-point
First, rewinding head to replay your work on top of it...
Applying: B-07241
While discussing with someone else, he mentioned
On Wed, Mar 4, 2015 at 2:07 AM, Sudhanshu Shekhar
sudshekha...@gmail.com wrote:
Matthieu Moy matthieu@grenoble-inp.fr writes:
Sudhanshu Shekhar sudshekha...@gmail.com writes:
From: SudShekhar sudshekha...@gmail.com
+ if(!strcmp(argv[0],-))
+ argv[0]=@{-1};
Teach reset the same shorthand as checkout and merge. - means the
previous commit.
Signed-off-by: Sudhanshu Shekhar sudshekha...@gmail.com
---
builtin/reset.c | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/builtin/reset.c b/builtin/reset.c
index 4c08ddc..9f8967d
On Wed, Mar 04, 2015 at 08:19:31AM +0100, Matthieu Moy wrote:
So, sending this in case other people think it's a good idea, but I
won't fight for it in case you don't think it is.
[...]
--- a/SoC-2015-Ideas.md
+++ b/SoC-2015-Ideas.md
@@ -20,6 +20,11 @@ Please, include link(s) to the
On wo, 2015-03-04 at 11:50 +0530, Prudhvee Narasimha Sadha wrote:
I'm a newbie to git. I started working on git. I cloned the
git repository and started hacking it. I need a suggestion on how to
start working on the micro project
Make git -C '' cmd not to barf.
git -C '' cmd
John Keeping j...@keeping.me.uk writes:
git-rebase assumes that if you give an explicit upstream then you want
precisely what you asked for. From git-rebase(1):
If either upstream or --root is given on the command line,
then the default is `--no-fork-point`, otherwise the
Shawn Pearce spea...@spearce.org writes:
We have heard this sort of feedback for years. But we have been unable
to adequately write our own documentation or clean up our man pages to
be useful to the average person who doesn't know why the --no-frobbing
option doesn't disable the --frobinator
Thanks, that clarifies a lot.
I only have two follow-up questions:
In your branch example, how does git determine that C/D have been
rewritten and need to be replaced with their current versions
existing upstream? In this scenario I've encountered, the commit hash
and the patch ID of those
This is debatable, but this may discourrage students who picked Git more
or less at random. If I read
https://code.google.com/p/google-summer-of-code/wiki/ProgramStatistics
correctly, the average number of slots per organization is closer to 10
than 2, hence students have better chance to get
It makes it easier for us when reviewing/selecting candidates.
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
(Sending this to the list for comments, but now I can even do the push
myself :-) )
SoC-2015-Ideas.md | 4
1 file changed, 4 insertions(+)
diff --git a/SoC-2015-Ideas.md
On Wed, Mar 04, 2015 at 08:19:30AM +0100, Matthieu Moy wrote:
--- a/SoC-2015-Ideas.md
+++ b/SoC-2015-Ideas.md
@@ -16,6 +16,10 @@ way for us to get experience with applicants, but it will
also help
applicants become familiar with Git's development and submission
process.
+Please,
Jeff King p...@peff.net writes:
Maybe something along the lines of If you are really excited about
working on git, we would love to see your application; if you are just
looking for a random project, there may be a lot of competition for a
small number of slots. Except I am not quite sure how
Hi,
Matthieu Moy matthieu@grenoble-inp.fr writes:
Sudhanshu Shekhar sudshekha...@gmail.com writes:
From: SudShekhar sudshekha...@gmail.com
Please, set your configuration to have the same identity for commit and
send-email. It seems your commiter ID (user.name) does not contain your
On Tue, Mar 3, 2015 at 3:17 PM, Torsten Bögershausen tbo...@web.de wrote:
On 2015-03-03 18.37, Anton Trunov wrote:
[]
Signed-off-by: Anton Trunov anton.a.trunov at gmail.com
Should we use the real email here (with the '@') ?
---
diff --git a/t/t3032-merge-recursive-options.sh
97f05f43 (Show number of TODO items for interactive rebase, 2014-12-10)
taught rebase-interactive to display an item count in the instruction
list comments:
# Rebase 46640c6..5568fd5 onto 46640c6 (4 TODO item(s))
#
# Commands:
# p, pick = use commit
# ...
However, with the
97f05f43 (Show number of TODO items for interactive rebase, 2014-12-10)
taught rebase-interactive to compute an item count with 'wc -l' and
display it in the instruction list comments:
# Rebase 46640c6..5568fd5 onto 46640c6 (4 TODO item(s))
On Mac OS X, however, it renders as:
# Rebase
Hi,
I'm a newbie to git. I started working on git. I cloned the
git repository and started hacking it. I need a suggestion on how to
start working on the micro project
Make git -C '' cmd not to barf.
Thank you for your suggestion in advance.
Regards,
Paul Tan pyoka...@gmail.com writes:
Teach git-credential-store to read/write credentials from
$XDG_CONFIG_HOME/git/credentials and ~/.git-credentials where
appropriate:
* get: call lookup_credential() on the XDG file first if it exists. If
the credential can't be found, call
Currently, only the behaviour when this option is set is explained, but
it's unclear what happens when this option hasn't been set.
Signed-off-by: Kevin Daudt m...@ikke.info
---
Documentation/config.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
Only behaviour with these options are currently explained. Add
explanation what the default behaviour is.
Signed-off-by: Kevin Daudt m...@ikke.info
---
Documentation/git-remote.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
Matthieu Moy matthieu@grenoble-inp.fr writes:
Sudhanshu Shekhar sudshekha...@gmail.com writes:
From: SudShekhar sudshekha...@gmail.com
Please, set your configuration to have the same identity for commit and
send-email. It seems your commiter ID (user.name) does not contain your
last
Maybe I'm lacking the distinction regarding what I'm being specific about.
In both examples, I'm asking it specifically to rebase in changes from
the remote upstream and a named branch at that location. I'm giving
git the same information, it's just interpreting it differently - and
I'm not
On Tue, Mar 03, 2015 at 03:20:48PM -0800, Mike Botsko wrote:
Maybe I'm lacking the distinction regarding what I'm being specific about.
In both examples, I'm asking it specifically to rebase in changes from
the remote upstream and a named branch at that location. I'm giving
git the same
On 03 Mar 2015, Shawn Pearce Wrote:
On Sun, Mar 1, 2015 at 7:29 PM, Stefan Beller sbel...@google.com wrote:
bitquabit.com/post/unorthodocs-abandon-your-dvcs-and-return-to-sanity
Indeed, a DVCS like Git or Hg does not fit everyone. And neither do
centralized
systems like Subversion.
On Sun, Mar 1, 2015 at 7:29 PM, Stefan Beller sbel...@google.com wrote:
bitquabit.com/post/unorthodocs-abandon-your-dvcs-and-return-to-sanity
Indeed, a DVCS like Git or Hg does not fit everyone. And neither do
centralized systems like Subversion. Choice is good.
However... I found some passages
On Tue, 3 Mar 2015, Shawn Pearce wrote:
On Sun, Mar 1, 2015 at 7:29 PM, Stefan Beller sbel...@google.com wrote:
bitquabit.com/post/unorthodocs-abandon-your-dvcs-and-return-to-sanity
Indeed, a DVCS like Git or Hg does not fit everyone. And neither do
centralized systems like Subversion.
Paul Tan pyoka...@gmail.com writes:
* helper_test store is run for when $XDG_CONFIG_HOME/git/credentials
exists and ~/.git-credentials does not and the other way around.
* Test that credentials are stored in XDG file if both XDG and HOME
files exist.
* Test that credentials from XDG file
On Tue, Mar 3, 2015 at 5:54 PM, Duy Nguyen pclo...@gmail.com wrote:
On Wed, Mar 4, 2015 at 12:13 AM, Junio C Hamano gits...@pobox.com wrote:
My recollection is that the consensus from the last time we
discussed protocol revamping was to list one capability per packet
so that packet length
When gitk contains some changed parameter, and there is existing
instance of gitk where the parameter is still old, it is reverted to
that old value when the instance exits.
Instead, store a parameter in config only it is has been modified in the
exiting instance. Otherwise, preserve the value
If several gitk instances are closed simultaneously, safestuff procedure
can run at the same time, resulting in a conflict which may cause losing
of some of the instance's changes, failing the saving operation or even
corrupting the configuration file. This can happen, for example, at user
session
Signed-off-by: Max Kirillov m...@max630.net
---
gitk | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gitk b/gitk
index 5f09756..9404d5d 100755
--- a/gitk
+++ b/gitk
@@ -2811,7 +2811,7 @@ proc savestuff {w} {
if {$stuffsaved} return
if {![winfo viewable .]}
The changes:
* remove unused views_modified_names assignment
* use if {[catch...] to check saving error
* split error reporting from busy wait
The busy wait parameters are unchanged, mostly because I did not have time yet
to test them.
Max Kirillov (3):
gitk: write only changed configuration
On Tue, Mar 03, 2015 at 09:19:14AM -0500, Troy Moure wrote:
I've found a case where git rev-list --bisect segfaults reproducibly
(git version is 2.3.1). This is the commit topology (A2 is the first
parent of M):
I - A1 - A2
\\
- B1 -- M (HEAD)
Thanks for finding a simple
On Wed, Mar 4, 2015 at 12:13 AM, Junio C Hamano gits...@pobox.com wrote:
My recollection is that the consensus from the last time we
discussed protocol revamping was to list one capability per packet
so that packet length limit does not matter, but you may want to
check with the list archive
The git-merge manual says that the ignore-space-change,
ignore-all-space, ignore-space-at-eol options preserve our version
if their version only introduces whitespace changes to a line.
So far if there is whitespace-only changes to both sides
in *all* lines their version will be used.
This
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t7508-status.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 8ed5788..4989e98 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -133,6 +133,12 @@ test_expect_success
git commit and git status in long format show the diff between HEAD
and the index when given -v. This allows previewing a commit to be made.
They also list tracked files with unstaged changes, but without a diff.
Introduce '-v -v' which shows the diff between the index and the
worktree in
Trying to clean up my old RFCs, so here's a mini-series that
1) adds a test for status -v (the diff between HEAD and index) and
2) implements status -v -v (additional diff between index and worktree).
The idea is that in a case where commit -v would list fils with unstaged
changes one would get
Hi,
I've found a case where git rev-list --bisect segfaults reproducibly
(git version is 2.3.1). This is the commit topology (A2 is the first
parent of M):
I - A1 - A2
\\
- B1 -- M (HEAD)
And this is an example of a command that segfaults:
git rev-list --bisect --first-parent
On Mon, Mar 02, 2015 at 04:21:36PM +0700, Duy Nguyen wrote:
On Sun, Mar 01, 2015 at 07:47:40PM -0800, Junio C Hamano wrote:
It seems, however, that our current thinking is that it is OK to do
the allow new v1 clients to notice the availabilty of v2 servers,
so that they can talk v2 the next
On 03/02/2015 10:44 PM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
Instead, compute the value when it is needed.
@@ -2318,8 +2317,6 @@ static struct ref_lock *lock_ref_sha1_basic(const char
*refname,
lock-ref_name = xstrdup(refname);
lock-orig_ref_name
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
Reviewed-by: Stefan Beller sbel...@google.com
---
refs.c | 4
1 file changed, 4 deletions(-)
diff --git a/refs.c
This is v3 of the patch series. Thanks to Junio for his comments
about v2 [1]; I think this version addresses all of his points.
Changes since v2:
* Introduce a temporary in struct ref_lock: delete the force_write
member to make a complicated boolean expression easier to
understand.
* Split
On 03/02/2015 11:04 PM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
+Reference logs, or reflogs, record when the tips of branches and
+other references were updated in the local repository. Reflogs are
+useful in various Git commands, to specify the old value of a
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
Revamp the git reflog usage documentation in the manpage and the
command help to match the current reality and improve its clarity:
* Add documentation for some options that had been left out.
* Group the subcommands and options more logically and move more
common subcommands/options higher.
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
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
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
From: Stefan Beller sbel...@google.com
Instead, compute the value when it is needed.
Signed-off-by: Stefan Beller sbel...@google.com
Edited-by: Michael Haggerty mhag...@alum.mit.edu
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
refs.c | 14 +-
1 file changed, 9
H.Merijn Brand venit, vidit, dixit 19.02.2015 19:56:
On Thu, 19 Feb 2015 14:21:11 +0100, Michael J Gruber
g...@drmicha.warpmail.net wrote:
Jeff, you got it wrong. You should do the hard part and leave the easy
part to us!
Thanks anyways, I'll add this to my HP_UX branch.
I did not
91 matches
Mail list logo
