===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/commit.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -c -r1.155 -r1.156
*** src/usr.bin/cvs/commit.c	2016/10/13 20:51:25	1.155
--- src/usr.bin/cvs/commit.c	2017/05/28 17:01:10	1.156
***************
*** 1,4 ****
! /*	$OpenBSD: commit.c,v 1.155 2016/10/13 20:51:25 fcambus Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: commit.c,v 1.156 2017/05/28 17:01:10 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
***************
*** 363,414 ****
  		if (tag != NULL && cf->file_rcs != NULL) {
  			brev = rcs_sym_getrev(cf->file_rcs, tag);
  			if (brev != NULL) {
! 				if (RCSNUM_ISBRANCH(brev))
! 					goto next;
! 				free(brev);
  			}
- 
- 			brev = rcs_translate_tag(tag, cf->file_rcs);
- 
- 			if (brev == NULL) {
- 				if (cf->file_status == FILE_ADDED)
- 					goto next;
- 				fatal("failed to resolve tag: %s",
- 				    cf->file_ent->ce_tag);
- 			}
- 
- 			if ((branch = rcsnum_revtobr(brev)) == NULL) {
- 				cvs_log(LP_ERR, "sticky tag %s is not "
- 				    "a branch for file %s", tag,
- 				    cf->file_path);
- 				conflicts_found++;
- 				free(brev);
- 				return;
- 			}
- 
- 			if (!RCSNUM_ISBRANCHREV(brev)) {
- 				cvs_log(LP_ERR, "sticky tag %s is not "
- 				    "a branch for file %s", tag,
- 				    cf->file_path);
- 				conflicts_found++;
- 				free(branch);
- 				free(brev);
- 				return;
- 			}
- 
- 			if (!RCSNUM_ISBRANCH(branch)) {
- 				cvs_log(LP_ERR, "sticky tag %s is not "
- 				    "a branch for file %s", tag,
- 				    cf->file_path);
- 				conflicts_found++;
- 				free(branch);
- 				free(brev);
- 				return;
- 			}
  		}
  	}
  
- next:
  	free(branch);
  	free(brev);
  
--- 363,378 ----
  		if (tag != NULL && cf->file_rcs != NULL) {
  			brev = rcs_sym_getrev(cf->file_rcs, tag);
  			if (brev != NULL) {
! 				if (!RCSNUM_ISBRANCH(brev)) {
! 					cvs_log(LP_ERR, "sticky tag %s is not "
! 					    "a branch for file %s", tag,
! 					    cf->file_path);
! 					conflicts_found++;
! 				}
  			}
  		}
  	}
  
  	free(branch);
  	free(brev);