From: Marek Zawirski <marek.zawirski@gmail.com>
To: robin.rosenberg@dewire.com, spearce@spearce.org
Cc: git@vger.kernel.org, Marek Zawirski <marek.zawirski@gmail.com>
Subject: [JGIT PATCH 3/3] Fix RemoteRefUpdate to delete local tracking ref upon successful deletion
Date: Thu, 28 Aug 2008 04:32:49 +0200 [thread overview]
Message-ID: <1219890769-20119-4-git-send-email-marek.zawirski@gmail.com> (raw)
In-Reply-To: <1219890769-20119-3-git-send-email-marek.zawirski@gmail.com>
When remote ref update specification is a deletion, local tracking ref
should also be deleted, not updated.
Reported-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Marek Zawirski <marek.zawirski@gmail.com>
---
.../spearce/jgit/transport/RemoteRefUpdate.java | 5 ++++-
.../spearce/jgit/transport/TrackingRefUpdate.java | 4 ++++
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/RemoteRefUpdate.java b/org.spearce.jgit/src/org/spearce/jgit/transport/RemoteRefUpdate.java
index 623599f..c79f7dc 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/transport/RemoteRefUpdate.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/RemoteRefUpdate.java
@@ -336,6 +336,9 @@ protected void setMessage(final String message) {
* when I/O error occurred during update
*/
protected void updateTrackingRef(final RevWalk walk) throws IOException {
- trackingRefUpdate.update(walk);
+ if (isDelete())
+ trackingRefUpdate.delete(walk);
+ else
+ trackingRefUpdate.update(walk);
}
}
diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/TrackingRefUpdate.java b/org.spearce.jgit/src/org/spearce/jgit/transport/TrackingRefUpdate.java
index a84b38a..ac74728 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/transport/TrackingRefUpdate.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/TrackingRefUpdate.java
@@ -127,4 +127,8 @@ public Result getResult() {
void update(final RevWalk walk) throws IOException {
update.update(walk);
}
+
+ void delete(final RevWalk walk) throws IOException {
+ update.delete(walk);
+ }
}
--
1.5.6.3
prev parent reply other threads:[~2008-08-28 2:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-28 2:32 [JGIT PATCH 0/3] Fix local tracking refs updates during push Marek Zawirski
2008-08-28 2:32 ` [JGIT PATCH 1/3] Fix push's RemoteRefUpdate to always force update local TrackingRefUpdate Marek Zawirski
2008-08-28 2:32 ` [JGIT PATCH 2/3] Add another delete method in RefUpdate, reusing RevWalk Marek Zawirski
2008-08-28 2:32 ` Marek Zawirski [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1219890769-20119-4-git-send-email-marek.zawirski@gmail.com \
--to=marek.zawirski@gmail.com \
--cc=git@vger.kernel.org \
--cc=robin.rosenberg@dewire.com \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).