summaryrefslogtreecommitdiff
path: root/notes.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-28 17:42:26 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-28 17:42:26 -0700
commit1ba5c532e1f6ede63fd46bf6b647e70baa10a364 (patch)
tree5b514b2936389e2f0433565881c8555fe189c644 /notes.c
parent078e9bce1e8e2484d33d7400ae02c10954fd93ac (diff)
parentedac1883dc5fbadbc2d7d7cf975ed347eaef0702 (diff)
downloadgit-1ba5c532e1f6ede63fd46bf6b647e70baa10a364.tar.gz
Merge branch 'maint'
* maint: Update draft release notes to 1.7.1.1 notes: Initialise variable to appease gcc notes: check number of parameters to "git notes copy"
Diffstat (limited to 'notes.c')
-rw-r--r--notes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/notes.c b/notes.c
index 6ee04e79e9..30d6ded78e 100644
--- a/notes.c
+++ b/notes.c
@@ -716,7 +716,7 @@ static int write_each_non_note_until(const char *note_path,
struct write_each_note_data *d)
{
struct non_note *n = d->next_non_note;
- int cmp, ret;
+ int cmp = 0, ret;
while (n && (!note_path || (cmp = strcmp(n->path, note_path)) <= 0)) {
if (note_path && cmp == 0)
; /* do nothing, prefer note to non-note */