undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/notes: simplify early exit code in add()

Browse Source 
Remove the need for 'retval' and the unnecessary goto. Also reorganize
to only call free_note_data() is actually needed.

Improved-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johan Herland 2014-11-12 01:40:12 +01:00 committed by Junio C Hamano
parent 4282af0fc9
commit b0de56c6a5
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
builtin/notes.c
View File

@ -399,7 +399,7 @@ static int append_edit(int argc, const char **argv, const char *prefix);
static int add(int argc, const char **argv, const char *prefix) static int add(int argc, const char **argv, const char *prefix)
{ {
int retval = 0, force = 0; int force = 0;
const char *object_ref; const char *object_ref;
struct notes_tree *t; struct notes_tree *t;
unsigned char object[20], new_note[20]; unsigned char object[20], new_note[20];
@ -441,24 +441,24 @@ static int add(int argc, const char **argv, const char *prefix)
if (note) { if (note) {
if (!force) { if (!force) {
if (!d.given) { free_notes(t);
if (d.given) {
free_note_data(&d);
return error(_("Cannot add notes. "
"Found existing notes for object %s. "
"Use '-f' to overwrite existing notes"),
sha1_to_hex(object));
}
/* /*
* Redirect to "edit" subcommand. * Redirect to "edit" subcommand.
* *
* We only end up here if none of -m/-F/-c/-C * We only end up here if none of -m/-F/-c/-C or -f are
* or -f are given. The original args are * given. The original args are therefore still in
* therefore still in argv[0-1]. * argv[0-1].
*/ */
argv[0] = "edit"; argv[0] = "edit";
free_note_data(&d);
free_notes(t);
return append_edit(argc, argv, prefix); return append_edit(argc, argv, prefix);
} }
retval = error(_("Cannot add notes. Found existing notes "
"for object %s. Use '-f' to overwrite "
"existing notes"), sha1_to_hex(object));
goto out;
}
fprintf(stderr, _("Overwriting existing notes for object %s\n"), fprintf(stderr, _("Overwriting existing notes for object %s\n"),
sha1_to_hex(object)); sha1_to_hex(object));
} }
@ -474,9 +474,8 @@ static int add(int argc, const char **argv, const char *prefix)
snprintf(logmsg, sizeof(logmsg), "Notes %s by 'git notes %s'", snprintf(logmsg, sizeof(logmsg), "Notes %s by 'git notes %s'",
is_null_sha1(new_note) ? "removed" : "added", "add"); is_null_sha1(new_note) ? "removed" : "added", "add");
commit_notes(t, logmsg); commit_notes(t, logmsg);
out:
free_notes(t); free_notes(t);
return retval; return 0;
} }
static int copy(int argc, const char **argv, const char *prefix) static int copy(int argc, const char **argv, const char *prefix)